cam6_4_023: SCAM-SE feature addition plus bugfixes and some refactoring.

Externals.cfg

@@ -1,7 +1,7 @@
 [ccs_config]
-tag = ccs_config_cesm0.0.82
+branch = ccs_config_cesm_scamdev
 protocol = git
-repo_url = https://github.com/ESMCI/ccs_config_cesm
+repo_url = https://github.com/jtruesdal/ccs_config_cesm
 local_path = ccs_config
 required = True
 
@@ -13,17 +13,17 @@ local_path = components/cice5
 required = True
 
 [cice6]
-tag = cesm_cice6_4_1_10
+tag = cesm_cice6_5_0_7
 protocol = git
 repo_url = https://github.com/ESCOMP/CESM_CICE
 local_path = components/cice
 externals = Externals.cfg
 required = True
 
 [cmeps]
-tag = cmeps0.14.43
+branch = cmeps0.14.43_scamdev
 protocol = git
-repo_url = https://github.com/ESCOMP/CMEPS.git
+repo_url = https://github.com/jtruesdal/CMEPS.git
 local_path = components/cmeps
 required = True
 
@@ -43,9 +43,9 @@ local_path = components/cpl7
 required = True
 
 [share]
-tag = share1.0.17
+tag = share1.0.17_scamdev
 protocol = git
-repo_url = https://github.com/ESCOMP/CESM_share
+repo_url = https://github.com/jtruesdal/CESM_share
 local_path = share
 required = True
 
@@ -79,9 +79,9 @@ externals = Externals_CISM.cfg
 required = True
 
 [clm]
-tag = ctsm5.1.dev142
+tag = ctsm5.1.dev142_scamdev
 protocol = git
-repo_url = https://github.com/ESCOMP/CTSM
+repo_url = https://github.com/jtruesdal/ctsm
 local_path = components/clm
 externals = Externals_CLM.cfg
 required = True

bld/build-namelist

@@ -511,6 +511,7 @@ if ($adia_mode or $ideal_mode) { $simple_phys = 1; }
 
 # Single column mode
 my $scam = $cfg->get('scam');
+my $scam_iop = $cfg->get('scam_iop');
 
 # Coupling interval
 # The default is for CAM to couple to the surface components every CAM timestep.
@@ -2475,7 +2476,7 @@ if (($chem =~ /_mam4/ or $chem =~ /_mam5/) and ($phys =~ /cam6/ or $phys =~ /cam
     }
 
     # MEGAN emissions
-    if (($chem eq 'trop_mam4' or $chem eq 'waccm_sc_mam4' or $chem eq 'ghg_mam4') and !$aqua_mode and !$scam){
+    if (($chem eq 'trop_mam4' or $chem eq 'waccm_sc_mam4' or $chem eq 'ghg_mam4') and !$aqua_mode){
         my $val = "'SOAE = 0.5954*isoprene + 5.1004*(carene_3 + pinene_a + thujene_a + bornene +',"
                 . "' terpineol_4 + terpineol_a + terpinyl_ACT_a + myrtenal + sabinene + pinene_b + camphene +',"
                 . "' fenchene_a + limonene + phellandrene_a + terpinene_a + terpinene_g + terpinolene +',"
@@ -3191,7 +3192,7 @@ if ($cfg->get('microphys') =~ /^mg/) {
         my $abs_path = quote_string(set_abs_filepath($rel_path, $cam_dir));
         #overwrite the relative pathname with the absolute pathname
         $nl->set_variable_value('pumas_stochastic_tau_nl', 'pumas_stochastic_tau_kernel_filename', $abs_path);
-      
+
     }else {
     # For CESM2, the decision was made to set micro_do_sb_physics to false
     # This variable is replaced with micro_mg_warm_rain in cam_dev runs
@@ -4003,6 +4004,30 @@ if ($dyn eq 'sld') {
 # Single column model
 if ($cfg->get('scam')) {
     add_default($nl, 'iopfile');
+    add_default($nl, 'nhtfrq');
+    add_default($nl, 'mfilt');
+    add_default($nl, 'scm_use_obs_uv');
+    add_default($nl, 'scale_dry_air_mass');
+    add_default($nl, 'scm_relaxation');
+    add_default($nl, 'scm_relax_bot_p');
+    add_default($nl, 'scm_relax_top_p');
+    add_default($nl, 'scm_relax_linear');
+    add_default($nl, 'scm_relax_tau_bot_sec');
+    add_default($nl, 'scm_relax_tau_top_sec');
+    if ($chem =~ /_mam/) {
+	add_default($nl, 'scm_relax_fincl');
+    }
+    if ($cfg->get('scam_iop')) {
+	add_default($nl, 'iopfile');
+    }
+    if ($scam_iop eq 'SAS') {
+	add_default($nl, 'use_gw_front');
+	add_default($nl, 'scm_backfill_iop_w_init');
+    }
+    if ($scam_iop eq 'twp06') {
+        add_default($nl, 'iradsw');
+        add_default($nl, 'iradlw');
+    }
 }
 
 # CAM generates IOP file for SCAM

bld/config_files/definition.xml

@@ -147,12 +147,16 @@ Turn on CO2 cycle in biogeochemistry model: 0 => no, 1 => yes.
 Modifications that allow perturbation growth testing: 0=off, 1=on.
 </entry>
 <entry id="scam" valid_values="0,1" value="0">
-Configure CAM for single column mode: 0=off, 1=on.  This option only
-supported for the Eulerian dycore.
+Configure CAM for single column mode and specify an IOP.
+This option only supported for the Eulerian and SE dycores.
+</entry>
+<entry id="scam_iop" valid_values="arm95,arm97,atex,bomex,cgilss11,cgilss12,cgilss6,dycomsrf01,dycomsrf02,gateiii,mpace,rico,sas,sparticus,togaii,twp06,camfrc,none" value="none">
+Single column IOP
+Supported for Eulerian and SE dycores.
 </entry>
 <entry id="camiop" valid_values="0,1" value="0">
 Configure CAM to generate an IOP file that can be used to drive SCAM: 0=no, 1=yes.
-This option only supported for the Eulerian dycore.
+Supported for Eulerian and SE dycores.
 </entry>
 <entry id="hgrid" value="">
 Horizontal grid specifier.  The recognized values depend on

bld/configure

@@ -124,7 +124,10 @@ OPTIONS
 
      -camiop            Configure CAM to generate an IOP file that can be used to drive SCAM.
                         This switch only works with the Eulerian dycore.
-     -scam              Compiles model in single column mode.  Only works with Eulerian dycore.
+     -scam <iopname>    Compiles model in single column mode and configures for iop
+                        [ arm95 | arm97 | atex | bomex | cgilsS11 | cgilsS12 | cgilsS6 | dycomsRF01 |
+                          dycomsRF02 | gateIII | mpace | rico | sparticus | togaII | twp06 | SAS | camfrc ].
+                        Default: arm97
 
   CAM parallelization:
 
@@ -296,7 +299,7 @@ GetOptions(
     "psubcols=s"                => \$opts{'psubcols'},
     "rad=s"                     => \$opts{'rad'},
     "offline_drv=s"             => \$opts{'offline_drv'},
-    "scam"                      => \$opts{'scam'},
+    "scam=s"                    => \$opts{'scam'},
     "silhs"                     => \$opts{'silhs'},
     "s|silent"                  => \$opts{'silent'},
     "smp!"                      => \$opts{'smp'},
@@ -1188,15 +1191,25 @@ if ($print>=2) { print "Perturbation growth testing: $pergro$eol"; }
 
 #-----------------------------------------------------------------------------------------------
 # Single column mode
+
+# Set default iop
+my $scam_iop;
+
+# Allow the user to override the default via the commandline.
+if (defined $opts{'scam'}) {
+    $scam_iop = lc($opts{'scam'});
+    $cfg_ref->set('scam_iop', $scam_iop);
+}
+
 if (defined $opts{'scam'}) {
     $cfg_ref->set('scam', 1);
 }
 my $scam = $cfg_ref->get('scam') ? "ON" : "OFF";
 
-# The only dycore supported in SCAM mode is Eulerian
-if ($scam eq 'ON' and $dyn_pkg ne 'eul') {
+# The only dycores supported in SCAM mode are Eulerian and Spectral Elements
+if ($scam eq 'ON' and !($dyn_pkg eq 'eul' or $dyn_pkg eq 'se')) {
     die <<"EOF";
-**  ERROR: SCAM mode only works with Eulerian dycore.
+**  ERROR: SCAM mode only works with Eulerian or SE dycores.
 **         Requested dycore is: $dyn_pkg
 EOF
 }
@@ -1210,10 +1223,10 @@ if (defined $opts{'camiop'}) {
 }
 my $camiop = $cfg_ref->get('camiop') ? "ON" : "OFF";
 
-# The only dycore supported in CAMIOP mode is Eulerian
-if ($camiop eq 'ON' and $dyn_pkg ne 'eul') {
+# The only dycores supported in SCAM mode are Eulerian and Spectral Elements
+if ($camiop eq 'ON' and !($dyn_pkg eq 'eul' or $dyn_pkg eq 'se')) {
     die <<"EOF";
-**  ERROR: CAMIOP mode only works with Eulerian dycore.
+**  ERROR: CAMIOP mode only works with the Eulerian or Spectral Element dycores.
 **         Requested dycore is: $dyn_pkg
 EOF
 }