Merge tag cam6_3_160 from ESCOMP/CAM into 'ew-develop'

Update EarthWorksOrg/CAM with upstream work from
ESCOMP/CESM/cesm2_3_beta17

.gitignore

@@ -14,7 +14,7 @@ src/physics/pumas
 src/physics/pumas-frozen
 src/physics/rrtmgp/data
 src/physics/rrtmgp/ext
-src/dynamics/fv3/atmos_cubed_sphere
+src/dynamics/fv3
 libraries/FMS
 libraries/mct
 libraries/parallelio

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.59
 protocol = git
 repo_url = https://github.com/ESCOMP/CMEPS.git
 local_path = components/cmeps
 required = True
 
 [cdeps]
-tag = cdeps1.0.24
+tag = cdeps1.0.31
 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.236_httpsbranch01
 protocol = git
 repo_url = https://github.com/ESMCI/cime
 local_path = cime
@@ -79,16 +79,15 @@ 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
 externals = Externals_CLM.cfg
 required = True
 
 [fms]
-# Older tag than CESM as there is a compilation error mismatch
-tag = fi_20211011
+tag = fi_230818
 protocol = git
 repo_url = https://github.com/ESCOMP/FMS_interface
 local_path = libraries/FMS

Externals_CAM.cfg

@@ -25,7 +25,7 @@ local_path = src/physics/clubb
 protocol = git
 repo_url = https://github.com/larson-group/clubb_release
 sparse = ../.clubb_sparse_checkout
-tag = clubb_4ncar_20221129_59cb19f_20230330_branchtag
+tag = clubb_4ncar_20231115_5406350
 required = True
 
 [pumas]
@@ -50,17 +50,18 @@ tag = ALI_ARMS_v1.0.1
 required = True
 
 [atmos_phys]
-tag = atmos_phys0_02_000
+tag = atmos_phys0_02_006
 protocol = git
 repo_url = https://github.com/ESCOMP/atmospheric_physics
 required = True
 local_path = src/atmos_phys
 
-[atmos_cubed_sphere]
-tag = fv3_cesm.04
+[fv3]
+tag = fv3int_022824
 protocol = git
-repo_url = https://github.com/ESCOMP/FV3_CESM.git
-local_path = src/dynamics/fv3/atmos_cubed_sphere
+repo_url = https://github.com/ESCOMP/CAM_FV3_interface.git
+local_path = src/dynamics/fv3
+externals = Externals_FV3.cfg
 required = True
 
 [mpas]

bld/build-namelist

@@ -3446,6 +3446,7 @@ if ($clubb_sgs  =~ /$TRUE/io) {
        add_default($nl, 'clubb_gamma_coefb');
    }
 
+   add_default($nl, 'clubb_bv_efold');
    add_default($nl, 'clubb_C7');
    add_default($nl, 'clubb_C7b');
    add_default($nl, 'clubb_c_K1');
@@ -3510,6 +3511,8 @@ if ($clubb_sgs  =~ /$TRUE/io) {
    add_default($nl, 'clubb_tridiag_solve_method');
    add_default($nl, 'clubb_up2_sfc_coef');
    add_default($nl, 'clubb_wpxp_L_thresh');
+   add_default($nl, 'clubb_wpxp_Ri_exp');
+   add_default($nl, 'clubb_z_displace');
 
    #CLUBB+MF options
    add_default($nl, 'do_clubb_mf');
@@ -4103,6 +4106,7 @@ if ($dyn =~ /se/) {
 		  se_kmax_jet
                   se_molecular_diff
 	          se_pgf_formulation
+	          se_dribble_in_rsplit_loop
         );
 
     my %opts;

bld/configure

@@ -2101,6 +2101,7 @@ sub write_fv3core_filepath
     my $camsrcdir   = $cfg_ref->get('cam_dir');
     my $CASEROOT = "$ENV{'CASEROOT'}";
     print $fh "$CASEROOT/SourceMods/src.cam\n";
+    print $fh "$camsrcdir/src/dynamics/fv3/src_override\n";
     print $fh "$camsrcdir/src/dynamics/fv3/microphys\n";
     print $fh "$camsrcdir/src/dynamics/fv3/atmos_cubed_sphere/model\n";
     print $fh "$camsrcdir/src/dynamics/fv3/atmos_cubed_sphere/tools\n";
@@ -2168,7 +2169,7 @@ sub write_filepath
 
     # Weak scaling fix. This has to come before physics/cam and before dycores
     # It also has to come before utils (which is already near the end).
-    if ($dyn eq 'se' or $dyn eq 'mpas') {
+    if ($dyn eq 'se' or $dyn eq 'mpas' or $dyn eq 'fv3') {
       print $fh "$camsrcdir/src/infrastructure\n";
     }
 
@@ -2188,9 +2189,9 @@ sub write_filepath
     if ($chem_src_dir) {
         print $fh "$chem_src_dir\n";
     }
- 
+
     # GEOS-Chem must be prior to Mozart
-    if ($chem_pkg =~ 'geoschem') {	
+    if ($chem_pkg =~ 'geoschem') {
 	print $fh "$chem_src_dir/geoschem_src/GeosCore\n";
 	print $fh "$chem_src_dir/geoschem_src/GeosUtil\n";
 	print $fh "$chem_src_dir/geoschem_src/Headers\n";
@@ -2302,7 +2303,7 @@ sub write_filepath
     print $fh "$camsrcdir/src/physics/cam\n";
 
     #Add the CCPP'ized subdirectories
-    print $fh "$camsrcdir/src/atmos_phys/zm\n";
+    print $fh "$camsrcdir/src/atmos_phys/zhang_mcfarlane\n";
 
     # Dynamics package and test utilities
     print $fh "$camsrcdir/src/dynamics/$dyn\n";