Merge pull request #977 from cacraigucar/update_externals_alpha17a

cam6_3_149: Update externals to match alpha17a and newer cime tag

Externals.cfg

@@ -1,5 +1,5 @@
 [ccs_config]
-tag = ccs_config_cesm0.0.82
+tag = ccs_config_cesm0.0.85
 protocol = git
 repo_url = https://github.com/ESMCI/ccs_config_cesm
 local_path = ccs_config
@@ -21,14 +21,14 @@ externals = Externals.cfg
 required = True
 
 [cmeps]
-tag = cmeps0.14.43
+tag = cmeps0.14.45
 protocol = git
 repo_url = https://github.com/ESCOMP/CMEPS.git
 local_path = components/cmeps
 required = True
 
 [cdeps]
-tag = cdeps1.0.24
+tag = cdeps1.0.26
 protocol = git
 repo_url = https://github.com/ESCOMP/CDEPS.git
 local_path = components/cdeps
@@ -43,7 +43,7 @@ local_path = components/cpl7
 required = True
 
 [share]
-tag = share1.0.17
+tag = share1.0.18
 protocol = git
 repo_url = https://github.com/ESCOMP/CESM_share
 local_path = share
@@ -64,7 +64,7 @@ local_path = libraries/parallelio
 required = True
 
 [cime]
-tag = cime6.0.175
+tag = cime6.0.217_httpsbranch02
 protocol = git
 repo_url = https://github.com/ESMCI/cime
 local_path = cime
@@ -79,7 +79,7 @@ externals = Externals_CISM.cfg
 required = True
 
 [clm]
-tag = ctsm5.1.dev142
+tag = ctsm5.1.dev145
 protocol = git
 repo_url = https://github.com/ESCOMP/CTSM
 local_path = components/clm

cime_config/SystemTests/tmc.py

@@ -25,7 +25,7 @@ def run_phase(self):
         self.run_indv()
         cpllog = ''.join(get_latest_cpl_logs(self._case))
         atmlog  = cpllog.replace("cpl.log","atm.log")
-        atmlog  = atmlog.replace("drv.log","atm.log")
+        atmlog  = atmlog.replace("med.log","atm.log")
         if '.gz' == atmlog[-3:]:
             fopen = gzip.open
         else:

cime_config/buildnml

@@ -216,13 +216,15 @@ def buildnml(case, caseroot, compname):
         # copy geos-chem config files to rundir if using geos-chem chemistry
         # -----------------------------------------------------
 
-        if os.path.isdir(rundir) and '-chem geoschem' in CAM_CONFIG_OPTS:
-            for fname in ['species_database.yml', 'geoschem_config.yml',
-                          'HISTORY.rc', 'HEMCO_Config.rc', 'HEMCO_Diagn.rc']:
-                file1 = os.path.join(caseroot, fname)
-                file2 = os.path.join(rundir, fname)
-                logger.info("GEOS-Chem config file copy: file1 %s file2 %s ", file1, file2)
-                shutil.copy(file1,file2)
+        if os.path.isdir(rundir) \
+            and os.path.exists(os.path.join(caseroot, "species_database.yaml"))\
+            and '-chem geoschem' in CAM_CONFIG_OPTS:
+               for fname in ['species_database.yml', 'geoschem_config.yml',
+                             'HISTORY.rc', 'HEMCO_Config.rc', 'HEMCO_Diagn.rc']:
+                   file1 = os.path.join(caseroot, fname)
+                   file2 = os.path.join(rundir, fname)
+                   logger.info("GEOS-Chem config file copy: file1 %s file2 %s ", file1, file2)
+                   shutil.copy(file1,file2)
 
 ###############################################################################
 def _main_func():