Merge pull request ESCOMP#1406 from brian-eaton/rm-uni

cam6_4_125: remove unicon; remove -ocn option; misc

Author: brian-eaton

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

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

bld/namelist_files/namelist_defaults_cam.xml

@@ -2105,7 +2105,6 @@
 <conv_water_in_rad phys="cam7"      > 1 </conv_water_in_rad>
 
 <conv_water_frac_limit            > 0.01d0  </conv_water_frac_limit>
-<conv_water_frac_limit unicon="1" > 0.001d0 </conv_water_frac_limit>
 
 <!-- CLUBB_SGS -->
 <do_clubb_sgs                                 > .false. </do_clubb_sgs>
@@ -2489,7 +2488,6 @@
 <eddy_max_bot_pressure phys="cam7"    waccm_phys="1" >100.D0</eddy_max_bot_pressure>
 
 <eddy_moist_entrain_a2l           >30.D0</eddy_moist_entrain_a2l>
-<eddy_moist_entrain_a2l unicon="1">40.D0</eddy_moist_entrain_a2l>
 
 <diff_cnsrv_mass_check> .false. </diff_cnsrv_mass_check>
 
@@ -2571,10 +2569,8 @@
 <sol_facti_cloud_borne clubb_sgs="1" microphys="mg3"                  >1.0D0</sol_facti_cloud_borne>
 
 <sol_factb_interstitial                >0.1D0</sol_factb_interstitial>
-<sol_factb_interstitial unicon="1"     >1.0D0</sol_factb_interstitial>
 
 <sol_factic_interstitial                >0.4D0</sol_factic_interstitial>
-<sol_factic_interstitial unicon="1"     >1.0D0</sol_factic_interstitial>
 
 <!-- sub-column switches for physics packages -->
 <use_subcol_microp                  >.false.</use_subcol_microp>
@@ -2642,12 +2638,10 @@
 <!-- convection schemes -->
 <deep_scheme                     >ZM       </deep_scheme>
 <deep_scheme           silhs="1" >off      </deep_scheme>
-<deep_scheme unicon="1"          >UNICON   </deep_scheme>
 <deep_scheme pbl="none"          >NONE     </deep_scheme>
 
 <shallow_scheme pbl="none"         >NONE     </shallow_scheme>
 <shallow_scheme pbl="uw"           >UW       </shallow_scheme>
-<shallow_scheme pbl="uw" unicon="1">UNICON   </shallow_scheme>
 <shallow_scheme pbl="hb"           >Hack     </shallow_scheme>
 <shallow_scheme pbl="hbr"          >Hack     </shallow_scheme>
 <shallow_scheme pbl="clubb_sgs"    >CLUBB_SGS</shallow_scheme>
@@ -2662,8 +2656,6 @@
 
 <cldfrc_rhminl                                                        > 0.900D0 </cldfrc_rhminl>
 <cldfrc_rhminl                   phys="cam5" carma="cirrus"           > 0.910D0 </cldfrc_rhminl>
-<cldfrc_rhminl dyn="fv"          phys="cam5" unicon="1"               > 0.850D0 </cldfrc_rhminl>
-<cldfrc_rhminl dyn="se"          phys="cam5" unicon="1"               > 0.850D0 </cldfrc_rhminl>
 <cldfrc_rhminl                   phys="cam5" microphys="mg2"          > 0.950D0 </cldfrc_rhminl>
 <cldfrc_rhminl                   phys="cam5" microphys="mg3"          > 0.950D0 </cldfrc_rhminl>
 
@@ -2688,8 +2680,6 @@
 <cldfrc_rhminl hgrid="1.9x2.5"   phys="cam4"                          > 0.910D0 </cldfrc_rhminl>
 <cldfrc_rhminl hgrid="0.9x1.25"  phys="cam4"                          > 0.920D0 </cldfrc_rhminl>
 <cldfrc_rhminl hgrid="0.47x0.63" phys="cam4"                          > 0.920D0 </cldfrc_rhminl>
-<!-- Note: the ocn attribute allows coupled and uncoupled configurations to have different tunings -->
-<cldfrc_rhminl hgrid="0.47x0.63" phys="cam4" ocn="docn"               > 0.913D0 </cldfrc_rhminl>
 <cldfrc_rhminl dyn="se"          phys="cam4"                          > 0.910D0 </cldfrc_rhminl>
 
 <cldfrc_rhminl_adj_land                                               > 0.100D0 </cldfrc_rhminl_adj_land>
@@ -2754,11 +2744,9 @@
 <cldfrc_icecrit phys="cam7"    carma="cirrus"> 0.70D0 </cldfrc_icecrit>
 
 <cldfrc2m_rhmini               >  0.80D0  </cldfrc2m_rhmini>
-<cldfrc2m_rhmini   unicon="1"  >  0.85D0  </cldfrc2m_rhmini>
 <cldfrc2m_rhmini clubb_sgs="1" >  0.80D0  </cldfrc2m_rhmini>
 
 <cldfrc2m_rhminis               >  1.0D0 </cldfrc2m_rhminis>
-<cldfrc2m_rhminis  unicon="1"   >  0.85D0 </cldfrc2m_rhminis>
 
 <cldfrc2m_rhmaxi                                     >  1.1D0  </cldfrc2m_rhmaxi>
 <cldfrc2m_rhmaxi    clubb_sgs="1"                    >  1.0D0  </cldfrc2m_rhmaxi>
@@ -2779,7 +2767,6 @@
 
 <!-- Cldwat -->
 <rk_strat_icritc                                                        >  5.0e-6  </rk_strat_icritc>
-<rk_strat_icritc  dyn="fv"           unicon="1"                         >  9.5e-6  </rk_strat_icritc>
 <rk_strat_icritc  hgrid="0.23x0.31"                                     > 45.0e-6  </rk_strat_icritc>
 <rk_strat_icritc  hgrid="0.47x0.63"                                     > 45.0e-6  </rk_strat_icritc>
 <rk_strat_icritc  hgrid="0.5x0.625"                                     > 45.0e-6  </rk_strat_icritc>
@@ -2954,7 +2941,7 @@
   'T', 'bc_a1', 'bc_a4', 'dst_a1', 'dst_a2', 'dst_a3', 'ncl_a1', 'ncl_a2', 'ncl_a3',
   'num_a1', 'num_a2', 'num_a3', 'num_a4', 'pom_a1', 'pom_a4', 'so4_a1', 'so4_a2', 'so4_a3', 'soa_a1', 'soa_a2'
 </scm_relax_fincl>
-<scm_relax_fincl   phys="cam_dev"scam="1"  >
+<scm_relax_fincl   phys="cam7"   scam="1"  >
   'T', 'bc_a1', 'bc_a4', 'dst_a1', 'dst_a2', 'dst_a3', 'ncl_a1', 'ncl_a2', 'ncl_a3',
   'num_a1', 'num_a2', 'num_a3', 'num_a4', 'pom_a1', 'pom_a4', 'so4_a1', 'so4_a2', 'so4_a3', 'soa_a1', 'soa_a2'
 </scm_relax_fincl>

bld/namelist_files/namelist_definition.xml

@@ -3520,10 +3520,10 @@ Default: 10
 <!-- Moist Convection and Microphysics -->
 
 <entry id="deep_scheme" type="char*16" category="conv"
-       group="phys_ctl_nl" valid_values="ZM,UNICON,off,CLUBB_SGS" >
+       group="phys_ctl_nl" valid_values="ZM,off,CLUBB_SGS" >
 Type of deep convection scheme employed.  'ZM' for Zhang-McFarlane;
-'off' for none; or 'UNICON' which doesn't distinquish shallow and deep.
-Default: 'ZM' unless using 'UNICON' or 'pbl=none'
+'off' for none.
+Default: 'ZM' unless using 'pbl=none'
 </entry>
 
 <entry id="microp_scheme" type="char*16" category="conv"
@@ -3550,12 +3550,11 @@ Default: set by build-namelist
 </entry>
 
 <entry id="shallow_scheme" type="char*16" category="conv"
-       group="phys_ctl_nl" valid_values="Hack,UW,CLUBB_SGS,UNICON" >
+       group="phys_ctl_nl" valid_values="Hack,UW,CLUBB_SGS" >
 Type of shallow convection scheme employed.
  'Hack' for Hack shallow convection;
  'UW' for original McCaa UW pbl scheme, modified by Sungsu Park;
  'CLUBB_SGS' for CLUBB_SGS
- 'UNICON' which doesn't distinquish shallow and deep.
 Default: set by build-namelist (depends on {{ hilight }}eddy_scheme{{ closehilight }}).
 </entry>
 
@@ -3655,18 +3654,6 @@ diffusion solver routine.
 Default: set by build-namelist
 </entry>
 
-<entry id="unicon_offline_dat_out" type="logical"  category="diagnostics"
-       group="unicon_nl" valid_values="" >
-Produce output for the offline unicon driver.
-Default: .false.
-</entry>
-
-<entry id="unicon_offline_dat_hfile" type="integer"  category="diagnostics"
-       group="unicon_nl" valid_values="" >
-History file number for offline unicon driver output.
-Default: 2 (i.e., h1 history file)
-</entry>
-
 <!-- CLUBB PBL Diff nl -->
 
 <entry id="clubb_cloudtop_cooling" type="logical"  category="pblrad"

cime_config/buildcpp

@@ -34,8 +34,6 @@ def buildcpp(case):
     atm_grid = case.get_value("ATM_GRID")
     pts_mode = case.get_value("PTS_MODE")
     cam_dycore = case.get_value("CAM_DYCORE")
-    comp_ocn = case.get_value("COMP_OCN")
-    docn_mode = case.get_value("DOCN_MODE")
     mpilib = case.get_value("MPILIB")
     compiler = case.get_value("COMPILER") # for chem preprocessor
     nthrds_atm = case.get_value("NTHRDS_ATM")
@@ -85,15 +83,6 @@ def buildcpp(case):
                  case.set_value("CASE_SUPPORT_LIBRARIES", ",".join(libs))
          except:
              pass
-    # The ocean component setting is only used by CAM to do attribute matching for
-    # setting default tuning parameter values.  In SOM mode we want to use the same
-    # tunings as the fully coupled B compset, so set the ocean component to pop in
-    # that case.
-
-    if docn_mode == 'som':
-        config_opts += ["-ocn", "pop"]
-    else:
-        config_opts += ["-ocn", comp_ocn]
 
     # Add user options.
     config_opts += cam_config_opts.split(" ")

cime_config/config_compsets.xml

@@ -112,7 +112,7 @@
 
   <compset>
     <alias>FSCAMARM95</alias>
-    <lname>2000_CAM60%FSCAMARM95_CLM50%SP_CICE%PRES_DOCN%DOM_SROF_SGLC_SWAV</lname>
+    <lname>2000_CAM60%SCAMARM95_CLM50%SP_CICE%PRES_DOCN%DOM_SROF_SGLC_SWAV</lname>
   </compset>
 
   <compset>