Uncomment fates_hdim_levleaf dimension

Externals_CLM.cfg

@@ -2,7 +2,7 @@
 local_path = src/fates
 protocol = git
 repo_url = https://github.com/NGEET/fates
-tag = sci.1.52.0_api.20.0.0
+tag = sci.1.53.0_api.21.0.0
 required = True
 
 [externals_description]

cime_config/testdefs/ExpectedTestFails.xml

@@ -67,11 +67,4 @@
     </phase>
   </test>
 
-  <test name="ERS_Ld30.f45_f45_mg37.I2000Clm50FatesCruRsGs.cheyenne_intel.clm-FatesColdDefReducedComplexSatPhen">
-    <phase name="RUN">
-      <status>FAIL</status>
-      <issue>#1485</issue>
-    </phase>
-  </test>
-
 </expectedFails>

doc/ChangeLog

@@ -1,4 +1,90 @@
 ===============================================================
+Tag name: ctsm5.1.dev071
+Originator(s): glemieux (Gregory Lemieux,LBL/NGEET,510-486-5049)
+Date: Sun Jan 16 20:26:47 MST 2022
+One-line Summary: Small changes to enable new fates dimension and update fates tag
+
+Purpose and description of changes
+----------------------------------
+
+This tag uncomments the fates_levleaf dimension which was added in PR #1540
+and rolled into PR #1542, but commented out to avoid junk DIFFs during integration
+of PR #1542.  This variable is necessary to accomodate FATES PR #752, which
+allows for an exponential spacing to bin widths in the VAI (LAI+SAI) calculations.
+This latest fates tag also includes a fix to the fates satellite phenology mode
+exact restart issue.  
+
+Significant changes to scientifically-supported configurations
+--------------------------------------------------------------
+
+Does this tag change answers significantly for any of the following physics configurations?
+(Details of any changes will be given in the "Answer changes" section below.)
+
+    [Put an [X] in the box for any configuration with significant answer changes.]
+
+[ ] clm5_1
+
+[ ] clm5_0
+
+[ ] ctsm5_0-nwp
+
+[ ] clm4_5
+
+
+Bugs fixed or introduced
+------------------------
+
+Issues fixed (include CTSM Issue #):
+  Fixes #1485 Forthcoming FATES satellite phenology ERS test fails
+  Fixes #1561 Uncomment fates_levleaf fields
+
+Notes of particular relevance for developers:
+---------------------------------------------
+NOTE: Be sure to review the steps in README.CHECKLIST.master_tags as well as the coding style in the Developers Guide
+
+Changes to tests or testing:
+  The ERS FatesColdDefReducedComplexSatPhen testmod has been removed from expected test failure
+  list as it now passes due to fates tag sci.1.52.1_api.20.0.0.
+
+Testing summary:
+----------------
+
+  regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
+
+    cheyenne ---- OK
+    izumi -------OK
+
+  fates tests: (baseline: sci.1.52.1_api.20.0.0-ctsm5.1.dev070)
+    cheyenne ---- OK
+    izumi ------- OK
+
+Answer changes
+--------------
+
+Changes answers relative to baseline: Expected DIFFs for a subset of fates testmods
+
+  Summarize any changes to answers, i.e.,
+    - CBALANCE_ERROR_FATES and FATES_ERRH2O_SCPF have round-off level errors that
+      eventually propagate to downstream calculations for some some fates test mods
+    - Differences are due to changing of the bin widths
+    - Fates PR #752 author reviewed the differences with a separate comparison
+      of the PR branch against fates master branch and determined that the science
+      resulting is as expected.
+
+Other details
+-------------
+
+List any externals directories updated (cime, rtm, mosart, cism, fates, etc.):
+  fates: sci.1.52.0_api.20.0.0 -> fates-sci.1.53.0_api.21.0.0
+
+Pull Requests that document the changes (include PR ids):
+(https://github.com/ESCOMP/ctsm/pull)
+  FATES #752 -- Variable VAI bin widths
+  #1562 -- Uncomment fates_hdim_levleaf dimension
+
+
+===============================================================
+===============================================================
 Tag name: ctsm5.1.dev070
 Originator(s): sacks (Bill Sacks), mvertens (Mariana Vertenstein), slevis (Samuel Levis)
 Date: Mon Jan 10 16:52:50 MST 2022

doc/ChangeSum

@@ -1,5 +1,6 @@
 Tag                   Who      Date  Summary
 ============================================================================================================================
+    ctsm5.1.dev071 glemieux 01/16/2022 Small changes to enable new fates dimension and update fates tag
     ctsm5.1.dev070 multiple 01/10/2022 Update externals, remove need for LND_DOMAIN_FILE and LND_DOMAIN_PATH, etc.
     ctsm5.1.dev069 multiple 12/15/2021 Implement dynamic (transient) urban capability
     ctsm5.1.dev068 multiple 12/13/2021 Adding fsurdat_modifier tool

src/main/histFileMod.F90

@@ -2993,7 +2993,7 @@ subroutine htape_timeconst(t, mode)
     use FatesInterfaceTypesMod, only : fates_hdim_levfuel
     use FatesInterfaceTypesMod, only : fates_hdim_levcwdsc
     use FatesInterfaceTypesMod, only : fates_hdim_levcan
-    !use FatesInterfaceTypesMod, only : fates_hdim_levleaf
+    use FatesInterfaceTypesMod, only : fates_hdim_levleaf
     use FatesInterfaceTypesMod, only : fates_hdim_canmap_levcnlf
     use FatesInterfaceTypesMod, only : fates_hdim_lfmap_levcnlf
     use FatesInterfaceTypesMod, only : fates_hdim_canmap_levcnlfpf
@@ -3098,8 +3098,8 @@ subroutine htape_timeconst(t, mode)
                   long_name='FATES cwd size class', ncid=nfid(t))
              call ncd_defvar(varname='fates_levcan',xtype=ncd_int, dim1name='fates_levcan', &
                   long_name='FATES canopy level', ncid=nfid(t))
-             !call ncd_defvar(varname='fates_levleaf',xtype=ncd_int, dim1name='fates_levleaf', &
-            !      long_name='FATES leaf+stem level', units='VAI', ncid=nfid(t))
+             call ncd_defvar(varname='fates_levleaf',xtype=ncd_int, dim1name='fates_levleaf', &
+                  long_name='FATES leaf+stem level', units='VAI', ncid=nfid(t))
              call ncd_defvar(varname='fates_canmap_levcnlf',xtype=ncd_int, dim1name='fates_levcnlf', &
                   long_name='FATES canopy level of combined canopy-leaf dimension', ncid=nfid(t))
              call ncd_defvar(varname='fates_lfmap_levcnlf',xtype=ncd_int, dim1name='fates_levcnlf', &
@@ -3156,7 +3156,7 @@ subroutine htape_timeconst(t, mode)
              call ncd_io(varname='fates_levfuel',data=fates_hdim_levfuel, ncid=nfid(t), flag='write')
              call ncd_io(varname='fates_levcwdsc',data=fates_hdim_levcwdsc, ncid=nfid(t), flag='write')
              call ncd_io(varname='fates_levcan',data=fates_hdim_levcan, ncid=nfid(t), flag='write')
-             !call ncd_io(varname='fates_levleaf',data=fates_hdim_levleaf, ncid=nfid(t), flag='write')
+             call ncd_io(varname='fates_levleaf',data=fates_hdim_levleaf, ncid=nfid(t), flag='write')
              call ncd_io(varname='fates_canmap_levcnlf',data=fates_hdim_canmap_levcnlf, ncid=nfid(t), flag='write')
              call ncd_io(varname='fates_lfmap_levcnlf',data=fates_hdim_lfmap_levcnlf, ncid=nfid(t), flag='write')
              call ncd_io(varname='fates_canmap_levcnlfpf',data=fates_hdim_canmap_levcnlfpf, ncid=nfid(t), flag='write')