From 0d0e346f3dc32cb2a9bb459e5d470df8c34d29d2 Mon Sep 17 00:00:00 2001
From: Courtney Peverley <courtneyp@izumi.cgd.ucar.edu>
Date: Tue, 23 Jul 2024 10:13:04 -0600
Subject: [PATCH 1/3] reinstate setting idx to no_exist_idx after it is
 modified by const_get_index

---
 src/physics/utils/physics_data.F90 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/physics/utils/physics_data.F90 b/src/physics/utils/physics_data.F90
index 2ba23746..62070f9f 100644
--- a/src/physics/utils/physics_data.F90
+++ b/src/physics/utils/physics_data.F90
@@ -68,6 +68,8 @@ integer function find_input_name_idx(stdname, use_init_variables, constituent_in
       if (find_input_name_idx >= 0) then
          constituent_index = find_input_name_idx
          is_constituent = .true.
+      else
+         find_input_name_idx = no_exist_idx
       end if
 
       !Loop through physics variable standard names:

From 2b3a43f2ae11ec2926a637545489f696f3624488 Mon Sep 17 00:00:00 2001
From: Courtney Peverley <courtneyp@izumi.cgd.ucar.edu>
Date: Tue, 23 Jul 2024 15:24:42 -0600
Subject: [PATCH 2/3] remove chemistry library linking by default

---
 cime_config/config_component.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml
index 99de44ef..9b715c97 100644
--- a/cime_config/config_component.xml
+++ b/cime_config/config_component.xml
@@ -307,8 +307,6 @@
     <valid_values></valid_values>
     <default_value> </default_value>
     <values match="last" modifier="additive">
-      <!-- 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>

From 38dceb7e4f1d9b69ea565af96d0609333b2a77ee Mon Sep 17 00:00:00 2001
From: Courtney Peverley <courtneyp@derecho6.hsn.de.hpc.ucar.edu>
Date: Tue, 23 Jul 2024 17:14:29 -0600
Subject: [PATCH 3/3] fix typo in testlist_cam

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

diff --git a/cime_config/testdefs/testlist_cam.xml b/cime_config/testdefs/testlist_cam.xml
index ff02f6d5..3da26bdd 100644
--- a/cime_config/testdefs/testlist_cam.xml
+++ b/cime_config/testdefs/testlist_cam.xml
@@ -36,7 +36,7 @@
       <option name="wallclock">00:10:00</option>
       <option name="comment">GNU build test for Moist Held-Suarez physics</option>
     </options>
-  </tests>
+  </test>
 
   <!-- Derecho dycore tests -->
   <test compset="FKESSLER" grid="mpasa480_mpasa480" name="SMS_Ln2" testmods="cam/outfrq_kessler_mpas_derecho_nooutput/">