From e4dde90efb5b9ccffb15ee44c096212bc59813af Mon Sep 17 00:00:00 2001 From: Keith Oleson Date: Thu, 8 Feb 2024 15:49:33 -0700 Subject: [PATCH 1/6] t_soisno=272 for soils and 274K for urban road --- src/biogeophys/TemperatureType.F90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/biogeophys/TemperatureType.F90 b/src/biogeophys/TemperatureType.F90 index 21445caaae..ab310650c8 100644 --- a/src/biogeophys/TemperatureType.F90 +++ b/src/biogeophys/TemperatureType.F90 @@ -732,7 +732,7 @@ subroutine InitCold(this, bounds, & end if else if (col%itype(c) == icol_road_perv .or. col%itype(c) == icol_road_imperv) then - this%t_soisno_col(c,1:nlevgrnd) = 272._r8 + this%t_soisno_col(c,1:nlevgrnd) = 274._r8 else if (col%itype(c) == icol_sunwall .or. col%itype(c) == icol_shadewall & .or. col%itype(c) == icol_roof) then ! Set sunwall, shadewall, roof to fairly high temperature to avoid initialization @@ -741,7 +741,7 @@ subroutine InitCold(this, bounds, & end if end if else - this%t_soisno_col(c,1:nlevgrnd) = 274._r8 + this%t_soisno_col(c,1:nlevgrnd) = 272._r8 if (use_excess_ice .and. (lun%itype(l) == istsoil .or. lun%itype(l) == istcrop)) then this%t_soisno_col(c,1:nlevgrnd) = SHR_CONST_TKFRZ - 5.0_r8 !needs to be below freezing to properly initiate excess ice end if From 04167dcc2ff62a82164ffbd6ef7ad97e419f0fa9 Mon Sep 17 00:00:00 2001 From: Keith Oleson Date: Tue, 20 Feb 2024 12:45:00 -0700 Subject: [PATCH 2/6] Don't set t_soisno below freezing when FATES is on --- src/biogeophys/TemperatureType.F90 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/biogeophys/TemperatureType.F90 b/src/biogeophys/TemperatureType.F90 index ab310650c8..9dc38094e6 100644 --- a/src/biogeophys/TemperatureType.F90 +++ b/src/biogeophys/TemperatureType.F90 @@ -741,7 +741,11 @@ subroutine InitCold(this, bounds, & end if end if else - this%t_soisno_col(c,1:nlevgrnd) = 272._r8 + if (use_fates) then + this%t_soisno_col(c,1:nlevgrnd) = 274._r8 + else + this%t_soisno_col(c,1:nlevgrnd) = 272._r8 + end if if (use_excess_ice .and. (lun%itype(l) == istsoil .or. lun%itype(l) == istcrop)) then this%t_soisno_col(c,1:nlevgrnd) = SHR_CONST_TKFRZ - 5.0_r8 !needs to be below freezing to properly initiate excess ice end if From afef737ad573fd5c3f4adbe178500fd14e2048fa Mon Sep 17 00:00:00 2001 From: Keith Oleson Date: Thu, 22 Feb 2024 19:33:27 -0700 Subject: [PATCH 3/6] Revert "Don't set t_soisno below freezing when FATES is on" This reverts commit 04167dcc2ff62a82164ffbd6ef7ad97e419f0fa9. --- src/biogeophys/TemperatureType.F90 | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/biogeophys/TemperatureType.F90 b/src/biogeophys/TemperatureType.F90 index 9dc38094e6..ab310650c8 100644 --- a/src/biogeophys/TemperatureType.F90 +++ b/src/biogeophys/TemperatureType.F90 @@ -741,11 +741,7 @@ subroutine InitCold(this, bounds, & end if end if else - if (use_fates) then - this%t_soisno_col(c,1:nlevgrnd) = 274._r8 - else - this%t_soisno_col(c,1:nlevgrnd) = 272._r8 - end if + this%t_soisno_col(c,1:nlevgrnd) = 272._r8 if (use_excess_ice .and. (lun%itype(l) == istsoil .or. lun%itype(l) == istcrop)) then this%t_soisno_col(c,1:nlevgrnd) = SHR_CONST_TKFRZ - 5.0_r8 !needs to be below freezing to properly initiate excess ice end if From 7c4b636fa9403ef54b940e1816052831d300ad6a Mon Sep 17 00:00:00 2001 From: Keith Oleson Date: Thu, 22 Feb 2024 19:35:02 -0700 Subject: [PATCH 4/6] Add FATES test on izumi to expected fails --- cime_config/testdefs/ExpectedTestFails.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml index 55d1363e6b..dec0c9adf9 100644 --- a/cime_config/testdefs/ExpectedTestFails.xml +++ b/cime_config/testdefs/ExpectedTestFails.xml @@ -147,6 +147,13 @@ #2310 + + + + FAIL + #2373 + + From 7e57f00f7a8f3f248c13abd34717880d85157968 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Fri, 1 Mar 2024 15:38:51 -0700 Subject: [PATCH 5/6] First draft ChangeLog/ChangeSum --- doc/ChangeLog | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++ doc/ChangeSum | 1 + 2 files changed, 68 insertions(+) diff --git a/doc/ChangeLog b/doc/ChangeLog index 084516e23e..9659db297a 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,4 +1,71 @@ =============================================================== +Tag name: ctsm5.1.dev171 +Originator(s): olyson (Keith Oleson,UCAR/TSS) +Date: Fri 01 Mar 2024 03:27:14 PM MST +One-line Summary: Set initial t_soisno=272 for soils and 274K for urban road + +Purpose and description of changes +---------------------------------- + + Issue #2338 and PR #2355 explain: + Soil temperature initialization not implemented correctly in + ctsm5.1.dev058 and thus subsequent tags. + +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 +---------- +CTSM issues fixed (include CTSM Issue #): + Fixes #2338 + +Notes of particular relevance for developers: +--------------------------------------------- +Changes to tests or testing: + SMS_Lm3_D_Mmpi-serial.1x1_brazil.I2000Clm50FatesCruRsGs.izumi_intel.clm-FatesColdHydro + added to expected failures, issue #2373, to be revisited when #2384 is + resolved. + +Testing summary: +---------------- + [PASS means all tests PASS; OK means tests PASS other than expected fails.] + + regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing): + + derecho ----- + izumi ------- + +Answer changes +-------------- + +Changes answers relative to baseline: YES + + Summarize any changes to answers, i.e., + - what code configurations: all + - what platforms/compilers: all + - nature of change: roundoff + +Other details +------------- +Pull Requests that document the changes (include PR ids): + https://github.com/ESCOMP/ctsm/pull/2355 + +=============================================================== +=============================================================== Tag name: ctsm5.1.dev167 Originator(s): samrabin (Sam Rabin, UCAR/TSS, samrabin@ucar.edu) Date: Thu 08 Feb 2024 01:56:05 PM MST diff --git a/doc/ChangeSum b/doc/ChangeSum index d644cff144..ee031b2fd8 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -1,5 +1,6 @@ Tag Who Date Summary ============================================================================================================================ + ctsm5.1.dev171 slevis 03/01/2024 Set initial t_soisno=272 for soils and 274K for urban road ctsm5.1.dev167 samrabin 02/08/2024 Delete _FillValue and history from parameter files ctsm5.1.dev166 multiple 01/24/2024 BFB merge tag ctsm5.1.dev165 slevis 01/19/2024 Turn Meier2022, tillage, residue removal on for ctsm5.1, fix #2212 From 081edeb6d74d76028e75c78b6ff03f9e8c9ed6b1 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Mon, 4 Mar 2024 10:37:36 -0700 Subject: [PATCH 6/6] Updated ChangeLog --- doc/ChangeLog | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 395ab0d929..30058a80b4 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,7 +1,7 @@ =============================================================== Tag name: ctsm5.1.dev171 Originator(s): olyson (Keith Oleson,UCAR/TSS) -Date: Fri 01 Mar 2024 03:27:14 PM MST +Date: Mon 04 Mar 2024 10:33:55 AM MST One-line Summary: Set initial t_soisno=272 for soils and 274K for urban road Purpose and description of changes @@ -46,8 +46,8 @@ Testing summary: regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing): - derecho ----- - izumi ------- + derecho ----- OK + izumi ------- OK Answer changes -------------- @@ -57,7 +57,10 @@ Changes answers relative to baseline: YES Summarize any changes to answers, i.e., - what code configurations: all - what platforms/compilers: all - - nature of change: roundoff + - nature of change: larger than roundoff but not climate-changing + + The original diagnostics for this change are here: + https://webext.cgd.ucar.edu/I2000/ctsm51c6_PPEn08ctsm51d023_2deg_GSWP3V1_Sparse400_cs_ts_tsoisno272_2000AD/lnd/ctsm51c6_PPEn08ctsm51d023_2deg_GSWP3V1_Sparse400_cs_ts_tsoisno272_2000AD.381_400-ctsm51c6_PPEn08ctsm51d023_2deg_GSWP3V1_Sparse400_cs_ts_2000AD.381_400/setsIndex.html Other details -------------