From 8eb699ad7ddd490341824cd72071ee95ba40cee0 Mon Sep 17 00:00:00 2001
From: Courtney Peverley <courtneyp@derecho4.hsn.de.hpc.ucar.edu>
Date: Thu, 15 Feb 2024 16:08:50 -0700
Subject: [PATCH 1/2] comment out problem line

---
 cime_config/config_component.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml
index f18e1860..6aeca1a8 100644
--- a/cime_config/config_component.xml
+++ b/cime_config/config_component.xml
@@ -308,7 +308,7 @@
     <default_value>-lmusica -ljsonfortran</default_value>
     <values match="last" modifier="additive">
       <!-- Turn off for physics testbed -->
-      <value compset="_CAM%PHYSTEST"></value>
+      <!-- <value compset="_CAM%PHYSTEST"></value> -->
       <value grid="a%mpasa[0-9]+">-lmpas</value>
     </values>
     <group>build_component_cam</group>

From ecf730b8752eeeb7d3c6aca259dbe97b8d6b1780 Mon Sep 17 00:00:00 2001
From: Jesse Nusbaumer <nusbaume@ucar.edu>
Date: Fri, 16 Feb 2024 12:07:22 -0700
Subject: [PATCH 2/2] Apply 'permanent' fix for physics testbed.

---
 cime_config/config_component.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml
index 6aeca1a8..99de44ef 100644
--- a/cime_config/config_component.xml
+++ b/cime_config/config_component.xml
@@ -305,11 +305,12 @@
   <entry id="CAM_LINKED_LIBS">
     <type>char</type>
     <valid_values></valid_values>
-    <default_value>-lmusica -ljsonfortran</default_value>
+    <default_value> </default_value>
     <values match="last" modifier="additive">
-      <!-- Turn off for physics testbed -->
-      <!-- <value compset="_CAM%PHYSTEST"></value> -->
-      <value grid="a%mpasa[0-9]+">-lmpas</value>
+      <!-- Turn on chemistry if not using physics testbed -->
+      <value compset="^((?!_CAM%PHYSTEST).)*$">-lmusica -ljsonfortran</value>
+      <!-- Add MPAS if using mpas grid and not using physics testbed -->
+      <value compset="^((?!_CAM%PHYSTEST).)*$" grid="a%mpasa[0-9]+">-lmpas</value>
     </values>
     <group>build_component_cam</group>
     <file>env_build.xml</file>