merge up to cam_development

Author: peverwhee

.gitmodules

@@ -2,7 +2,7 @@
 	path = chem_proc
 	url = https://github.com/ESCOMP/CHEM_PREPROCESSOR.git
         fxrequired = AlwaysRequired
-        fxtag = chem_proc5_0_06
+        fxtag = chem_proc5_0_07
 	fxDONOTUSEurl = https://github.com/ESCOMP/CHEM_PREPROCESSOR.git
 
 [submodule "carma"]
@@ -107,13 +107,6 @@
         fxtag = clubb_4ncar_20240605_73d60f6_gpufixes_posinf
         fxDONOTUSEurl = https://github.com/larson-group/clubb_release
 
-[submodule "cism"]
-path = components/cism
-url = https://github.com/ESCOMP/CISM-wrapper
-fxtag = cismwrap_2_2_010
-fxrequired = ToplevelRequired
-fxDONOTUSEurl = https://github.com/ESCOMP/CISM-wrapper
-
 [submodule "rtm"]
 path = components/rtm
 url = https://github.com/ESCOMP/RTM
@@ -138,7 +131,7 @@ 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.61
+fxtag = ccs_config_cesm1.0.63
 fxrequired = ToplevelRequired
 fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git
 
@@ -204,4 +197,3 @@ url = https://github.com/NCAR/CUPiD.git
 fxtag = v0.3.1
 fxrequired = ToplevelRequired
 fxDONOTUSEurl = https://github.com/NCAR/CUPiD.git
-

bld/build-namelist

@@ -50,8 +50,8 @@ OPTIONS
                            of the CAM executable.  Default: "config_cache.xml".
      -csmdata "dir"        Root directory of CESM input data.
                            Can also be set by using the CSMDATA environment variable.
-     -dir "directory"      Directory where output namelist files for each component will be
-                           written, i.e., atm_in, drv_in, ice_in, lnd_in, rof_in, and ocn_in.
+     -dir "directory"      Directory where output namelist files, "atm_in" and "drv_flds_in",
+                           will be written.
                            Default: current working directory.
      -help [or -h]         Print usage to STDOUT.
      -ignore_ic_date       Ignore the date of the initial condition files
@@ -4444,12 +4444,14 @@ for my $i (0 .. $#interp_output) {
 
 # Currently, interpolated output does not work with the COSP fields that use
 # more than 1 mdims.
-my $cosp_histfile_num = $nl->get_value('cosp_histfile_num');
-if (!defined $cosp_histfile_num) {$cosp_histfile_num = 1;}
-if ($interp_output[$cosp_histfile_num-1] =~ /$TRUE/io) {
-    die "$ProgName - ERROR: interpolate_output does not work with COSP.  Use cosp_histfile_num\n" .
-        " to direct COSP output to a history file that is not interpolated.  COSP output is\n" .
-        " currently on cosp_histfile_num=$cosp_histfile_num which contains interpolated output.";
+if ($docosp) {
+    my $cosp_histfile_num = $nl->get_value('cosp_histfile_num');
+    if (!defined $cosp_histfile_num) {$cosp_histfile_num = 1;}
+    if ($interp_output[$cosp_histfile_num-1] =~ /$TRUE/io) {
+        die "$ProgName - ERROR: interpolate_output does not work with COSP.  Use cosp_histfile_num\n" .
+            " to direct COSP output to a history file that is not interpolated.  COSP output is\n" .
+            " currently on cosp_histfile_num=$cosp_histfile_num which contains interpolated output.";
+    }
 }
 
 
@@ -5281,6 +5283,7 @@ sub check_snapshot_settings {
             push (@validList_ac, ("'chem_timestep_tend'"));
         }
         push (@validList_ac, ("'vertical_diffusion_section'",
+                              "'orographic_form_drag_stress'",
                               "'aero_model_drydep'", "'gw_tend'",
                               "'qbo_relax'", "'iondrag_calc_section'",
                               "'physics_dme_adjust'"));
@@ -5296,6 +5299,7 @@ sub check_snapshot_settings {
             push (@validList_ac, ("'chem_timestep_tend'"));
         }
         push (@validList_ac, ("'vertical_diffusion_section'",
+                              "'orographic_form_drag_stress'",
                               "'aero_model_drydep'", "'gw_tend'",
                               "'qbo_relax'", "'iondrag_calc_section'",
                               "'physics_dme_adjust'"));

bld/config_files/definition.xml

@@ -79,9 +79,6 @@ Switch to turn on CLUBB_SGS package: 0 => no, 1 => yes
 <entry id="silhs" valid_values="0,1" value="0">
 Switch to turn on SILHS package: 0 => no, 1 => yes
 </entry>
-<entry id="unicon" valid_values="0,1" value="0">
-Switch to turn on UNICON package: 0 => off, 1 => on
-</entry>
 <entry id="clubb_do_adv" valid_values="0,1" value="0">
 Switch to turn on/off advecting CLUBB moments: 0 => no, 1 => yes
 </entry>
@@ -127,18 +124,8 @@ 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,mpaso" 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, mom, or mpaso.  This doesn't impact how CAM is built, only how
-attributes are matched when searching for namelist defaults.  If ocn is set
-to som then the docn component is used.
-</entry>
 <entry id="aquaplanet" valid_value="0,1" value="0">
-Switch for aquaplanet mode.  By default this switch sets the ocn component
-to use an analytic expression for SST.  To use aquaplanet with time varying
-SSTs read from a dataset, or with a slab ocean, the ocean component should
-be set to DOCN.
+Switch for aquaplanet mode.  Used by build-namelist.
 </entry>
 <entry id="co2_cycle" valid_values="0,1" value="0">
 Turn on CO2 cycle in biogeochemistry model: 0 => no, 1 => yes.

bld/configure

@@ -104,7 +104,6 @@ OPTIONS
      -psubcols <n>      Maximum number of sub-columns in a run - set to 1 if not using sub-columns (default)
      -rad <name>        Specify the radiation package [rrtmg | rrtmgp | rrtmgp_gpu | camrt]
      -silhs             Switch on SILHS.
-     -unicon            Switch to turn on the UNICON scheme. Default: off.
      -usr_mech_infile   Path and file name of the user supplied chemistry mechanism file.
      -waccm_phys        Switch enables the use of WACCM physics in any chemistry configuration.
                         The user does not need to set this if one of the waccm chemistry options
@@ -276,7 +275,6 @@ GetOptions(
     "nc_lib=s"                  => \$opts{'nc_lib'},
     "nc_mod=s"                  => \$opts{'nc_mod'},
     "nlev=s"                    => \$opts{'nlev'},
-    "ocn=s"                     => \$opts{'ocn'},
     "offline_dyn"               => \$opts{'offline_dyn'},
     "pbl=s"                     => \$opts{'pbl'},
     "pcols=s"                   => \$opts{'pcols'},
@@ -296,7 +294,6 @@ GetOptions(
     "smp!"                      => \$opts{'smp'},
     "spmd!"                     => \$opts{'spmd'},
     "target_os=s"               => \$opts{'target_os'},
-    "unicon"                    => \$opts{'unicon'},
     "usr_mech_infile=s"         => \$opts{'usr_mech_infile'},
     "usr_src=s"                 => \$opts{'usr_src'},
     "v|verbose"                 => \$opts{'verbose'},
@@ -946,27 +943,6 @@ $cfg_ref->set('pbl', $pbl_pkg);
 
 if ($print>=2) { print "PBL package: $pbl_pkg$eol"; }
 
-#-----------------------------------------------------------------------------------------------
-# UNICON
-
-if (defined $opts{'unicon'}) {
-    $cfg_ref->set('unicon', $opts{'unicon'});
-}
-my $unicon = $cfg_ref->get('unicon');
-
-# consistency checks...
-
-# UNICON assumes park macrophysics, uw pbl, and mg microphysics
-if ($unicon and
-    ($macrophys_pkg ne 'park' or $pbl_pkg ne 'uw' or $microphys_pkg !~ m/^mg/) ) {
-    die <<"EOF";
-**    ERROR: UNICON assumes macrophys='park', pbl='uw', microphys='mg*'.  Current values are:
-**    macrophys: $macrophys_pkg, pbl: $pbl_pkg, microphys: $microphys_pkg.
-EOF
-}
-
-if ($unicon and $print>=2) { print "Using UNICON scheme.$eol"; }
-
 #-----------------------------------------------------------------------------------------------
 # Radiation package
 
@@ -1053,25 +1029,6 @@ $cfg_ref->set('aquaplanet', $aquaplanet);
 my $aqua_mode = $aquaplanet ? "ON" : "OFF";
 if ($print>=2) { print "Aqua-planet mode: $aqua_mode$eol"; }
 
-#-----------------------------------------------------------------------------------------------
-# Ocean model
-my $ocn_pkg = 'socn';
-if ($aquaplanet) {
-    # Default for aquaplanet mode is to use an analytic expression for fixed SST.
-    $ocn_pkg = 'aquaplanet';
-}
-
-# Allow the user to override the default via the commandline.
-# For aquaplanet with SOM the option '-ocn som' should be used to override
-# aquaplanet's default ocean component setting.
-if (defined $opts{'ocn'}) {
-    $ocn_pkg = lc($opts{'ocn'});
-}
-
-$cfg_ref->set('ocn', $ocn_pkg);
-
-if ($print>=2) { print "Ocean package: $ocn_pkg$eol"; }
-
 #-----------------------------------------------------------------------------------------------
 # Use modifications for perturbation growth testing?
 if (defined $opts{'pergro'}) {
@@ -1471,12 +1428,6 @@ else {
             if ($print>=2) { print "Advected constituents added by CARMA model $carma_pkg: $carma_nadv$eol"; }
         }
 
-        # UNICON tracers
-        if ($unicon) {
-            $nadv += 5;
-            if ($print>=2) { print "Advected constituents added by UNICON: 5$eol"; }
-        }
-
     }
 
     # Special case for Kessler physics, need ice and water tracers
@@ -1837,9 +1788,6 @@ if ($silhs == 1) {
 # Simple Models
 if ($simple_phys) { $cfg_cppdefs .= ' -DSIMPLE'; }
 
-# UNICON
-if ($unicon) { $cfg_cppdefs .= ' -DUSE_UNICON'; }
-
 # Harmonized Emissions Component (HEMCO)
 # These CPP definitions are used by HEMCO to recognize -
 #   MODEL_     - HEMCO/GEOS-Chem components running in model environment
@@ -2186,8 +2134,9 @@ sub write_filepath
     print $fh "$camsrcdir/src/atmos_phys/schemes/rasch_kristjansson\n";
     print $fh "$camsrcdir/src/atmos_phys/schemes/utilities\n";
     print $fh "$camsrcdir/src/atmos_phys/schemes/rayleigh_friction\n";
-
     print $fh "$camsrcdir/src/atmos_phys/schemes/cloud_fraction\n";
+    print $fh "$camsrcdir/src/atmos_phys/schemes/vertical_diffusion\n";
+    print $fh "$camsrcdir/src/atmos_phys/schemes/holtslag_boville\n";
 
     # Dynamics package and test utilities
     print $fh "$camsrcdir/src/dynamics/$dyn\n";