From 4161a020d3d2945ea2d9e6cd1c83b98cca4d20a7 Mon Sep 17 00:00:00 2001 From: Adrianna Foster Date: Wed, 4 Sep 2024 10:54:29 -0600 Subject: [PATCH 01/15] update fuel classes --- src/fates | 2 +- src/main/histFileMod.F90 | 2 +- src/utils/clmfates_interfaceMod.F90 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/fates b/src/fates index e372f0b6cd..2263e6f829 160000 --- a/src/fates +++ b/src/fates @@ -1 +1 @@ -Subproject commit e372f0b6cdf46f76f888ee6ac92d9a3572464e8b +Subproject commit 2263e6f8292792a9a05575023eec1f8265ef7bf2 diff --git a/src/main/histFileMod.F90 b/src/main/histFileMod.F90 index 8ae4ace7e3..2461a60c92 100644 --- a/src/main/histFileMod.F90 +++ b/src/main/histFileMod.F90 @@ -28,7 +28,7 @@ module histFileMod use FatesInterfaceTypesMod , only : nlevheight use FatesInterfaceTypesMod , only : nlevdamage use FatesConstantsMod , only : n_landuse_cats - use FatesLitterMod , only : nfsc + use FatesFuelClassesMod , only : nfsc use FatesLitterMod , only : ncwd use PRTGenericMod , only : num_elements_fates => num_elements use FatesInterfaceTypesMod , only : numpft_fates => numpft diff --git a/src/utils/clmfates_interfaceMod.F90 b/src/utils/clmfates_interfaceMod.F90 index e3e7644b90..c01787217d 100644 --- a/src/utils/clmfates_interfaceMod.F90 +++ b/src/utils/clmfates_interfaceMod.F90 @@ -3648,7 +3648,7 @@ subroutine hlm_bounds_to_fates_bounds(hlm, fates) use FatesInterfaceTypesMod, only : nlevsclass, nlevage, nlevcoage use FatesInterfaceTypesMod, only : nlevheight use FatesInterfaceTypesMod, only : nlevdamage - use FatesLitterMod, only : nfsc + use FatesFuelClassesMod, only : nfsc use FatesLitterMod, only : ncwd use EDParamsMod, only : nlevleaf, nclmax use FatesInterfaceTypesMod, only : numpft_fates => numpft From fff23bd2b6c96394cf9a25505c48a2c1d1fee808 Mon Sep 17 00:00:00 2001 From: Adrianna Foster Date: Wed, 4 Sep 2024 11:50:10 -0600 Subject: [PATCH 02/15] change parmeter file --- cime_config/testdefs/testmods_dirs/clm/Fates/user_nl_clm | 1 + src/fates | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cime_config/testdefs/testmods_dirs/clm/Fates/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/Fates/user_nl_clm index 91df3e2e61..a8ffe59412 100644 --- a/cime_config/testdefs/testmods_dirs/clm/Fates/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/Fates/user_nl_clm @@ -28,3 +28,4 @@ hist_fincl1 = 'FATES_NCOHORTS', 'FATES_TRIMMING', 'FATES_AREA_PLANTS', 'FATES_SEED_ALLOC', 'FATES_STEM_ALLOC', 'FATES_FROOT_ALLOC', 'FATES_CROOT_ALLOC', 'FATES_STORE_ALLOC', 'FATES_PATCHAREA_LU', 'FATES_DISTURBANCE_RATE_MATRIX_LULU' +fates_paramfile = '/glade/work/afoster/CTSM/src/fates/parameter_files/fates_param_fuel.nc' diff --git a/src/fates b/src/fates index 2263e6f829..3cfb2b1bd9 160000 --- a/src/fates +++ b/src/fates @@ -1 +1 @@ -Subproject commit 2263e6f8292792a9a05575023eec1f8265ef7bf2 +Subproject commit 3cfb2b1bd9bcde627e4b3364cfdf2144feaa7ded From 10241e7691eee234ac02cc676fb58205155e3779 Mon Sep 17 00:00:00 2001 From: Adrianna Foster Date: Fri, 6 Sep 2024 11:27:38 -0600 Subject: [PATCH 03/15] fix issues --- cime_config/testdefs/testmods_dirs/clm/Fates/user_nl_clm | 3 ++- src/fates | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cime_config/testdefs/testmods_dirs/clm/Fates/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/Fates/user_nl_clm index a8ffe59412..055a0d1530 100644 --- a/cime_config/testdefs/testmods_dirs/clm/Fates/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/Fates/user_nl_clm @@ -28,4 +28,5 @@ hist_fincl1 = 'FATES_NCOHORTS', 'FATES_TRIMMING', 'FATES_AREA_PLANTS', 'FATES_SEED_ALLOC', 'FATES_STEM_ALLOC', 'FATES_FROOT_ALLOC', 'FATES_CROOT_ALLOC', 'FATES_STORE_ALLOC', 'FATES_PATCHAREA_LU', 'FATES_DISTURBANCE_RATE_MATRIX_LULU' -fates_paramfile = '/glade/work/afoster/CTSM/src/fates/parameter_files/fates_param_fuel.nc' + +! fates_paramfile = '/glade/work/afoster/CTSM/src/fates/parameter_files/fates_param_fuel.nc' diff --git a/src/fates b/src/fates index 3cfb2b1bd9..e06e0dfcaf 160000 --- a/src/fates +++ b/src/fates @@ -1 +1 @@ -Subproject commit 3cfb2b1bd9bcde627e4b3364cfdf2144feaa7ded +Subproject commit e06e0dfcaf6347993d47dc29944e952d3e4412f7 From ebf5f26df700f378522b020b4b3bf31ea008eb78 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Tue, 29 Oct 2024 10:49:17 -0700 Subject: [PATCH 04/15] exclude fates element error from ST3 testdefs This addresses #2580 --- cime_config/testdefs/testmods_dirs/clm/FatesColdST3/user_nl_clm | 1 + 1 file changed, 1 insertion(+) diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdST3/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdST3/user_nl_clm index eca76c4b9c..860656e8d8 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdST3/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdST3/user_nl_clm @@ -1 +1,2 @@ use_fates_ed_st3= .true. +hist_fexcl1 = 'FATES_ERROR_EL' From 127fa7b37376499e97852bd906c7cfe580cf09cf Mon Sep 17 00:00:00 2001 From: adrifoster Date: Tue, 29 Oct 2024 15:19:15 -0600 Subject: [PATCH 05/15] update nfsc name --- src/fates | 2 +- src/main/histFileMod.F90 | 10 +++++----- src/utils/clmfates_interfaceMod.F90 | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/fates b/src/fates index 825579d0b4..b4367834ab 160000 --- a/src/fates +++ b/src/fates @@ -1 +1 @@ -Subproject commit 825579d0b406fe99344591b5ed8356e5c7aeebec +Subproject commit b4367834abf505eb4e5f53af9bc7e4b83af4685c diff --git a/src/main/histFileMod.F90 b/src/main/histFileMod.F90 index 69dcbe3b8e..4d1f514cb0 100644 --- a/src/main/histFileMod.F90 +++ b/src/main/histFileMod.F90 @@ -28,7 +28,7 @@ module histFileMod use FatesInterfaceTypesMod , only : nlevheight use FatesInterfaceTypesMod , only : nlevdamage use FatesConstantsMod , only : n_landuse_cats - use FatesFuelClassesMod , only : nfsc + use FatesFuelClassesMod , only : num_fuel_classes use FatesLitterMod , only : ncwd use PRTGenericMod , only : num_elements_fates => num_elements use FatesInterfaceTypesMod , only : numpft_fates => numpft @@ -2504,7 +2504,7 @@ subroutine htape_create (t, histrest) call ncd_defdim(lnfid, 'fates_levpft', numpft_fates, dimid) call ncd_defdim(lnfid, 'fates_levage', nlevage, dimid) call ncd_defdim(lnfid, 'fates_levheight', nlevheight, dimid) - call ncd_defdim(lnfid, 'fates_levfuel', nfsc, dimid) + call ncd_defdim(lnfid, 'fates_levfuel', num_fuel_classes, dimid) call ncd_defdim(lnfid, 'fates_levcwdsc', ncwd, dimid) call ncd_defdim(lnfid, 'fates_levscpf', nlevsclass*numpft_fates, dimid) call ncd_defdim(lnfid, 'fates_levcapf', nlevcoage*numpft_fates, dimid) @@ -2519,7 +2519,7 @@ subroutine htape_create (t, histrest) call ncd_defdim(lnfid, 'fates_levelpft', num_elements_fates * numpft_fates, dimid) call ncd_defdim(lnfid, 'fates_levelcwd', num_elements_fates * ncwd, dimid) call ncd_defdim(lnfid, 'fates_levelage', num_elements_fates * nlevage, dimid) - call ncd_defdim(lnfid, 'fates_levagefuel', nlevage * nfsc, dimid) + call ncd_defdim(lnfid, 'fates_levagefuel', nlevage * num_fuel_classes, dimid) call ncd_defdim(lnfid, 'fates_levclscpf', nclmax*nlevsclass*numpft_fates, dimid) call ncd_defdim(lnfid, 'fates_levlanduse', n_landuse_cats, dimid) call ncd_defdim(lnfid, 'fates_levlulu', n_landuse_cats * n_landuse_cats, dimid) @@ -5595,7 +5595,7 @@ subroutine hist_addfld2d (fname, type2d, units, avgflag, long_name, type1d_out, case ('fates_levheight') num2d = nlevheight case ('fates_levfuel') - num2d = nfsc + num2d = num_fuel_classes case ('fates_levcwdsc') num2d = ncwd case ('fates_levscpf') @@ -5635,7 +5635,7 @@ subroutine hist_addfld2d (fname, type2d, units, avgflag, long_name, type1d_out, case ('fates_levelage') num2d = num_elements_fates*nlevage case ('fates_levagefuel') - num2d = nlevage*nfsc + num2d = nlevage*num_fuel_classes case('fates_levclscpf') num2d = nclmax * nclmax * numpft_fates case ('fates_levlanduse') diff --git a/src/utils/clmfates_interfaceMod.F90 b/src/utils/clmfates_interfaceMod.F90 index 10fabeed23..269189d1b7 100644 --- a/src/utils/clmfates_interfaceMod.F90 +++ b/src/utils/clmfates_interfaceMod.F90 @@ -3622,7 +3622,7 @@ subroutine hlm_bounds_to_fates_bounds(hlm, fates) use FatesInterfaceTypesMod, only : nlevsclass, nlevage, nlevcoage use FatesInterfaceTypesMod, only : nlevheight use FatesInterfaceTypesMod, only : nlevdamage - use FatesFuelClassesMod, only : nfsc + use FatesFuelClassesMod, only : num_fuel_classes use FatesLitterMod, only : ncwd use EDParamsMod, only : nlevleaf, nclmax use FatesInterfaceTypesMod, only : numpft_fates => numpft @@ -3674,7 +3674,7 @@ subroutine hlm_bounds_to_fates_bounds(hlm, fates) fates%sizeagepft_class_end = nlevsclass * nlevage * numpft_fates fates%fuel_begin = 1 - fates%fuel_end = nfsc + fates%fuel_end = num_fuel_classes fates%cwdsc_begin = 1 fates%cwdsc_end = ncwd @@ -3701,7 +3701,7 @@ subroutine hlm_bounds_to_fates_bounds(hlm, fates) fates%elage_end = num_elements * nlevage fates%agefuel_begin = 1 - fates%agefuel_end = nlevage * nfsc + fates%agefuel_end = nlevage * num_fuel_classes fates%cdpf_begin = 1 fates%cdpf_end = nlevdamage * numpft_fates * nlevsclass From c6157d500078ffe06ac4a1bdeb3b67cce07c6905 Mon Sep 17 00:00:00 2001 From: adrifoster Date: Thu, 31 Oct 2024 10:15:53 -0600 Subject: [PATCH 06/15] updates --- src/fates | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fates b/src/fates index b4367834ab..de61028847 160000 --- a/src/fates +++ b/src/fates @@ -1 +1 @@ -Subproject commit b4367834abf505eb4e5f53af9bc7e4b83af4685c +Subproject commit de6102884790bb60681b11d20151fb462c1a70b5 From 5ba87240eac03a0b5d26973fb7c5f4cef8fe06cb Mon Sep 17 00:00:00 2001 From: adrifoster Date: Thu, 31 Oct 2024 10:16:13 -0600 Subject: [PATCH 07/15] updates --- components/cdeps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/cdeps b/components/cdeps index 7b0b3a8272..7476950699 160000 --- a/components/cdeps +++ b/components/cdeps @@ -1 +1 @@ -Subproject commit 7b0b3a827241c53d296ec877cb1f59966bf5e5bf +Subproject commit 7476950699909813d1938a34bd8d71bf5bfbf1e9 From 32fc16737e7b0b4b9f35b4f74d92e66dacbded24 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Thu, 31 Oct 2024 13:08:32 -0700 Subject: [PATCH 08/15] Revert "temporarily convert fates seed dispersal test to use f10" This reverts commit e9fb075891f90f97159071d03b376ed44c451bfc. --- cime_config/testdefs/testlist_clm.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 4654f53c45..0077221573 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -2670,7 +2670,7 @@ - + @@ -2679,7 +2679,7 @@ - + From 956d41d7bfeb94d6d15a4999a614ba16a621d2b2 Mon Sep 17 00:00:00 2001 From: Adrianna Foster Date: Thu, 7 Nov 2024 13:28:38 -0700 Subject: [PATCH 09/15] adding 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 7049e9672b..ba7b945767 100644 --- a/cime_config/testdefs/ExpectedTestFails.xml +++ b/cime_config/testdefs/ExpectedTestFails.xml @@ -188,6 +188,13 @@ #2454 + + + + FAIL + #2867 + + From 7006d9499920ee0327ab41aa422d41019f64f04a Mon Sep 17 00:00:00 2001 From: Adrianna Foster Date: Fri, 8 Nov 2024 09:29:53 -0700 Subject: [PATCH 10/15] more 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 ba7b945767..dd0068909a 100644 --- a/cime_config/testdefs/ExpectedTestFails.xml +++ b/cime_config/testdefs/ExpectedTestFails.xml @@ -304,6 +304,13 @@ #2810 + + + + FAIL + #2810 + + From 06bcd4aea211554ff847255da02c75acb02bd824 Mon Sep 17 00:00:00 2001 From: Adrianna Foster Date: Fri, 8 Nov 2024 09:32:38 -0700 Subject: [PATCH 11/15] expected fails for izumi_nag --- cime_config/testdefs/ExpectedTestFails.xml | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml index dd0068909a..6be21e3e4f 100644 --- a/cime_config/testdefs/ExpectedTestFails.xml +++ b/cime_config/testdefs/ExpectedTestFails.xml @@ -311,6 +311,38 @@ #2810 + + + + FAIL + #2861 + + + + + + FAIL + #2861 + + + + + + + FAIL + #2861 + + + + + + FAIL + #2861 + + + + + From 6fbd0cc410fa56643db46f55eee730fe5d9c439d Mon Sep 17 00:00:00 2001 From: Adrianna Foster Date: Fri, 8 Nov 2024 14:32:59 -0700 Subject: [PATCH 12/15] updating expected fails --- cime_config/testdefs/ExpectedTestFails.xml | 7 ------- components/cdeps | 2 +- src/fates | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml index 6be21e3e4f..b53914378f 100644 --- a/cime_config/testdefs/ExpectedTestFails.xml +++ b/cime_config/testdefs/ExpectedTestFails.xml @@ -319,13 +319,6 @@ - - - FAIL - #2861 - - - diff --git a/components/cdeps b/components/cdeps index 7476950699..7b0b3a8272 160000 --- a/components/cdeps +++ b/components/cdeps @@ -1 +1 @@ -Subproject commit 7476950699909813d1938a34bd8d71bf5bfbf1e9 +Subproject commit 7b0b3a827241c53d296ec877cb1f59966bf5e5bf diff --git a/src/fates b/src/fates index de61028847..fb6ab8c2f7 160000 --- a/src/fates +++ b/src/fates @@ -1 +1 @@ -Subproject commit de6102884790bb60681b11d20151fb462c1a70b5 +Subproject commit fb6ab8c2f744fdebe42e5ab2881c0c34333180b7 From 7d222636cb49ccec8c168ff870caed976205b442 Mon Sep 17 00:00:00 2001 From: Adrianna Foster Date: Wed, 13 Nov 2024 09:09:37 -0700 Subject: [PATCH 13/15] remove duplicated expected fails --- cime_config/testdefs/ExpectedTestFails.xml | 34 +++------------------- src/fates | 2 +- 2 files changed, 5 insertions(+), 31 deletions(-) diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml index 7631addb80..9cfc3d864b 100644 --- a/cime_config/testdefs/ExpectedTestFails.xml +++ b/cime_config/testdefs/ExpectedTestFails.xml @@ -180,6 +180,10 @@ FAIL #2454 + + FAIL + #2325 + @@ -277,13 +281,6 @@ - - - FAIL - #2325 - - - FAIL @@ -341,13 +338,6 @@ - - - FAIL - #2861 - - - FAIL @@ -369,13 +359,6 @@ - - - FAIL - #2810 - - - FAIL @@ -391,15 +374,6 @@ - - - FAIL - #2861 - - - - - diff --git a/src/fates b/src/fates index fb6ab8c2f7..bdb253fd92 160000 --- a/src/fates +++ b/src/fates @@ -1 +1 @@ -Subproject commit fb6ab8c2f744fdebe42e5ab2881c0c34333180b7 +Subproject commit bdb253fd9262cbb721a3f2ef033e16d73c2cd77e From 7148a3871682ae24c7f32b36432db8e4264d38f5 Mon Sep 17 00:00:00 2001 From: Adrianna Foster Date: Wed, 13 Nov 2024 09:14:50 -0700 Subject: [PATCH 14/15] another izumi_nag fail --- cime_config/testdefs/ExpectedTestFails.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml index 9cfc3d864b..007468cecc 100644 --- a/cime_config/testdefs/ExpectedTestFails.xml +++ b/cime_config/testdefs/ExpectedTestFails.xml @@ -289,6 +289,14 @@ + + + + FAIL + #2861 + + + FAIL From 836d4701d9acd340558167335c17969bd32df8dc Mon Sep 17 00:00:00 2001 From: Adrianna Foster Date: Wed, 13 Nov 2024 09:54:08 -0700 Subject: [PATCH 15/15] changelog and fates tag --- .gitmodules | 2 +- doc/ChangeLog | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++ doc/ChangeSum | 1 + src/fates | 2 +- 4 files changed, 61 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 1f6da08484..225f2f75ac 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,7 +28,7 @@ [submodule "fates"] path = src/fates url = https://github.com/NGEET/fates -fxtag = sci.1.78.3_api.36.1.0 +fxtag = sci.1.79.3_api.37.0.0 fxrequired = AlwaysRequired # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed fxDONOTUSEurl = https://github.com/NCAR/fates-release diff --git a/doc/ChangeLog b/doc/ChangeLog index c08a55bbd4..5a2a3c472e 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,4 +1,62 @@ =============================================================== +Tag name: ctsm5.3.012 +Originator(s): afoster (Adrianna Foster,UCAR/TSS,303-497-1728) +Date: Wed 13 Nov 2024 09:53:51 AM MST +One-line Summary: update fates tag + +Purpose and description of changes +---------------------------------- + +Updates FATES tag to latest fates main (sci.1.79.3_api.37.0.0), and updates API to go +along with latest FATES update to refactor it's fire equations + + +Significant changes to scientifically-supported configurations +-------------------------------------------------------------- + + +[ ] clm6_0 + +[ ] clm5_1 + +[ ] clm5_0 + +[ ] ctsm5_0-nwp + +[ ] clm4_5 + + + + + + +Testing summary: +---------------- + + regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing): + + derecho ----- OK + izumi ------- OK + + fates tests: + derecho ----- OK + izumi ------- OK + + +Answer changes +-------------- + +Changes answers relative to baseline: + +Round-off differences for FATES compsets where fire is active. +NLCOMP differences for some FATES compsets + + +Pull Requests that document the changes (include PR ids): +- ESCOMP/CTSM#2782: Fates fuel refactor (https://github.com/ESCOMP/CTSM/pull/2782) + +=============================================================== +=============================================================== Tag name: ctsm5.3.011 Originator(s): samrabin (Sam Rabin, UCAR/TSS, samrabin@ucar.edu) Date: Mon Nov 11 17:55:57 MST 2024 diff --git a/doc/ChangeSum b/doc/ChangeSum index daffdab145..87d5709a68 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -1,5 +1,6 @@ Tag Who Date Summary ============================================================================================================================ + ctsm5.3.012 afoster 11/13/2024 update fates tag ctsm5.3.011 samrabin 11/11/2024 Improve handling of cold-start finidat ctsm5.3.010 afoster 11/09/2024 Merge b4b-dev ctsm5.3.009 samrabin 10/15/2024 Reduce outputs from matrixcnOn tests diff --git a/src/fates b/src/fates index bdb253fd92..e3e7d2cd86 160000 --- a/src/fates +++ b/src/fates @@ -1 +1 @@ -Subproject commit bdb253fd9262cbb721a3f2ef033e16d73c2cd77e +Subproject commit e3e7d2cd86a66f8ca0e8f6dc4a823246a2bdb95b