clm4_5_16_r250

Update all fsurdat datasets with updated soil color and soil depth. Soil color as modified by Peter Lawrence. Soil depth was modified to use a mask for soil depth>0 which makes the minimum soil depth 3cm (model still has a minimum of 40cm). Also updated area's for the mosart routing file (the previous areas were off by up to about 1%). the update to the area's will influence fluxes. Also fix a problem so that cheyenne_gnu will work (remove pure attribute from two functions). Also bring in the updated finundation inversion from Sean Swenson. This will change the methane output significantly for CLM50BGC cases. The previous inversion file was incorrect and shouldn't be used! The new file is also at a higher resolution 1-degree rather than 2-degree.
chrislxj · Dec 20, 2017 · e8a1322 · e8a1322
1 parent 3889c97
commit e8a1322
Show file tree

Hide file tree

Showing 7 changed files with 156 additions and 40 deletions.
diff --git a/.ChangeLog_template b/.ChangeLog_template
@@ -81,6 +81,7 @@ CLM testing:
     yellowstone_pgi - 
     yellowstone_gnu - 
     cheyenne_intel - 
+    cheyenne_gnu - 
     hobart_nag - 
     hobart_pgi - 
     hobart_intel - 

diff --git a/SVN_EXTERNAL_DIRECTORIES.standalone b/SVN_EXTERNAL_DIRECTORIES.standalone
@@ -2,4 +2,4 @@ cime                               https://github.com/CESM-Development/cime/tags
 components/clm/tools/gen_domain    https://github.com/CESM-Development/cime/tags/mvertens/updates_for_clm.tag2/tools/mapping/gen_domain_files
 components/cism                    https://svn-ccsm-models.cgd.ucar.edu/glc/trunk_tags/cism2_1_37
 components/rtm                     https://svn-ccsm-models.cgd.ucar.edu/rivrtm/trunk_tags/rtm1_0_62
-components/mosart                  https://svn-ccsm-models.cgd.ucar.edu/mosart/trunk_tags/mosart1_0_25
+components/mosart                  https://svn-ccsm-models.cgd.ucar.edu/mosart/trunk_tags/mosart1_0_26
diff --git a/bld/namelist_files/namelist_defaults_clm4_5.xml b/bld/namelist_files/namelist_defaults_clm4_5.xml
@@ -505,103 +505,103 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 
 <!-- for present day simulations - year 2000 -->
 <fsurdat hgrid="360x720cru"   sim_year="2000" use_crop=".false." >
-lnd/clm2/surfdata_map/surfdata_360x720cru_16pfts__CMIP6_simyr2000_c170616.nc</fsurdat>
+lnd/clm2/surfdata_map/surfdata_360x720cru_16pfts_CMIP6_simyr2000_c170706.nc</fsurdat>
 <fsurdat hgrid="0.125x0.125"  sim_year="2000" use_crop=".false." >
 lnd/clm2/surfdata_map/surfdata_0.125x0.125_simyr2000_c150114.nc</fsurdat>
 <fsurdat hgrid="48x96"     sim_year="2000" use_crop=".false." >
-lnd/clm2/surfdata_map/surfdata_48x96_16pfts__CMIP6_simyr2000_c170616.nc</fsurdat>
+lnd/clm2/surfdata_map/surfdata_48x96_16pfts_CMIP6_simyr2000_c170706.nc</fsurdat>
 
 <fsurdat hgrid="0.9x1.25"  sim_year="2000" use_crop=".false." >
-lnd/clm2/surfdata_map/surfdata_0.9x1.25_16pfts__CMIP6_simyr2000_c170616.nc</fsurdat>
+lnd/clm2/surfdata_map/surfdata_0.9x1.25_16pfts_CMIP6_simyr2000_c170706.nc</fsurdat>
 <fsurdat hgrid="1.9x2.5"   sim_year="2000" use_crop=".false." >
-lnd/clm2/surfdata_map/surfdata_1.9x2.5_16pfts__CMIP6_simyr2000_c170616.nc</fsurdat>
+lnd/clm2/surfdata_map/surfdata_1.9x2.5_16pfts_CMIP6_simyr2000_c170706.nc</fsurdat>
 <fsurdat hgrid="4x5"       sim_year="2000" use_crop=".false." >
-lnd/clm2/surfdata_map/surfdata_4x5_16pfts__CMIP6_simyr2000_c170616.nc</fsurdat>
+lnd/clm2/surfdata_map/surfdata_4x5_16pfts_CMIP6_simyr2000_c170706.nc</fsurdat>
 <fsurdat hgrid="10x15"     sim_year="2000" use_crop=".false." >
-lnd/clm2/surfdata_map/surfdata_10x15_16pfts__CMIP6_simyr2000_c170616.nc</fsurdat>
+lnd/clm2/surfdata_map/surfdata_10x15_16pfts_CMIP6_simyr2000_c170706.nc</fsurdat>
 
 <fsurdat hgrid="ne120np4"    sim_year="2000" use_crop=".false." >
-lnd/clm2/surfdata_map/surfdata_ne120np4_16pfts__CMIP6_simyr2000_c170616.nc</fsurdat>
+lnd/clm2/surfdata_map/surfdata_ne120np4_16pfts_CMIP6_simyr2000_c170706.nc</fsurdat>
 <fsurdat hgrid="ne30np4"     sim_year="2000" >
-lnd/clm2/surfdata_map/surfdata_ne30np4_16pfts__CMIP6_simyr2000_c170616.nc</fsurdat>
+lnd/clm2/surfdata_map/surfdata_ne30np4_16pfts_CMIP6_simyr2000_c170706.nc</fsurdat>
 <fsurdat hgrid="ne16np4"     sim_year="2000" use_crop=".false." >
-lnd/clm2/surfdata_map/surfdata_ne16np4_16pfts__CMIP6_simyr2000_c170616.nc</fsurdat>
+lnd/clm2/surfdata_map/surfdata_ne16np4_16pfts_CMIP6_simyr2000_c170706.nc</fsurdat>
 
 <!-- Needed for SCAM (Single Column Atmosphere Model) -->
 <fsurdat hgrid="64x128"      sim_year="2000" use_crop=".false." 
->lnd/clm2/surfdata_map/surfdata_64x128_16pfts__CMIP6_simyr2000_c170616.nc</fsurdat>
+>lnd/clm2/surfdata_map/surfdata_64x128_16pfts_CMIP6_simyr2000_c170706.nc</fsurdat>
 
 <!-- Crop surface datasets -->
 <fsurdat hgrid="0.9x1.25"  sim_year="2000" use_crop=".true." >
-lnd/clm2/surfdata_map/surfdata_0.9x1.25_78pfts__CMIP6_simyr2000_c170616.nc</fsurdat>
+lnd/clm2/surfdata_map/surfdata_0.9x1.25_78pfts_CMIP6_simyr2000_c170706.nc</fsurdat>
 <fsurdat hgrid="1.9x2.5"   sim_year="2000" use_crop=".true." >
-lnd/clm2/surfdata_map/surfdata_1.9x2.5_78pfts__CMIP6_simyr2000_c170616.nc</fsurdat>
+lnd/clm2/surfdata_map/surfdata_1.9x2.5_78pfts_CMIP6_simyr2000_c170706.nc</fsurdat>
 <fsurdat hgrid="0.125x0.125"  sim_year="2000" use_crop=".true." >
 lnd/clm2/surfdata_map/surfdata_0.125x0.125_mp24_simyr2000_c150114.nc</fsurdat>
 <fsurdat hgrid="10x15"     sim_year="2000" use_crop=".true." >
-lnd/clm2/surfdata_map/surfdata_10x15_78pfts__CMIP6_simyr2000_c170616.nc</fsurdat>
+lnd/clm2/surfdata_map/surfdata_10x15_78pfts_CMIP6_simyr2000_c170706.nc</fsurdat>
 <fsurdat hgrid="1x1_numaIA"       sim_year="2000" use_crop=".true." >
-lnd/clm2/surfdata_map/surfdata_1x1_numaIA_78pfts__CMIP6_simyr2000_c170616.nc</fsurdat>
+lnd/clm2/surfdata_map/surfdata_1x1_numaIA_78pfts_CMIP6_simyr2000_c170706.nc</fsurdat>
 <fsurdat hgrid="1x1_smallvilleIA" sim_year="2000" use_crop=".true." >
 lnd/clm2/surfdata_map/surfdata_1x1_smallvilleIA_78pfts_simyr2000_c160127.nc</fsurdat>
 
 <fsurdat hgrid="5x5_amazon"    sim_year="2000" use_crop=".false." >
-lnd/clm2/surfdata_map/surfdata_5x5_amazon_16pfts__CMIP6_simyr2000_c170616.nc</fsurdat>
+lnd/clm2/surfdata_map/surfdata_5x5_amazon_16pfts_CMIP6_simyr2000_c170706.nc</fsurdat>
 <fsurdat hgrid="1x1_brazil"    sim_year="2000" use_crop=".false." >
-lnd/clm2/surfdata_map/surfdata_1x1_brazil_16pfts__CMIP6_simyr2000_c170616.nc</fsurdat>
+lnd/clm2/surfdata_map/surfdata_1x1_brazil_16pfts_CMIP6_simyr2000_c170706.nc</fsurdat>
 <fsurdat hgrid="1x1_tropicAtl" sim_year="2000" use_crop=".false." >
-lnd/clm2/surfdata_map/surfdata_1x1_tropicAtl_16pfts__CMIP6_simyr2000_c170616.nc</fsurdat>
+lnd/clm2/surfdata_map/surfdata_1x1_tropicAtl_16pfts_CMIP6_simyr2000_c170706.nc</fsurdat>
 
 <!-- 100% Urban single-point datasets (only for sim-year=2000) -->
 <fsurdat hgrid="1x1_camdenNJ"        sim_year="2000" use_crop=".false." >
-lnd/clm2/surfdata_map/surfdata_1x1_camdenNJ_16pfts__CMIP6_simyr2000_c170616.nc</fsurdat>
+lnd/clm2/surfdata_map/surfdata_1x1_camdenNJ_16pfts_CMIP6_simyr2000_c170706.nc</fsurdat>
 <fsurdat hgrid="1x1_vancouverCAN"    sim_year="2000" use_crop=".false." >
-lnd/clm2/surfdata_map/surfdata_1x1_vancouverCAN_16pfts__CMIP6_simyr2000_c170616.nc</fsurdat>
+lnd/clm2/surfdata_map/surfdata_1x1_vancouverCAN_16pfts_CMIP6_simyr2000_c170706.nc</fsurdat>
 <fsurdat hgrid="1x1_mexicocityMEX"   sim_year="2000" use_crop=".false." >
-lnd/clm2/surfdata_map/surfdata_1x1_mexicocityMEX_16pfts__CMIP6_simyr2000_c170616.nc</fsurdat>
+lnd/clm2/surfdata_map/surfdata_1x1_mexicocityMEX_16pfts_CMIP6_simyr2000_c170706.nc</fsurdat>
 <fsurdat hgrid="1x1_urbanc_alpha"    sim_year="2000" use_crop=".false." >
-lnd/clm2/surfdata_map/surfdata_1x1_urbanc_alpha_16pfts__CMIP6_simyr2000_c170616.nc</fsurdat>
+lnd/clm2/surfdata_map/surfdata_1x1_urbanc_alpha_16pfts_CMIP6_simyr2000_c170706.nc</fsurdat>
 
 <!-- for pre-industrial simulations - year 1850 -->
 <fsurdat hgrid="360x720cru"   sim_year="1850" use_crop=".false."                           >
-lnd/clm2/surfdata_map/surfdata_360x720cru_16pfts__CMIP6_simyr1850_c170616.nc</fsurdat>
+lnd/clm2/surfdata_map/surfdata_360x720cru_16pfts_CMIP6_simyr1850_c170706.nc</fsurdat>
 <fsurdat hgrid="48x96"        sim_year="1850" use_crop=".false." >
-lnd/clm2/surfdata_map/surfdata_48x96_16pfts__CMIP6_simyr1850_c170616.nc</fsurdat>
+lnd/clm2/surfdata_map/surfdata_48x96_16pfts_CMIP6_simyr1850_c170706.nc</fsurdat>
 
 <fsurdat hgrid="0.9x1.25"     sim_year="1850" use_crop=".false." >
-lnd/clm2/surfdata_map/surfdata_0.9x1.25_16pfts__CMIP6_simyr1850_c170616.nc</fsurdat>
+lnd/clm2/surfdata_map/surfdata_0.9x1.25_16pfts_CMIP6_simyr1850_c170706.nc</fsurdat>
 <fsurdat hgrid="1.9x2.5"      sim_year="1850" use_crop=".false." >
-lnd/clm2/surfdata_map/surfdata_1.9x2.5_16pfts__CMIP6_simyr1850_c170616.nc</fsurdat>
+lnd/clm2/surfdata_map/surfdata_1.9x2.5_16pfts_CMIP6_simyr1850_c170706.nc</fsurdat>
 <fsurdat hgrid="10x15"        sim_year="1850" use_crop=".false." >
-lnd/clm2/surfdata_map/surfdata_10x15_16pfts__CMIP6_simyr1850_c170616.nc</fsurdat>
+lnd/clm2/surfdata_map/surfdata_10x15_16pfts_CMIP6_simyr1850_c170706.nc</fsurdat>
 
 <fsurdat hgrid="1x1_tropicAtl" sim_year="1850" use_crop=".false." >
-lnd/clm2/surfdata_map/surfdata_1x1_tropicAtl_16pfts__CMIP6_simyr1850_c170616.nc</fsurdat>
+lnd/clm2/surfdata_map/surfdata_1x1_tropicAtl_16pfts_CMIP6_simyr1850_c170706.nc</fsurdat>
 <fsurdat hgrid="1x1_brazil"    sim_year="1850" use_crop=".false." >
-lnd/clm2/surfdata_map/surfdata_1x1_brazil_16pfts__CMIP6_simyr1850_c170616.nc</fsurdat>
+lnd/clm2/surfdata_map/surfdata_1x1_brazil_16pfts_CMIP6_simyr1850_c170706.nc</fsurdat>
 
 
 <fsurdat hgrid="ne120np4"     sim_year="1850" use_crop=".false." >
-lnd/clm2/surfdata_map/surfdata_ne120np4_16pfts__CMIP6_simyr1850_c170616.nc</fsurdat>
+lnd/clm2/surfdata_map/surfdata_ne120np4_16pfts_CMIP6_simyr1850_c170706.nc</fsurdat>
 <fsurdat hgrid="ne30np4"      sim_year="1850" use_crop=".false." >
-lnd/clm2/surfdata_map/surfdata_ne30np4_16pfts__CMIP6_simyr1850_c170616.nc</fsurdat>
+lnd/clm2/surfdata_map/surfdata_ne30np4_16pfts_CMIP6_simyr1850_c170706.nc</fsurdat>
 
 <!-- pre-industrial with crop -->
 <fsurdat hgrid="0.9x1.25"  sim_year="1850" use_crop=".true." >
-lnd/clm2/surfdata_map/surfdata_0.9x1.25_78pfts__CMIP6_simyr1850_c170616.nc</fsurdat>
+lnd/clm2/surfdata_map/surfdata_0.9x1.25_78pfts_CMIP6_simyr1850_c170706.nc</fsurdat>
 <fsurdat hgrid="1.9x2.5"   sim_year="1850" use_crop=".true." >
-lnd/clm2/surfdata_map/surfdata_1.9x2.5_78pfts__CMIP6_simyr1850_c170616.nc</fsurdat>
+lnd/clm2/surfdata_map/surfdata_1.9x2.5_78pfts_CMIP6_simyr1850_c170706.nc</fsurdat>
 <fsurdat hgrid="10x15"     sim_year="1850" use_crop=".true." >
-lnd/clm2/surfdata_map/surfdata_10x15_78pfts__CMIP6_simyr1850_c170616.nc</fsurdat>
+lnd/clm2/surfdata_map/surfdata_10x15_78pfts_CMIP6_simyr1850_c170706.nc</fsurdat>
 <fsurdat hgrid="4x5"       sim_year="1850" use_crop=".true." >
-lnd/clm2/surfdata_map/surfdata_4x5_78pfts__CMIP6_simyr1850_c170616.nc</fsurdat>
+lnd/clm2/surfdata_map/surfdata_4x5_78pfts_CMIP6_simyr1850_c170706.nc</fsurdat>
 <fsurdat hgrid="1x1_smallvilleIA" sim_year="1850" use_crop=".true." >
 lnd/clm2/surfdata_map/surfdata_1x1_smallvilleIA_78pfts_simyr1850_c160127.nc</fsurdat>
 
 <fsurdat hgrid="ne30np4"      sim_year="1850" use_crop=".true." >
-lnd/clm2/surfdata_map/surfdata_ne30np4_78pfts__CMIP6_simyr1850_c170616.nc</fsurdat>
+lnd/clm2/surfdata_map/surfdata_ne30np4_78pfts_CMIP6_simyr1850_c170706.nc</fsurdat>
 <fsurdat hgrid="ne120np4"     sim_year="1850" use_crop=".true." >
-lnd/clm2/surfdata_map/surfdata_ne120np4_78pfts__CMIP6_simyr1850_c170616.nc</fsurdat>
+lnd/clm2/surfdata_map/surfdata_ne120np4_78pfts_CMIP6_simyr1850_c170706.nc</fsurdat>
 
 <!-- Dynamic PFT surface datasets (relative to {csmdata}) -->
 
@@ -2124,7 +2124,7 @@ lnd/clm2/surfdata_map/surfdata_ne120np4_78pfts__CMIP6_simyr1850_c170616.nc</fsur
 <finundation_res finundation_method="TWS_inversion">1.9x2.5</finundation_res>
 
 <stream_fldfilename_ch4finundated finundation_method="TWS_inversion" hgrid="1.9x2.5"
->lnd/clm2/paramdata/finundated_inversiondata_1.9x2.5_c170507.nc</stream_fldfilename_ch4finundated>
+>lnd/clm2/paramdata/finundated_inversiondata_0.9x1.25_c170706.nc</stream_fldfilename_ch4finundated>
 
 <!-- =========================================  -->
 <!-- Defaults for different BGC modes           -->

diff --git a/doc/ChangeLog b/doc/ChangeLog
@@ -1,4 +1,117 @@
 ===============================================================
+Tag name:  clm4_5_16_r250
+Originator(s):  erik (Erik Kluzek)
+Date: Thu Jul 13 13:54:13 MDT 2017
+One-line Summary: Update finundation dataset, new fsurdat files with updated soil color 
+                  and soil depth, update mosart areas, fix cheyenne_gnu
+
+Purpose of changes
+------------------
+
+Update all fsurdat datasets with updated soil color and soil depth. Soil color as modified by Peter Lawrence.
+Soil depth was modified to use a mask for soil depth>0 which makes the minimum soil depth 3cm (model still has
+a minimum of 40cm). Also updated area's for the mosart routing file (the previous areas were off by up to about 1%).
+the update to the area's will influence fluxes. Also fix a problem so that cheyenne_gnu will work (remove pure
+attribute from two functions).
+
+Also bring in the updated finundation inversion from Sean Swenson. This will change the methane output
+significantly for CLM50BGC cases. The previous inversion file was incorrect and shouldn't be used! The new file is also
+at a higher resolution 1-degree rather than 2-degree.
+
+
+Bugs fixed or introduced
+------------------------
+
+Bugs fixed (include bugzilla ID):
+  2493 (gnu6.3.0 compiler doesn't like "pure" functions that use outside modules, especially public ones)
+
+Known bugs introduced in this tag (include bugzilla ID):
+  2491 (Error in Banddiagonal in latest CESM simulation) (found in Cecile's coupled simulation)
+
+
+Notes of particular relevance for users
+---------------------------------------
+
+Caveats for users (e.g., need to interpolate initial conditions): None
+
+Changes to CLM's user interface (e.g., new/renamed XML or namelist variables): None
+
+Changes made to namelist defaults (e.g., changed parameter values): Just datasets see below
+
+Changes to the datasets (e.g., parameter, surface or initial files): Update all fsurdat and the
+   stream_fldfilename_ch4finundated file
+
+   fsurdat files have soil color and soil depth updated. The finundated file is now at f09 resolution
+   rather than f19, and the previous file was incorrect.
+
+Substantial timing or memory changes: None
+
+Notes of particular relevance for developers: (including Code reviews and testing)
+---------------------------------------------
+
+Caveats for developers (e.g., code that is duplicated that requires double maintenance): None
+
+Changes to tests or testing: None
+
+Code reviewed by: self
+
+Did you follow the steps in .CLMTrunkChecklist: yes
+
+CLM testing: regular
+
+ [PASS means all tests PASS and OK means tests PASS other than expected fails.]
+
+  build-namelist tests:
+
+    yellowstone - PASS
+
+  unit-tests (components/clm/src):
+
+    yellowstone - PASS
+
+  regular tests (aux_clm):
+
+    yellowstone_intel - OK
+    yellowstone_pgi - OK
+    yellowstone_gnu - OK
+    cheyenne_intel - OK
+    cheyenne_gnu - OK
+    hobart_nag - OK
+    hobart_pgi - OK
+    hobart_intel - OK
+
+CLM tag used for the baseline comparisons:  clm4_5_16_r249
+
+
+Answer changes
+--------------
+
+Changes answers relative to baseline:
+
+  Summarize any changes to answers, i.e.,
+    - what code configurations: CLM45/CLM50 or with MOSART
+    - what platforms/compilers: all
+    - nature of change: similar climate, methane outputs are substantially changed
+
+Detailed list of changes
+------------------------
+
+List any svn externals directories updated (cime, rtm, mosart, cism, etc.): mosart
+   mosart update to mosart1_0_26
+
+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:
+
+  M components/clm/src/biogeophys/SnowHydrologyMod.F90 -- Remove pure attribute from OverburdenCompactionVionnet2012
+  M components/clm/src/biogeophys/IrrigationMod.F90 ----- Remove purse attribute from PointNeedsCheckForIrrig
+
+  M components/clm/bld/namelist_files/namelist_defaults_clm4_5.xml -- Update all fsurdat files and stream_fldfilename_ch4finundated
+
+===============================================================
+===============================================================
 Tag name:  clm4_5_16_r249
 Originator(s):  sacks (Bill Sacks)
 Date: Thu Jul  6 14:32:40 MDT 2017

diff --git a/doc/ChangeSum b/doc/ChangeSum
@@ -1,5 +1,7 @@
 Tag                   Who      Date  Summary
 ============================================================================================================================
+  clm4_5_16_r250     erik 07/13/2017 Update finundation dataset, new fsurdat files with updated soil color and soil depth, 
+                                     update mosart areas, fix cheyenne_gnu
   clm4_5_16_r249    sacks 07/06/2017 All new compsets, reworked test lists, and related fixes
   clm4_5_16_r248    sacks 06/28/2017 Melt most ice runoff
   clm4_5_16_r247    sacks 06/26/2017 New GLACIER_REGION field with CISM domain split in two

diff --git a/src/biogeophys/IrrigationMod.F90 b/src/biogeophys/IrrigationMod.F90
@@ -1033,7 +1033,7 @@ subroutine CalcIrrigationNeeded(this, bounds, num_exposedvegp, filter_exposedveg
   end subroutine CalcIrrigationNeeded
 
   !-----------------------------------------------------------------------
-  pure function PointNeedsCheckForIrrig(this, pft_type, elai, time_prev, londeg) &
+  function PointNeedsCheckForIrrig(this, pft_type, elai, time_prev, londeg) &
        result(check_for_irrig)
     !
     ! !DESCRIPTION:

diff --git a/src/biogeophys/SnowHydrologyMod.F90 b/src/biogeophys/SnowHydrologyMod.F90
@@ -1841,7 +1841,7 @@ pure function OverburdenCompactionAnderson1976(burden, wx, td, bi) &
   end function OverburdenCompactionAnderson1976
 
   !-----------------------------------------------------------------------
-  pure function OverburdenCompactionVionnet2012(h2osoi_liq, dz, burden, wx, td, bi) &
+  function OverburdenCompactionVionnet2012(h2osoi_liq, dz, burden, wx, td, bi) &
        result(compaction_rate)
     !
     ! !DESCRIPTION: