Merge remote-tracking branch 'ESCOMP/cam_development' into compset_names

Author: fvitt

.gitmodules

@@ -36,7 +36,7 @@
 [submodule "atmos_phys"]
 	path = src/atmos_phys
 	url = https://github.com/ESCOMP/atmospheric_physics
-        fxtag = atmos_phys0_05_000
+        fxtag = atmos_phys0_05_001
         fxrequired = AlwaysRequired
 	fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics
 
@@ -144,28 +144,28 @@ fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute
 [submodule "ccs_config"]
 path = ccs_config
 url = https://github.com/ESMCI/ccs_config_cesm.git
-fxtag = ccs_config_cesm1.0.0
+fxtag = ccs_config_cesm1.0.7
 fxrequired = ToplevelRequired
 fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git
 
 [submodule "cime"]
 path = cime
 url = https://github.com/ESMCI/cime
-fxtag = cime6.1.0
+fxtag = cime6.1.29
 fxrequired = ToplevelRequired
 fxDONOTUSEurl = https://github.com/ESMCI/cime
 
 [submodule "cmeps"]
 path = components/cmeps
 url = https://github.com/ESCOMP/CMEPS.git
-fxtag = cmeps1.0.2
+fxtag = cmeps1.0.16
 fxrequired = ToplevelRequired
 fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git
 
 [submodule "cdeps"]
 path = components/cdeps
 url = https://github.com/ESCOMP/CDEPS.git
-fxtag = cdeps1.0.48
+fxtag = cdeps1.0.53
 fxrequired = ToplevelRequired
 fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git
 
@@ -179,7 +179,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CESM_share
 [submodule "parallelio"]
 path = libraries/parallelio
 url = https://github.com/NCAR/ParallelIO
-fxtag = pio2_6_2
+fxtag = pio2_6_3
 fxrequired = ToplevelRequired
 fxDONOTUSEurl = https://github.com/NCAR/ParallelIO
 
@@ -193,13 +193,13 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CESM_CICE
 [submodule "clm"]
 path = components/clm
 url = https://github.com/ESCOMP/CTSM
-fxtag = ctsm5.2.027
+fxtag = ctsm5.3.002
 fxrequired = ToplevelRequired
 fxDONOTUSEurl = https://github.com/ESCOMP/CTSM
 
 [submodule "fms"]
 path = libraries/FMS
 url = https://github.com/ESCOMP/FMS_interface
-fxtag = fi_240516
+fxtag = fi_240828
 fxrequired = ToplevelRequired
 fxDONOTUSEurl = https://github.com/ESCOMP/FMS_interface

bld/configure

@@ -2191,9 +2191,9 @@ sub write_filepath
 
     if ($simple_phys) {
       print $fh "$camsrcdir/src/physics/simple\n";
-      print $fh "$camsrcdir/src/atmos_phys/kessler\n";
-      print $fh "$camsrcdir/src/atmos_phys/held_suarez\n";
-      print $fh "$camsrcdir/src/atmos_phys/tj2016\n";
+      print $fh "$camsrcdir/src/atmos_phys/schemes/kessler\n";
+      print $fh "$camsrcdir/src/atmos_phys/schemes/held_suarez\n";
+      print $fh "$camsrcdir/src/atmos_phys/schemes/tj2016\n";
     }
 
     # Weak scaling fix. This has to come before physics/cam and before dycores
@@ -2334,9 +2334,10 @@ sub write_filepath
     print $fh "$camsrcdir/src/physics/cam\n";
 
     #Add the CCPP'ized subdirectories
-    print $fh "$camsrcdir/src/atmos_phys/tropopause_find\n";
-    print $fh "$camsrcdir/src/atmos_phys/zhang_mcfarlane\n";
-    print $fh "$camsrcdir/src/atmos_phys/dry_adiabatic_adjust\n";
+    print $fh "$camsrcdir/src/atmos_phys/schemes/tropopause_find\n";
+    print $fh "$camsrcdir/src/atmos_phys/schemes/zhang_mcfarlane\n";
+    print $fh "$camsrcdir/src/atmos_phys/schemes/dry_adiabatic_adjust\n";
+    print $fh "$camsrcdir/src/atmos_phys/schemes/utilities\n";
 
     # Dynamics package and test utilities
     print $fh "$camsrcdir/src/dynamics/$dyn\n";
@@ -2362,8 +2363,6 @@ sub write_filepath
     print $fh "$camsrcdir/src/control\n";
     print $fh "$camsrcdir/src/utils\n";
     print $fh "$camsrcdir/src/utils/cam_ccpp\n";
-    print $fh "$camsrcdir/src/atmos_phys/utilities\n";
-
 
     $fh->close;
 }

ccs_config

@@ -11,7 +11,7 @@
 from CIME.SystemTests.system_tests_compare_two import SystemTestsCompareTwo
 from CIME.XML.standard_module_setup import *
 from CIME.SystemTests.test_utils.user_nl_utils import append_to_user_nl_files
-from CIME.utils import append_testlog
+from CIME.status import append_testlog
 
 logger = logging.getLogger(__name__)
 

cime

@@ -14,7 +14,7 @@
 from CIME.XML.standard_module_setup import *
 from CIME.SystemTests.test_utils.user_nl_utils import append_to_user_nl_files
 from CIME.test_status import *
-from CIME.utils import append_testlog
+from CIME.status import append_testlog
 
 
 logger = logging.getLogger(__name__)

cime_config/SystemTests/plb.py

@@ -11,7 +11,7 @@
 from CIME.SystemTests.system_tests_compare_two import SystemTestsCompareTwo
 from CIME.XML.standard_module_setup import *
 from CIME.SystemTests.test_utils.user_nl_utils import append_to_user_nl_files
-from CIME.utils import append_testlog
+from CIME.status import append_testlog
 
 
 logger = logging.getLogger(__name__)

cime_config/SystemTests/sct.py

@@ -5,7 +5,7 @@
 from CIME.XML.standard_module_setup import *
 from CIME.SystemTests.system_tests_common import SystemTestsCommon
 from CIME.test_status import *
-from CIME.utils import append_testlog
+from CIME.status import append_testlog
 from CIME.baselines.performance import get_latest_cpl_logs
 import glob, gzip