Merge pull request #1 from CMCC-Foundation/dev/cmcc-cm3

Dev/cmcc cm3
Update to cam6_3_085 for CMCC-CM3

.gitignore

@@ -4,6 +4,7 @@ chem_proc
 cime
 components
 manage_externals.log
+src/physics/ali_arms/
 src/physics/carma/base
 src/physics/clubb
 src/physics/cosp2/src

Externals.cfg

@@ -1,54 +1,54 @@
-[cice]
-tag = cice5_20210802
+[ccs_config]
+tag = ccs_config_cesm0.0.47
+protocol = git
+repo_url = https://github.com/ESMCI/ccs_config_cesm
+local_path = ccs_config
+required = True
+
+[cice5]
+tag = cice5_20220204
 protocol = git
 repo_url = https://github.com/ESCOMP/CESM_CICE5
-local_path = components/cice
+local_path = components/cice5
 required = True
 
 [cice6]
-tag = cesm_cice6_2_0_5
+tag = cesm_cice6_2_0_35
 protocol = git
 repo_url = https://github.com/ESCOMP/CESM_CICE
-local_path = components/cice6
+local_path = components/cice
 externals = Externals.cfg
-required = False
+required = True
 
 [cmeps]
-tag = cmeps0.13.45
+tag = cmeps0.13.78
 protocol = git
 repo_url = https://github.com/ESCOMP/CMEPS.git
 local_path = components/cmeps
 required = True
 
 [cdeps]
-tag = cdeps0.12.37
+tag = cdeps0.12.67
 protocol = git
 repo_url = https://github.com/ESCOMP/CDEPS.git
 local_path = components/cdeps
 externals =  Externals_CDEPS.cfg
 required = True
 
 [cpl7]
-tag = cpl7.0.11
+tag = cpl7.0.14
 protocol = git
 repo_url = https://github.com/ESCOMP/CESM_CPL7andDataComps
 local_path = components/cpl7
 required = True
 
 [share]
-tag = share1.0.10
+tag = share1.0.13
 protocol = git
 repo_url = https://github.com/ESCOMP/CESM_share
 local_path = share
 required = True
 
-[ccs_config]
-tag = ccs_config_cesm0.0.4
-protocol = git
-repo_url = https://github.com/ESMCI/ccs_config_cesm
-local_path = ccs_config
-required = True
-
 [mct]
 tag = MCT_2.11.0
 protocol = git
@@ -57,14 +57,14 @@ local_path = libraries/mct
 required = True
 
 [parallelio]
-tag = pio2_5_4
+tag = pio2_5_9
 protocol = git
 repo_url = https://github.com/NCAR/ParallelIO
 local_path = libraries/parallelio
 required = True
 
 [cime]
-tag = cime6.0.13
+tag = cime6.0.64
 protocol = git
 repo_url = https://github.com/ESMCI/cime
 local_path = cime
@@ -79,15 +79,15 @@ externals = Externals_CISM.cfg
 required = True
 
 [clm]
-tag = ctsm5.1.dev070
+tag = ctsm5.1.dev107
 protocol = git
 repo_url = https://github.com/ESCOMP/CTSM
 local_path = components/clm
 externals = Externals_CLM.cfg
 required = True
 
 [fms]
-# More recent tag than CESM because MOM is unable to support this tag
+# Older tag than CESM as there is a compilation error mismatch
 tag = fi_20211011
 protocol = git
 repo_url = https://github.com/ESCOMP/FMS_interface

Externals_CAM.cfg

@@ -1,15 +1,15 @@
 [chem_proc]
 local_path = chem_proc
-protocol = svn
-repo_url = https://svn-ccsm-models.cgd.ucar.edu/tools/proc_atm/chem_proc/release_tags
-tag = chem_proc5_0_04
+protocol = git
+repo_url = https://github.com/ESCOMP/CHEM_PREPROCESSOR.git
+tag = chem_proc5_0_05
 required = True
 
 [carma]
 local_path = src/physics/carma/base
 protocol = git
 repo_url = https://github.com/ESCOMP/CARMA_base.git
-tag = carma3_49
+tag = carma4_00
 required = True
 
 [cosp2]
@@ -21,23 +21,23 @@ required = True
 
 [clubb]
 local_path = src/physics/clubb
-protocol = git
-repo_url = https://github.com/ESCOMP/CLUBB_CESM
-tag = clubb_release_b76a124_20200220_c20200320
+protocol = svn
+repo_url = https://github.com/larson-group/clubb_release/tags/
+tag = clubb_4ncar_20220311_f51de38/src/CLUBB_core
 required = True
 
 [silhs]
 local_path = src/physics/silhs
-protocol = git
-repo_url = https://github.com/ESCOMP/SILHS_CESM
-tag = silhs_clubb_release_b76a124_20200220_c20200320
+protocol = svn
+repo_url = https://github.com/larson-group/clubb_release/tags/
+tag = clubb_4ncar_20220311_f51de38/src/SILHS
 required = True
 
 [pumas]
 local_path = src/physics/pumas
 protocol = git
 repo_url = https://github.com/ESCOMP/PUMAS
-tag = pumas_cam-release_v1.22
+tag = pumas_cam-release_v1.27
 required = True
 
 [pumas-frozen]
@@ -47,6 +47,13 @@ repo_url = https://github.com/ESCOMP/PUMAS
 tag = pumas_cam-release_v1.17_rename
 required = True
 
+[ali_arms]
+local_path = src/physics/ali_arms
+protocol = git
+repo_url = https://github.com/ESCOMP/ALI-ARMS
+tag = ALI_ARMS_v1.0.0
+required = True
+
 [atmos_phys]
 tag = atmos_phys0_00_011
 protocol = git
@@ -66,9 +73,8 @@ local_path = src/dynamics/mpas/dycore
 protocol = git
 repo_url = https://github.com/MPAS-Dev/MPAS-Model.git
 sparse = ../.mpas_sparse_checkout
-hash = ba25bd07
+hash = ff76a231
 required = True
 
 [externals_description]
 schema_version = 1.0.0
-

bld/Makefile.in

@@ -208,7 +208,7 @@ endif
 	$(AS) -m  $<
 
 %.F90: %.F90.in
-	 $(ROOTDIR)/cime/src/externals/genf90/genf90.pl $< > $@
+	 $(ROOTDIR)/cime/CIME/non_py/externals/genf90/genf90.pl $< > $@
 
 # Rules used for the tests run by "configure -test"
 test_fc: test_fc.o