'merge fixes from release branch

Imported from https://svn-ccsm-models.cgd.ucar.edu/cam1/trunk@90256 Committed by Brian Eaton <[email protected]> at 2018-11-29 10:48:45 -0700 Original svn commit message: merge fixes from release branch'
ESCOMP · Oct 3, 2019 · 228b1d8 · 228b1d8
1 parent a0ef8eb
commit 228b1d8
Show file tree

Hide file tree

Showing 6 changed files with 163 additions and 72 deletions.
diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml
@@ -8,9 +8,9 @@
       CAM
     ===============
    -->
-    <desc atm="CAM60[%1PCT][%4xCO2][%CCTS][%CFIRE][%CVBSX][%PORT][%RCO2][%SCAM][%WCCM][%WCMD][%WCSC][%WCTS]">CAM cam6 physics:</desc>
-    <desc atm="CAM50[%CCTS][%CLB][%PORT][%RCO2][%SCAM][%WCSC][%WCTS]"              >CAM cam5 physics:</desc>
-    <desc atm="CAM40[%PORT][%RCO2][%SCAM][%TMOZ][%WXIE][%WXIED][%WCMD]"                   >CAM cam4 physics:</desc>
+    <desc atm="CAM60[%1PCT][%4xCO2][%CCTS][%CFIRE][%CVBSX][%PORT][%RCO2][%SCAM][%SDYN][%WCCM][%WCMD][%WCSC][%WCTS]">CAM cam6 physics:</desc>
+    <desc atm="CAM50[%CCTS][%CLB][%PORT][%RCO2][%SCAM][%SDYN][%WCSC][%WCTS]"              >CAM cam5 physics:</desc>
+    <desc atm="CAM40[%PORT][%RCO2][%SCAM][%SDYN][%TMOZ][%WXIE][%WXIED][%WCMD]"                   >CAM cam4 physics:</desc>
     <desc atm="CAM[%ADIAB][%DABIP04][%TJ16][%HS94][%KESSLER][%RCO2][%SPCAMS][%SPCAMCLBS][%SPCAMM][%SPCAMCLBM]">CAM simplified and non-versioned physics :</desc>
 
   <!--
@@ -27,7 +27,7 @@
     ===============
    -->
     <desc atm="CAM[456]0%SCAM"  >CAM stand-alone single column mode -- need to define usermods directory with IOP settings:</desc>
-    <desc atm="SDYN_CAM"        >CAM winds and temperature nudged towards prescribed meteorology:</desc>
+    <desc atm="%SDYN"        >CAM winds and temperature nudged towards prescribed meteorology:</desc>
   <!--
     ===============
      CAM Options
@@ -138,15 +138,15 @@
       <value compset="_(CAM50|CAM60)%WCTS">-chem waccm_tsmlt_mam4</value>
       <value compset="_CAM40%WX">-waccmx</value>
       <value compset="_CAM40%WXIE">-ionosphere wxie</value>
-      <value compset="_CAM40%WXIE_">-chem waccm_ma</value>
-      <value compset="_CAM40%WXIED_">-chem waccm_mad</value>
-      <value compset="_CAM40%WCMD_">-chem waccm_mad</value>
+      <value compset="_CAM40%WXIE">-chem waccm_ma</value>
+      <value compset="_CAM40%WXIED">-chem waccm_mad</value>
+      <value compset="_CAM40%WCMD">-chem waccm_mad</value>
 
-      <value compset="SDYN_CAM">-offline_dyn</value>
-      <value compset="SDYN_CAM\d0_CLM">-nlev 56</value>
-      <value compset="SDYN_CAM\d0%CC">-nlev 56</value>
-      <value compset="SDYN_CAM\d0%WC">-nlev 88</value>
-      <value compset="SDYN_CAM\d0%WX">-nlev 145</value>
+      <value compset="_CAM.*%SDYN">-offline_dyn</value>
+      <value compset="_CAM\d0%SDYN_CLM">-nlev 56</value>
+      <value compset="_CAM\d0%CC.*%SDYN">-nlev 56</value>
+      <value compset="_CAM\d0%WC.*%SDYN">-nlev 88</value>
+      <value compset="_CAM\d0%WX.*%SDYN">-nlev 145</value>
 
       <!-- Simple models -->
       <value compset="_CAM%HS94" grid="(%ne[0-9])|(%[0-9.]+x)">-analytic_ic</value>
@@ -240,13 +240,14 @@
       <value compset="RCP6_CAM50"        >2006-2100_cam5_rcp60</value>
       <value compset="RCP8_CAM50"        >2006-2100_cam5_rcp85</value>
 
-      <value compset="SDYN_CAM40%WXIE"   >sd_waccmx_ma_cam4</value>
-      <value compset="SDYN_CAM60%WCTS"   >sd_waccm_tsmlt_cam6</value>
-      <value compset="SDYN_CAM60%WCCM"   >sd_waccm_ma_cam6</value>
-      <value compset="SDYN_CAM60%WCMD"   >sd_waccm_ma_cam6</value>
-      <value compset="SDYN_CAM40%WCMD"   >sd_waccm_ma_cam4</value>
-      <value compset="SDYN_CAM60%CCTS"   >sd_trop_strat_vbs_cam6</value>
-      <value compset="SDYN_CAM60_CLM50"  >sd_cam6</value>
+      <value compset="_CAM40%WXIED%SDYN"  >sd_waccmx_ma_cam4</value>
+      <value compset="_CAM40%WXIE%SDYN"   >sd_waccmx_ma_cam4</value>
+      <value compset="_CAM60%WCTS%SDYN"   >sd_waccm_tsmlt_cam6</value>
+      <value compset="_CAM60%WCCM%SDYN"   >sd_waccm_ma_cam6</value>
+      <value compset="_CAM60%WCMD%SDYN"   >sd_waccm_ma_cam6</value>
+      <value compset="_CAM40%WCMD%SDYN"   >sd_waccm_ma_cam4</value>
+      <value compset="_CAM60%CCTS%SDYN"   >sd_trop_strat_vbs_cam6</value>
+      <value compset="_CAM60%SDYN_CLM50"  >sd_cam6</value>
 
       <value compset="2000_CAM%DABIP04"  >dabi_p2004</value>
       <value compset="CAM%HS94"          >held_suarez_1994</value>

diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml
@@ -215,12 +215,12 @@
 
   <compset>
     <alias>FCSD</alias>
-    <lname>SDYN_CAM60%CCTS_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
+    <lname>HIST_CAM60%CCTS%SDYN_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
   </compset>
 
   <compset>
     <alias>FSD</alias>
-    <lname>SDYN_CAM60_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
+    <lname>HIST_CAM60%SDYN_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
   </compset>
 
   <compset>
@@ -312,7 +312,7 @@
 
   <compset>
     <alias>FWSD</alias>
-    <lname>SDYN_CAM60%WCTS_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
+    <lname>HIST_CAM60%WCTS%SDYN_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
   </compset>
 
 
@@ -327,7 +327,7 @@
 
   <compset>
     <alias>FWmaSD</alias>
-    <lname>SDYN_CAM60%WCCM_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
+    <lname>HIST_CAM60%WCCM%SDYN_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
   </compset>
 
   <compset>
@@ -337,7 +337,7 @@
 
   <compset>
     <alias>FWmadSD</alias>
-    <lname>SDYN_CAM60%WCMD_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
+    <lname>HIST_CAM60%WCMD%SDYN_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
   </compset>
 
   <compset>
@@ -346,7 +346,7 @@
   </compset>
   <compset>
     <alias>FW4madSD</alias>
-    <lname>SDYN_CAM40%WCMD_CLM40%SP_CICE%PRES_DOCN%DOM_RTM_SGLC_SWAV</lname>
+    <lname>HIST_CAM40%WCMD%SDYN_CLM40%SP_CICE%PRES_DOCN%DOM_RTM_SGLC_SWAV</lname>
   </compset>
 
   <!-- ****************************** -->
@@ -356,13 +356,11 @@
   <compset>
     <alias>FX2000</alias>
     <lname>2000_CAM40%WXIE_CLM40%SP_CICE%PRES_DOCN%DOM_RTM_SGLC_SWAV</lname>
-    <science_support grid="f19_f19_mg16"/>
   </compset>
 
   <compset>
     <alias>FXHIST</alias>
     <lname>HIST_CAM40%WXIE_CLM40%SP_CICE%PRES_DOCN%DOM_RTM_SGLC_SWAV</lname>
-    <science_support grid="f19_f19_mg16"/>
   </compset>
 
   <compset>
@@ -372,13 +370,12 @@
 
   <compset>
     <alias>FXSD</alias>
-    <lname>SDYN_CAM40%WXIE_CLM40%SP_CICE%PRES_DOCN%DOM_RTM_SGLC_SWAV</lname>
-    <science_support grid="f19_f19_mg16"/>
+    <lname>HIST_CAM40%WXIE%SDYN_CLM40%SP_CICE%PRES_DOCN%DOM_RTM_SGLC_SWAV</lname>
   </compset>
 
   <compset>
     <alias>FXmadSD</alias>
-    <lname>SDYN_CAM40%WXIED_CLM40%SP_CICE%PRES_DOCN%DOM_RTM_SGLC_SWAV</lname>
+    <lname>HIST_CAM40%WXIED%SDYN_CLM40%SP_CICE%PRES_DOCN%DOM_RTM_SGLC_SWAV</lname>
   </compset>
 
   <!-- ENTRIES -->
@@ -396,9 +393,9 @@
 	<value  compset="HIST_CAM60%CVBSX">1995-01-01</value>
 	<value  compset="HIST_CAM60%CFIRE">1995-01-01</value>
 	<value  compset="RCP[2468]_CAM\d+">2005-01-01</value>
- 	<value  compset="SDYN_CAM"                   >2005-01-01</value>
- 	<value  compset="SDYN_CAM" grid="a%0.47x0.63">2010-01-01</value>
- 	<value  compset="SDYN_CAM40%WX">2000-01-01</value>
+ 	<value  compset="_CAM.*%SDYN"                   >2005-01-01</value>
+ 	<value  compset="_CAM.*%SDYN" grid="a%0.47x0.63">2010-01-01</value>
+ 	<value  compset="_CAM40%WX.*%SDYN">2000-01-01</value>
 
 	<value  compset="C2R4_CAM">2004-01-01</value>
 	<value  compset="C2R[68]_CAM">1950-01-01</value>
@@ -427,7 +424,7 @@
     <!-- Overrides for Specified Dynamics -->
     <entry id="CALENDAR">
       <values match="first">
-	<value  compset="SDYN_">GREGORIAN</value>
+	<value  compset="%SDYN">GREGORIAN</value>
  	<value  compset="HIST_CAM40%WX">GREGORIAN</value>
      </values>
     </entry>
@@ -469,12 +466,6 @@
         <value compset="2010"          grid="a%0.9x1.25.*_oi%0.9x1.25"       >$DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_0.9x1.25_2010climo_c180511.nc</value>
         <value compset="2010"          grid="a%0.47x0.63.*_oi%0.47x0.63"     >$DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_0.47x0.63_2010climo_c180511.nc</value>
         <value compset="2010"          grid="a%0.23x0.31.*_oi%0.23x0.31"     >$DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_0.23x0.31_2010climo_c180511.nc</value>
-
-
-        <value compset="SDYN_"         grid="a%1.9x2.5.*_oi%1.9x2.5"         >$DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_1.9x2.5_1850_2016_c170525.nc</value>
-        <value compset="SDYN_"         grid="a%0.9x1.25.*_oi%0.9x1.25"       >$DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_0.9x1.25_1850_2016_c170525.nc</value>
-        <value compset="SDYN_"         grid="a%0.47x0.63.*_oi%0.47x0.63"     >$DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_0.47x0.63_1850_2016_c170525.nc</value>
-        <value compset="SDYN_"         grid="a%0.23x0.31.*_oi%0.23x0.31"     >$DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_0.23x0.31_1850_2016_c170525.nc</value>
       </values>
 
     </entry>
@@ -502,19 +493,9 @@
         <value compset="1850" grid="a%0.23x0.31.*_oi%0.23x0.31">$DIN_LOC_ROOT/atm/cam/ocnfrac/domain.camocn.0.23x0.31_gx1v6_101108.nc</value>
       </values>
     </entry>
-    <entry id="SSTICE_YEAR_ALIGN">
-      <values match="first">
-        <value compset="SDYN_">1850</value>
-      </values>
-    </entry>
-    <entry id="SSTICE_YEAR_START">
-      <values match="first">
-        <value compset="SDYN_">1850</value>
-      </values>
-    </entry>
     <entry id="SSTICE_YEAR_END">
       <values match="first">
-        <value compset="(SDYN_|HIST_)">2016</value>
+        <value compset="HIST_">2016</value>
       </values>
     </entry>
 

diff --git a/doc/ChangeLog b/doc/ChangeLog
@@ -1,5 +1,92 @@
 ===============================================================
 
+Tag name: cam6_1_002
+Originator(s): eaton, fvitt
+Date: Thu Nov 29 10:42:15 MST 2018
+One-line Summary: merge fixes from release branch
+
+Purpose of changes:
+. Don't allow EUL initialization to change the dry mass when it has been
+  set via the analytic initial conditions option.
+
+. Fix analytic IC code for baroclinic wave to correctly initialize
+  constituents.  The problem only shows up with EUL dycore.
+
+. Use "HIST_" time period and "%SDYN" in longname of SD compsets (specified dynamics).
+  This configures CLM to be in a transient mode.
+
+Bugs fixed (include bugzilla ID): above
+
+Describe any changes made to build system: none
+
+Describe any changes made to the namelist: none
+
+List any changes to the defaults for the boundary datasets: none
+
+Describe any substantial timing or memory changes: none
+
+Code reviewed by: eaton
+
+List all files eliminated: none
+
+List all files added and what they do: none
+
+List all existing files that have been modified, and describe the changes:
+components/cam/cime_config/config_component.xml
+components/cam/cime_config/config_compsets.xml
+. use "HIST_" time period and "%SDYN" in longname of SD compsets (specified
+  dynamics). 
+
+components/cam/src/dynamics/eul/dyn_comp.F90
+. global_int
+  - modify so that no change is made to PS if the analytic IC code is
+    active. 
+
+components/cam/src/dynamics/tests/initial_conditions/ic_baroclinic.F90
+. bc_wav_set_ic
+  - remove assumption that all constituents are present in input
+    constituent array.  This is to handle the Eulerian dycore which passes
+    one constituent at a time.
+
+components/cam/src/physics/simple/tj2016.F90
+. Thatcher_Jablonowski_sfc_pbl_hs
+  - change dimension of pint dummy arg from pver to pver+1
+
+If there were any failures reported from running test_driver.sh on any test
+platform, and checkin with these failures has been OK'd by the gatekeeper,
+then copy the lines from the td.*.status files for the failed tests to the
+appropriate machine below.  All failed tests must be justified.
+
+cheyenne/intel: PASS
+
+cheyenne/intel/aux_cam:
+ERP_Ld3.f19_f19_mg16.FW4madSD.cheyenne_intel.cam-outfrq3d (Overall: DIFF) details:
+  FAIL ERP_Ld3.f19_f19_mg16.FW4madSD.cheyenne_intel.cam-outfrq3d NLCOMP
+  FAIL ERP_Ld3.f19_f19_mg16.FW4madSD.cheyenne_intel.cam-outfrq3d BASELINE cam6_1_001: DIFF
+SMS_D_Ln9.f09_f09_mg17.FSD.cheyenne_intel.cam-outfrq9s (Overall: DIFF) details:
+  FAIL SMS_D_Ln9.f09_f09_mg17.FSD.cheyenne_intel.cam-outfrq9s NLCOMP
+  FAIL SMS_D_Ln9.f09_f09_mg17.FSD.cheyenne_intel.cam-outfrq9s BASELINE cam6_1_001: DIFF
+
+- expected baseline failures due to changes in CLM namelist options in SD compsets
+
+SMS_Ld5.f09_f09_mg17.PC6.cheyenne_intel.cam-cam6_port_f09 (Overall: PASS) details:
+  FAIL SMS_Ld5.f09_f09_mg17.PC6.cheyenne_intel.cam-cam6_port_f09 MEMCOMP Error: Memory usage increase > 10% from baseline
+
+- looks like a testing glitch
+
+hobart/nag: PASS
+
+hobart/pgi: PASS
+
+CAM tag used for the baseline comparison tests if different than previous
+tag:
+
+Summarize any changes to answers: BFB except SD compsets and some Eulerian
+  simple model configurations with terminator chemistry and moist physics.
+
+===============================================================
+===============================================================
+
 Tag name: cam6_1_001
 Originator(s): eaton
 Date: Mon Nov 12 14:03:45 MST 2018

diff --git a/src/dynamics/eul/dyn_comp.F90 b/src/dynamics/eul/dyn_comp.F90
@@ -918,6 +918,7 @@ subroutine global_int()
    use hycoef,          only: hyai, ps0
    use eul_control_mod, only: pdela, qmass1, tmassf, fixmas, &
                               tmass0, zgsint, qmass2, qmassf
+   use inic_analytic,   only: analytic_ic_active
 
    !---------------------------Local workspace-----------------------------
 
@@ -1020,11 +1021,15 @@ subroutine global_int()
       zgsint_tmp = zgsint_tmp*.5_r8/gravit
       qmassf_tmp = qmass1_tmp + qmass2_tmp
 
-      ! Globally avgd sfc. partial pressure of dry air (i.e. global dry mass):
-      tmass0 = 98222._r8/gravit
-      if (.not. associated(fh_topo)) tmass0 = (101325._r8-245._r8)/gravit
-      if (adiabatic)                 tmass0 =  tmassf_tmp
-      if (ideal_phys )               tmass0 =  100000._r8/gravit
+      if (analytic_ic_active()) then
+         tmass0 = tmassf_tmp
+      else
+         ! Globally avgd sfc. partial pressure of dry air (i.e. global dry mass):
+         tmass0 = 98222._r8/gravit
+         if (.not. associated(fh_topo)) tmass0 = (101325._r8-245._r8)/gravit
+         if (adiabatic)                 tmass0 =  tmassf_tmp
+         if (ideal_phys )               tmass0 =  100000._r8/gravit
+      end if
 
       if (masterproc) then
          write(iulog,*) sub//': INFO:'
@@ -1034,14 +1039,18 @@ subroutine global_int()
          write(iulog,*) '  Globally averaged geopotential height (m)   = ', zgsint_tmp
       end if
 
-      ! Compute and apply an initial mass fix factor which preserves horizontal
-      ! gradients of ln(ps).
-      if (.not. moist_physics) then
-         fixmas = tmass0/tmassf_tmp
+      if (analytic_ic_active()) then
+         fixmas = 1._r8
       else
-         fixmas = (tmass0 + qmass1_tmp)/(tmassf_tmp - qmass2_tmp)
+         ! Compute and apply an initial mass fix factor which preserves horizontal
+         ! gradients of ln(ps).
+         if (.not. moist_physics) then
+            fixmas = tmass0/tmassf_tmp
+         else
+            fixmas = (tmass0 + qmass1_tmp)/(tmassf_tmp - qmass2_tmp)
+         end if
+         ps_tmp = ps_tmp*fixmas
       end if
-      ps_tmp = ps_tmp*fixmas
 
       ! Global integerals
       tmassf = tmassf_tmp