Have the MUSICA build key off the presences of the 'musica_ccpp' scheme in the SDF.

Author: nusbaume

cime_config/atm_musica_config.py

@@ -3,6 +3,7 @@
 and install the MUSICA library, as well as to download the MUSICA configuration."
 """
 
+MUSICA_CCPP_SCHEME_NAME = "musica_ccpp"
 MUSICA_REPO_URL = "https://github.com/NCAR/musica.git"
 MUSICA_TAG = "cc39bb00d2220fc81c85b22d3ceea4a39bd2bacf"
 CHEMISTRY_DATA_REPO_URL = "https://github.com/NCAR/cam-sima-chemistry-data.git"

cime_config/buildlib

@@ -12,6 +12,7 @@ import subprocess
 import logging
 
 from cam_config import ConfigCAM # CAM's configure structure
+from atm_musica_config import MUSICA_CCPP_SCHEME_NAME
 from atm_musica_config import MUSICA_REPO_URL, MUSICA_TAG
 from atm_musica_config import CHEMISTRY_DATA_REPO_URL, CHEMISTRY_DATA_TAG
 
@@ -76,7 +77,7 @@ def _build_cam():
         # Re-run source generator in case registry, CCPP suites, or
         # generator scripts have been modified, and
         # to extract required source code paths:
-        config.generate_cam_src(gen_indent)
+        scheme_names = config.generate_cam_src(gen_indent)
 
         dycore = config.get_value('dyn')
         phys_suites = config.get_value('physics_suites')
@@ -173,7 +174,7 @@ def _build_cam():
                 cmd += " OPTIONAL_MPAS_FEATURES=\"" + " ".join(optional_mpas_features) + "\""
 
         # If the physics suite is MUSICA, build the MUSICA library and get configuration
-        if phys_suites == "musica":
+        if MUSICA_CCPP_SCHEME_NAME in scheme_names:
             _build_musica_library(case)
             _download_musica_configuration(caseroot)
 

cime_config/buildnml

@@ -166,7 +166,7 @@ def buildnml(case, caseroot, compname):
     gen_indent = 3
 
     #Generate model code and meta-data:
-    config.generate_cam_src(gen_indent)
+    _ = config.generate_cam_src(gen_indent)
 
     #----------------------------------------------------------------
     # Create namelist attribute dictionary (to set namelist defaults):

cime_config/cam_autogen.py

@@ -452,6 +452,7 @@ def generate_physics_suites(build_cache, preproc_defs, host_name,
     # Find the SDFs specified for this model build
     sdfs = []
     scheme_files = []
+    scheme_names = set()
     xml_files = {} # key is scheme, value is xml file path
     for sdf in phys_suites_str.split(';'):
         sdf_path = _find_file(f"suite_{sdf}.xml", suite_search)
@@ -467,6 +468,8 @@ def generate_physics_suites(build_cache, preproc_defs, host_name,
         # Given an SDF, find all the schemes it calls
         _, suite = read_xml_file(sdf_path)
         sdf_schemes = _find_schemes_in_sdf(suite)
+        #Add schemes to set of all scheme names:
+        scheme_names.update(sdf_schemes)
         # For each scheme, find its metadata file
         for scheme in sdf_schemes:
             if scheme in all_scheme_files:
@@ -655,7 +658,7 @@ def generate_physics_suites(build_cache, preproc_defs, host_name,
     # End if
 
     return [physics_blddir, genccpp_dir], do_gen_ccpp, cap_output_file,       \
-        xml_files.values(), capgen_db
+        xml_files.values(), capgen_db, scheme_names
 
 ###############################################################################
 def generate_init_routines(build_cache, bldroot, force_ccpp, force_init,

cime_config/cam_config.py

@@ -868,7 +868,7 @@ def generate_cam_src(self, gen_fort_indent):
                                           self.__atm_root, self.__bldroot,
                                           reg_dir, reg_files, source_mods_dir,
                                           force_ccpp)
-        phys_dirs, force_init, _, nml_fils, capgen_db = retvals
+        phys_dirs, force_init, _, nml_fils, capgen_db, scheme_names = retvals
 
         # Add namelist definition files to dictionary:
         for nml_fil in nml_fils:
@@ -899,6 +899,9 @@ def generate_cam_src(self, gen_fort_indent):
         #--------------------------------------------------------------
         build_cache.write()
 
+        #Return the set of all scheme names present in the SDFs:
+        return scheme_names
+
     #++++++++++++++++++++++++
 
     def ccpp_phys_set(self, cam_nml_attr_dict, phys_nl_pg_dict):

src/physics/ncar_ccpp

@@ -580,7 +580,7 @@ def test_generate_physics_suites(self):
         expected_results = ([f'{self.test_bldroot}'+os.sep+'ccpp_physics',
                              f'{self.test_bldroot}'+os.sep+'ccpp'], False,
                              f'{self.test_bldroot}'+os.sep+'ccpp'+os.sep+'ccpp_datatable.xml',
-                             [], None)
+                             [], None, {"temp_adjust"})
 
         #Run physics suite generation function:
         gen_results = generate_physics_suites(self.test_cache, "UNSET", "cam", "simple",