Modifications to 'noresm_v4_cam6_3_112-12-g15769ddf' for merging with…

… CAM-Nor

- Configuration and code changes from ESCOMP between cam6_3_112 and cam6_3_123
- Adjust compsets, tests, and externals to be compatible with cam6_3_123 settings.

.gitignore

@@ -5,20 +5,22 @@ cime
 components
 manage_externals.log
 src/physics/ali_arms/
+src/physics/camnor_phys
 src/physics/carma/base
 src/physics/clubb
 src/physics/cosp2/src
 src/physics/silhs
 src/physics/pumas
 src/physics/pumas-frozen
 src/dynamics/fv3/atmos_cubed_sphere
+src/hemco
 libraries/FMS
 libraries/mct
 libraries/parallelio
 src/atmos_phys
 src/dynamics/mpas/dycore
 share
-src/hemco
+
 # Ignore compiled python
 buildnmlc
 buildcppc

Externals.cfg

@@ -1,73 +1,75 @@
-[ccs_config]
-tag = ccs_config_cesm0.0.72
-protocol = git
-repo_url = https://github.com/ESMCI/ccs_config_cesm
-local_path = ccs_config
-required = True
+#-----------------------------
+# Libraries
+#-----------------------------
 
-[cice5]
-tag = cice5_20220204
+[parallelio]
 protocol = git
-repo_url = https://github.com/ESCOMP/CESM_CICE5
-local_path = components/cice5
+tag = pio2_5_10
+repo_url = https://github.com/NCAR/ParallelIO
+local_path = libraries/parallelio
 required = True
 
-[cice6]
-tag = cesm_cice6_4_1_8
+[mct]
 protocol = git
-repo_url = https://github.com/ESCOMP/CESM_CICE
-local_path = components/cice
-externals = Externals.cfg
+tag = MCT_2.11.0
+repo_url = https://github.com/MCSclimate/MCT
+local_path = libraries/mct
 required = True
 
-[cmeps]
-tag = cmeps0.14.34
-protocol = git
-repo_url = https://github.com/ESCOMP/CMEPS.git
-local_path = components/cmeps
-required = True
+#-----------------------------
+# Configuration/CCS
+#-----------------------------
 
-[cdeps]
-tag = cdeps1.0.14
+[ccs_config]
 protocol = git
-repo_url = https://github.com/ESCOMP/CDEPS.git
-local_path = components/cdeps
-externals =  Externals_CDEPS.cfg
+tag = ccs_config_noresm0.0.14
+repo_url = https://github.com/NorESMhub/ccs_config_noresm.git
+local_path = ccs_config
 required = True
 
-[cpl7]
-tag = cpl77.0.5
+[cime]
 protocol = git
-repo_url = https://github.com/ESCOMP/CESM_CPL7andDataComps
-local_path = components/cpl7
+tag = cime6.0.105_noresm_v4
+repo_url = https://github.com/NorESMhub/cime.git
+local_path = cime
 required = True
 
+#-----------------------------
+# Share
+#-----------------------------
+
 [share]
-tag = share1.0.17
 protocol = git
-repo_url = https://github.com/ESCOMP/CESM_share
+tag = share1.0.17_noresm_v1
+repo_url = https://github.com/NorESMHub/NorESM_share
 local_path = share
 required = True
 
-[mct]
-tag = MCT_2.11.0
+#-----------------------------
+# Components
+#-----------------------------
+
+[cice6]
 protocol = git
-repo_url = https://github.com/MCSclimate/MCT
-local_path = libraries/mct
+tag = cesm_cice6_4_1_7_noresm_v1
+repo_url = https://github.com/NorESMhub/NorESM_CICE
+local_path = components/cice
+externals = Externals.cfg
 required = True
 
-[parallelio]
-tag = pio2_5_10
+[cdeps]
 protocol = git
-repo_url = https://github.com/NCAR/ParallelIO
-local_path = libraries/parallelio
+tag = cdeps1.0.10
+repo_url = https://github.com/NorESMhub/CDEPS.git
+local_path = components/cdeps
+externals =  Externals_CDEPS.cfg
 required = True
 
-[cime]
-tag = cime6.0.125
+[cmeps]
 protocol = git
-repo_url = https://github.com/ESMCI/cime
-local_path = cime
+tag = cmeps0.14.32_noresm_v2
+repo_url = https://github.com/NorESMhub/CMEPS.git
+local_path = components/cmeps
 required = True
 
 [cism]
@@ -79,41 +81,32 @@ externals = Externals_CISM.cfg
 required = True
 
 [clm]
-tag = ctsm5.1.dev124
 protocol = git
-repo_url = https://github.com/ESCOMP/CTSM
+tag = ctsm5.1dev130-noresm_v1
+repo_url = https://github.com/NorESMhub/CTSM
 local_path = components/clm
 externals = Externals_CLM.cfg
 required = True
 
-[fms]
-# Older tag than CESM as there is a compilation error mismatch
-tag = fi_20211011
-protocol = git
-repo_url = https://github.com/ESCOMP/FMS_interface
-local_path = libraries/FMS
-externals = Externals_FMS.cfg
-required = True
-
 [mosart]
-tag = mosart1_0_48
 protocol = git
-repo_url = https://github.com/ESCOMP/MOSART
+tag = mosart1_0_48_noresm_v1
+repo_url = https://github.com/NorESMhub/MOSART
 local_path = components/mosart
 required = True
 
 [rtm]
-tag = rtm1_0_78
 protocol = git
+tag = rtm1_0_78
 repo_url = https://github.com/ESCOMP/RTM
 local_path = components/rtm
 required = True
 
 [cam]
-local_path = .
 protocol = externals_only
+local_path = .
 externals = Externals_CAM.cfg
 required = True
 
 [externals_description]
-schema_version = 1.0.0
+schema_version = 1.0.01

Externals_CAM.cfg

@@ -1,88 +1,80 @@
 [chem_proc]
-local_path = chem_proc
 protocol = git
-repo_url = https://github.com/ESCOMP/CHEM_PREPROCESSOR.git
 tag = chem_proc5_0_05
+repo_url = https://github.com/ESCOMP/CHEM_PREPROCESSOR.git
+local_path = chem_proc
 required = True
 
 [carma]
-local_path = src/physics/carma/base
 protocol = git
-repo_url = https://github.com/ESCOMP/CARMA_base.git
 tag = carma4_00
+repo_url = https://github.com/ESCOMP/CARMA_base.git
+local_path = src/physics/carma/base
 required = True
 
 [cosp2]
-local_path = src/physics/cosp2/src
 protocol = svn
-repo_url = https://github.com/CFMIP/COSPv2.0/tags/
 tag = v2.1.4cesm/src
+repo_url = https://github.com/CFMIP/COSPv2.0/tags/
+local_path = src/physics/cosp2/src
 required = True
 
 [clubb]
-local_path = src/physics/clubb
 protocol = svn
-repo_url = https://github.com/larson-group/clubb_release/tags/
 tag = clubb_4ncar_20221129_59cb19f_20230330_branchtag/src/CLUBB_core
+repo_url = https://github.com/larson-group/clubb_release/tags/
+local_path = src/physics/clubb
 required = True
 
 [silhs]
-local_path = src/physics/silhs
 protocol = svn
-repo_url = https://github.com/larson-group/clubb_release/tags/
 tag = clubb_4ncar_20221129_59cb19f_20230330_branchtag/src/SILHS
+repo_url = https://github.com/larson-group/clubb_release/tags/
+local_path = src/physics/silhs
 required = True
 
 [pumas]
-local_path = src/physics/pumas
 protocol = git
-repo_url = https://github.com/ESCOMP/PUMAS
 tag = pumas_cam-release_v1.29
+repo_url = https://github.com/ESCOMP/PUMAS
+local_path = src/physics/pumas
 required = True
 
 [pumas-frozen]
-local_path = src/physics/pumas-frozen
 protocol = git
-repo_url = https://github.com/ESCOMP/PUMAS
 tag = pumas_cam-release_v1.17_rename
+repo_url = https://github.com/ESCOMP/PUMAS
+local_path = src/physics/pumas-frozen
 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.1
+repo_url = https://github.com/ESCOMP/ALI-ARMS
+local_path = src/physics/ali_arms
 required = True
 
 [atmos_phys]
-tag = atmos_phys0_00_011
 protocol = git
+tag = atmos_phys0_00_011
 repo_url = https://github.com/NCAR/atmospheric_physics
-required = True
 local_path = src/atmos_phys
-
-[atmos_cubed_sphere]
-tag = fv3_cesm.04
-protocol = git
-repo_url = https://github.com/ESCOMP/FV3_CESM.git
-local_path = src/dynamics/fv3/atmos_cubed_sphere
 required = True
 
-[mpas]
-local_path = src/dynamics/mpas/dycore
+[camnor_phys]
 protocol = git
-repo_url = https://github.com/MPAS-Dev/MPAS-Model.git
-sparse = ../.mpas_sparse_checkout
-hash = ff76a231
+tag = camnor_noresm_v0.0.3
+repo_url = https://github.com/NorESMhub/CAM-Nor-physics
+local_path = src/physics/camnor_phys
 required = True
 
 [hemco]
-local_path = src/hemco
-tag = hemco-cesm1_2_0_hemco3_6_2_cesm
 protocol = git
+tag = hemco-cesm1_2_0_hemco3_6_2_cesm
 repo_url = https://github.com/ESCOMP/HEMCO_CESM.git
+local_path = src/hemco
 required = True
 externals = Externals_HCO.cfg
 
 [externals_description]
-schema_version = 1.0.0
+schema_version = 1.0.01

bld/config_files/definition.xml

@@ -26,8 +26,8 @@ Switch specifies whether CAM is being built by the CCSM sequential scripts.  0 =
 <entry id="cpl" valid_values="mct,nuopc" value="mct" >
 Coupling framework: mct or nuopc.  Default: mct.
 </entry>
-<entry id="dyn" valid_values="eul,fv,fv3,se,mpas" value="">
-Dynamics package: eul, fv, fv3, se, or mpas.
+<entry id="dyn" valid_values="eul,fv,se" value="">
+Dynamics package: eul, fv, or se.
 </entry>
 <entry id="waccm_phys" valid_values="0,1" value="0">
 Switch to turn on waccm physics: 0 => no, 1 => yes.
@@ -63,6 +63,9 @@ Physics package: cam3, cam4, cam5, cam6, cam_dev, held_suarez, adiabatic, kessle
 <entry id="hemco" valid_values="0,1" value="0">
 Switch to turn on Harmonized Emissions Component (HEMCO) for chemistry: 0 => no, 1 => yes.
 </entry>
+<entry id="camnor" valid_values="0,1" value="0">
+Option to turn on NorESM modifications to baseline CESM/CAM physics and dynamics
+</entry>
 <entry id="microphys" valid_values="rk,mg1,mg2,mg3,spcam_m2005,spcam_sam1mom,none" value="">
 Microphysics package: rk (Rasch and Kristjansson), mg1 (Morrison and
 Gettelman two moment scheme CAM5.1), mg2 (Morrison and Gettelman second
@@ -127,7 +130,7 @@ Chemistry source directory generated by the chemistry preprocessor; contains F90
 <entry id="chem_src_dir" value="">
 Chemistry source directory; contains F90 files.
 </entry>
-<entry id="ocn" valid_values="docn,dom,som,socn,aquaplanet,pop,mom" value="docn">
+<entry id="ocn" valid_values="docn,dom,som,socn,aquaplanet,pop,mom,nemo,blom" value="docn">
 Use data ocean model (docn or dom), stub ocean (socn), or aqua planet ocean
 (aquaplanet) in cam build.  When built from the CESM scripts the value of
 ocn may be set to pop.  This doesn't impact how CAM is built, only how
@@ -297,12 +300,6 @@ Switch to enable building COSP simulator package.  1 => build COSP.
 <entry id="cosp_libdir" value="">
 Directory containing COSP library.
 </entry>
-<entry id="fv3core_libdir" value="">
-Directory containing FV3CORE library.
-</entry>
-<entry id="mpas_libdir" value="">
-Directory containing MPAS library.
-</entry>
 <entry id="target_os" value="">
 OS for which CAM is being built.  The default value is the name contained
 in Perl's $OSNAME variable.  This parameter allows the user to override