Merge pull request #2605 from slevis-lmwg/update_submodules

Update submodule tags to pass runoff from CISM to ROF as per issue #2590
ESCOMP · Jul 22, 2024 · a5ef062 · a5ef062
2 parents d020439 + a4a9ede
commit a5ef062
Show file tree

Hide file tree

Showing 11 changed files with 159 additions and 28 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -36,23 +36,23 @@ fxDONOTUSEurl = https://github.com/NCAR/fates-release
 [submodule "cism"]
 path = components/cism
 url = https://github.com/ESCOMP/CISM-wrapper
-fxtag = cismwrap_2_2_001
+fxtag = cismwrap_2_2_002
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESCOMP/CISM-wrapper
 
 [submodule "rtm"]
 path = components/rtm
 url = https://github.com/ESCOMP/RTM
-fxtag = rtm1_0_79
+fxtag = rtm1_0_80
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESCOMP/RTM
 
 [submodule "mosart"]
 path = components/mosart
 url = https://github.com/ESCOMP/MOSART
-fxtag = mosart1_0_49
+fxtag = mosart1.1.02
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESCOMP/MOSART
@@ -68,7 +68,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute
 [submodule "ccs_config"]
 path = ccs_config
 url = https://github.com/ESMCI/ccs_config_cesm.git
-fxtag = ccs_config_cesm0.0.106
+fxtag = ccs_config_cesm1.0.0
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git
@@ -84,7 +84,7 @@ fxDONOTUSEurl = https://github.com/ESMCI/cime
 [submodule "cmeps"]
 path = components/cmeps
 url = https://github.com/ESCOMP/CMEPS.git
-fxtag = cmeps0.14.63
+fxtag = cmeps0.14.77
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git

diff --git a/ccs_config b/ccs_config
diff --git a/cime_config/testdefs/testmods_dirs/clm/ciso_monthly_matrixcn_spinup/user_nl_mosart b/cime_config/testdefs/testmods_dirs/clm/ciso_monthly_matrixcn_spinup/user_nl_mosart
@@ -1 +1 @@
-frivinp_rtm = '/dev/null'
+frivinp = '/dev/null'
diff --git a/cime_config/testdefs/testmods_dirs/clm/rtmColdSSP/user_nl_rtm b/cime_config/testdefs/testmods_dirs/clm/rtmColdSSP/user_nl_rtm
@@ -1,4 +1,4 @@
-finidat_rtm = " "
-rtmhist_mfilt = 1
-rtmhist_ndens = 2
-rtmhist_nhtfrq = 0
+finidat = " "
+mfilt = 1
+ndens = 2
+nhtfrq = 0
diff --git a/components/cism b/components/cism
diff --git a/components/cmeps b/components/cmeps
diff --git a/components/mosart b/components/mosart
diff --git a/components/rtm b/components/rtm
diff --git a/doc/ChangeLog b/doc/ChangeLog
@@ -1,4 +1,133 @@
 ===============================================================
+Tag name: ctsm5.2.015
+Originator(s): multiple (Samuel Levis,UCAR/TSS,303-665-1310, @mvertens, @jedwards4b, @billsacks, @Katetc)
+Date: Mon 22 Jul 2024 12:46:17 PM MDT
+One-line Summary: Update submodule tags to pass runoff from cism to rof
+
+Purpose and description of changes
+----------------------------------
+
+ - Update MOSART, CMEPS, and CISM so CISM runoff goes to ROF rather than CTSM
+ - Update RTM with fix needed for Paleo LGM work
+
+
+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.]
+
+[ ] clm6_0
+
+[ ] clm5_1
+
+[ ] clm5_0
+
+[ ] ctsm5_0-nwp
+
+[ ] clm4_5
+
+
+Bugs fixed
+----------
+List of CTSM issues fixed (include CTSM Issue # and description) [one per line]:
+ Fixes #2590 Update CMEPS/MOSART/CISM/RTM tags
+ Fixes https://github.com/ESCOMP/RTM/issues/50 Likely wrong RTM river flux to MOM6 within cesm2_3_beta17
+
+Notes of particular relevance for users
+---------------------------------------
+
+Caveats for users (e.g., need to interpolate initial conditions):
+ Issue https://github.com/ESCOMP/RTM/issues/50
+ Likely wrong RTM river flux to MOM6 within cesm2_3_beta17 is now fixed with
+ https://github.com/ESCOMP/RTM/pull/51
+
+Changes to CTSM's user interface (e.g., new/renamed XML or namelist variables):
+ Differences in namelist 'mosart_inparm':
+  missing variable: 'do_rtmflood'
+  missing variable: 'finidat_rtm'
+  missing variable: 'frivinp_rtm'
+  missing variable: 'rtmhist_fexcl1'
+  missing variable: 'rtmhist_fexcl2'
+  missing variable: 'rtmhist_fexcl3'
+  missing variable: 'rtmhist_fincl1'
+  missing variable: 'rtmhist_fincl2'
+  missing variable: 'rtmhist_fincl3'
+  missing variable: 'rtmhist_mfilt'
+  missing variable: 'rtmhist_ndens'
+  missing variable: 'rtmhist_nhtfrq'
+  found extra variable: 'budget_frq'
+  found extra variable: 'fexcl1'
+  found extra variable: 'fexcl2'
+  found extra variable: 'fexcl3'
+  found extra variable: 'fincl1'
+  found extra variable: 'fincl2'
+  found extra variable: 'fincl3'
+  found extra variable: 'finidat'
+  found extra variable: 'frivinp'
+  found extra variable: 'mfilt'
+  found extra variable: 'mosart_euler_calc'
+  found extra variable: 'mosart_tracers'
+  found extra variable: 'ndens'
+  found extra variable: 'nhtfrq'
+  found extra variable: 'use_halo_option'
+
+Changes to documentation:
+ Not that I am aware of
+
+
+Testing summary:
+----------------
+
+ [PASS means all tests PASS; OK means tests PASS other than expected fails.]
+
+  build-namelist tests (if CLMBuildNamelist.pm has changed):
+
+    derecho - PASS
+
+  python testing (if python code has changed; see instructions in python/README.md; document testing done):
+
+    derecho - PASS
+
+  regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
+
+    derecho ----- OK
+    izumi ------- OK
+
+  ctsm_sci
+     derecho ---- OK (while in tag ctsm5.2.007; I did not repeat with the latest; see checklist in #2590)
+
+
+Answer changes
+--------------
+
+Changes answers relative to baseline: Yes
+
+  Summarize any changes to answers, i.e.,
+    - what code configurations: mosart and rtm
+    - what platforms/compilers: all
+    - nature of change: mosart roundoff; rtm larger than roundoff due to bug fix
+
+ We are ignoring strange diffs from baseline in two tests in variable
+ FATES_TRANSITION_MATRIX_LULU as explained in issue #2656.
+
+Other details
+-------------
+List any git submodules updated (cime, rtm, mosart, cism, fates, etc.):
+ See .gitmodules: cism, rtm, mosart, ccs_config, cmeps
+
+Pull Requests that document the changes (include PR ids):
+ https://github.com/ESCOMP/ctsm/pull/2605
+ https://github.com/ESCOMP/RTM/pull/51
+ https://github.com/ESCOMP/MOSART/pull/94
+ https://github.com/ESCOMP/CISM-wrapper/pull/100
+ https://github.com/ESCOMP/CMEPS/pull/463
+ https://github.com/ESMCI/ccs_config_cesm/pull/174
+
+===============================================================
+===============================================================
 Tag name: ctsm5.2.014
 Originator(s): chrislxj (Xingjie Lu, Northern Arizona U., xingjie.lu@nau.edu)
 Date: Fri 19 Jul 2024 11:04:17 AM MDT
@@ -51,7 +180,8 @@ Notes of particular relevance for users
 ---------------------------------------
 
 Caveats for users (e.g., need to interpolate initial conditions):
- use_matrixcn and use_soil_matrixcn ARE recommended for accelerating bgc
+ use_matrixcn and use_soil_matrixcn ARE NOT available for clm4_5
+ and ARE recommended for accelerating bgc
  spin-ups (keep reading for more info) and NOT recommended for
  - transient simulations (e.g. IHist)
  - simulations that use threading (e.g. see tests with P64x2)

diff --git a/doc/ChangeSum b/doc/ChangeSum
@@ -1,6 +1,7 @@
 Tag                   Who      Date  Summary
 ============================================================================================================================
-       ctsm5.2.014 chrislxj 07/19/2024 use_matrixcn, use_soil_matrixcn come in as default .false.
+       ctsm5.2.015 multiple 07/22/2024 Update submodule tags to pass runoff from cism to rof
+       ctsm5.2.014 multiple 07/19/2024 use_matrixcn, use_soil_matrixcn come in as default .false.
        ctsm5.2.013 glemieux 07/18/2024 FATES Land Use V2
        ctsm5.2.012    sacks 07/16/2024 Relax tolerance for truncating small snocan values in CanopyFluxes
        ctsm5.2.011   slevis 07/12/2024 Merge b4b-dev

diff --git a/lilac/bld_templates/mosart_in b/lilac/bld_templates/mosart_in
@@ -4,18 +4,18 @@
   delt_mosart = 1800
   do_rtm = .true.
   do_rtmflood = .false.
-  finidat_rtm = " "
-  frivinp_rtm = "/glade/campaign/cesm/cesmdata/cseg/inputdata/rof/mosart/MOSART_routing_Global_0.5x0.5_c170601.nc"
+  finidat = " "
+  frivinp = "/glade/campaign/cesm/cesmdata/cseg/inputdata/rof/mosart/MOSART_routing_Global_0.5x0.5_c170601.nc"
   ice_runoff = .true.
   qgwl_runoff_option = "threshold"
-  rtmhist_fexcl1 = ""
-  rtmhist_fexcl2 = ""
-  rtmhist_fexcl3 = ""
-  rtmhist_fincl1 = ""
-  rtmhist_fincl2 = ""
-  rtmhist_fincl3 = ""
-  rtmhist_mfilt = 1
-  rtmhist_ndens = 1
-  rtmhist_nhtfrq = 0
+  fexcl1 = ""
+  fexcl2 = ""
+  fexcl3 = ""
+  fincl1 = ""
+  fincl2 = ""
+  fincl3 = ""
+  mfilt = 1
+  ndens = 1
+  nhtfrq = 0
   smat_option = "Xonly"
 /