From 5b40c489fcaa2650b02a3386b93e08e4b09e44b5 Mon Sep 17 00:00:00 2001 From: Ryan Knox Date: Wed, 29 May 2024 10:16:50 -0600 Subject: [PATCH 01/12] removed unnecessary zeroing calls for fates history, they are called internally now --- src/utils/clmfates_interfaceMod.F90 | 89 ++++++++++++++++++----------- 1 file changed, 56 insertions(+), 33 deletions(-) diff --git a/src/utils/clmfates_interfaceMod.F90 b/src/utils/clmfates_interfaceMod.F90 index fcd5cb5230..98845f8e62 100644 --- a/src/utils/clmfates_interfaceMod.F90 +++ b/src/utils/clmfates_interfaceMod.F90 @@ -135,6 +135,9 @@ module CLMFatesInterfaceMod use FatesInterfaceMod , only : DetermineGridCellNeighbors use FatesIOVariableKindMod, only : group_dyna_simple, group_dyna_complx + use FatesIOVariableKindMod, only : group_hifr_simple, group_hifr_complx + use FatesIOVariableKindMod, only : group_nflx_simple, group_nflx_complx + use FatesIOVariableKindMod, only : group_hydr_simple, group_hydr_complx use FatesHistoryInterfaceMod, only : fates_hist use FatesRestartInterfaceMod, only : fates_restart_interface_type @@ -1192,14 +1195,6 @@ subroutine dynamics_driv(this, nc, bounds_clump, & call this%WrapUpdateFatesSeedInOut(bounds_clump) end if - ! --------------------------------------------------------------------------------- - ! Flush arrays to values defined by %flushval (see registry entry in - ! subroutine define_history_vars() - ! --------------------------------------------------------------------------------- - call fates_hist%flush_hvars(nc,upfreq_in=group_dyna_simple) - - call fates_hist%flush_hvars(nc,upfreq_in=group_dyna_complx) - ! --------------------------------------------------------------------------------- ! Part II: Call the FATES model now that input boundary conditions have been ! provided. @@ -1970,23 +1965,38 @@ subroutine restart( this, bounds_proc, ncid, flag, waterdiagnosticbulk_inst, & this%fates(nc)%sites, & this%fates(nc)%bc_out) + ! ------------------------------------------------------------------------ - ! Update history IO fields that depend on ecosystem dynamics + ! Flush FATES history variables. + ! The flushing process sets all columns outside of FATES perview to + ! the ignore value. This only needs to be done once, because FATES will + ! not overwright values outside the columns that it is in charge of. ! ------------------------------------------------------------------------ - if(fates_history_dimlevel(2)>0) then + + ! tbd: fates_hist%flush_all_hvars(nc) + + if_dim1: if(fates_history_dimlevel(1)>0) then + call fates_hist%flush_hvars(nc,upfreq_in=group_hifr_simple) + if (use_fates_planthydro) then + call fates_hist%flush_hvars(nc,upfreq_in=group_hydr_simple) + end if + if(fates_history_dimlevel(1)>1) then + call fates_hist%flush_hvars(nc,upfreq_in=group_hifr_complx) + if (use_fates_planthydro) then + call fates_hist%flush_hvars(nc,upfreq_in=group_hydr_complx) + end if + end if + end if if_dim1 + + if_dim2: if(fates_history_dimlevel(2)>0) then call fates_hist%flush_hvars(nc,upfreq_in=group_dyna_simple) - do s = 1,this%fates(nc)%nsites - call fates_hist%zero_site_hvars(this%fates(nc)%sites(s), & - upfreq_in=group_dyna_simple) - end do + call fates_hist%flush_hvars(nc,upfreq_in=group_nflx_simple) if(fates_history_dimlevel(2)>1) then call fates_hist%flush_hvars(nc,upfreq_in=group_dyna_complx) - do s = 1,this%fates(nc)%nsites - call fates_hist%zero_site_hvars(this%fates(nc)%sites(s), & - upfreq_in=group_dyna_complx) - end do + call fates_hist%flush_hvars(nc,upfreq_in=group_nflx_complx) end if - end if + end if if_dim2 + call fates_hist%update_history_dyn( nc, & this%fates(nc)%nsites, & this%fates(nc)%sites, & @@ -2164,22 +2174,38 @@ subroutine init_coldstart(this, waterstatebulk_inst, waterdiagnosticbulk_inst, & soilbiogeochem_carbonflux_inst, .false.) ! ------------------------------------------------------------------------ - ! Update history IO fields that depend on ecosystem dynamics + ! Flush and zero FATES history variables. + ! The flushing process sets all columns outside of FATES perview to + ! the ignore value. This only needs to be done once, because FATES will + ! not overwright values outside the columns that it is in charge of. + ! We also start off by setting all values on FATES columns to zero. ! ------------------------------------------------------------------------ - if(fates_history_dimlevel(2)>0) then + + ! tbd: fates_hist%flush_all_hvars(nc) + + if_dim1: if(fates_history_dimlevel(1)>0) then + call fates_hist%flush_hvars(nc,upfreq_in=group_hifr_simple) + if (use_fates_planthydro) then + call fates_hist%flush_hvars(nc,upfreq_in=group_hydr_simple) + end if + if(fates_history_dimlevel(1)>1) then + call fates_hist%flush_hvars(nc,upfreq_in=group_hifr_complx) + if (use_fates_planthydro) then + call fates_hist%flush_hvars(nc,upfreq_in=group_hydr_complx) + end if + end if + end if if_dim1 + + if_dim2: if(fates_history_dimlevel(2)>0) then call fates_hist%flush_hvars(nc,upfreq_in=group_dyna_simple) - do s = 1,this%fates(nc)%nsites - call fates_hist%zero_site_hvars(this%fates(nc)%sites(s), & - upfreq_in=group_dyna_simple) - end do + call fates_hist%flush_hvars(nc,upfreq_in=group_nflx_simple) if(fates_history_dimlevel(2)>1) then call fates_hist%flush_hvars(nc,upfreq_in=group_dyna_complx) - do s = 1,this%fates(nc)%nsites - call fates_hist%zero_site_hvars(this%fates(nc)%sites(s), & - upfreq_in=group_dyna_complx) - end do + call fates_hist%flush_hvars(nc,upfreq_in=group_nflx_complx) end if - end if + end if if_dim2 + + call fates_hist%update_history_dyn( nc, & this%fates(nc)%nsites, & this%fates(nc)%sites, & @@ -3570,9 +3596,6 @@ subroutine wrap_hydraulics_drive(this, bounds_clump, nc, & this%fates(nc)%bc_out(s)%plant_stored_h2o_si end do - - ! Update History Buffers that need to be updated after hydraulics calls - call fates_hist%update_history_hydraulics(nc, & this%fates(nc)%nsites, & this%fates(nc)%sites, & From fbe292d49b348ee0649527497b86ab8810222361 Mon Sep 17 00:00:00 2001 From: Ryan Knox Date: Mon, 10 Jun 2024 11:34:50 -0600 Subject: [PATCH 02/12] removing c13 from allvars until it is fixed --- .../testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm index a426c775b0..92434df000 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm @@ -26,7 +26,7 @@ hist_fincl1 = 'FATES_TLONGTERM', 'FATES_MORTALITY_CROWNSCORCH_SZPF','FATES_MORTALITY_CAMBIALBURN_SZPF','FATES_MORTALITY_TERMINATION_SZPF', 'FATES_MORTALITY_LOGGING_SZPF','FATES_MORTALITY_FREEZING_SZPF','FATES_MORTALITY_SENESCENCE_SZPF', 'FATES_MORTALITY_AGESCEN_SZPF','FATES_MORTALITY_AGESCEN_ACPF','FATES_MORTALITY_CANOPY_SZPF', -'FATES_M3_MORTALITY_CANOPY_SZPF','FATES_M3_MORTALITY_USTORY_SZPF','FATES_C13DISC_SZPF', +'FATES_M3_MORTALITY_CANOPY_SZPF','FATES_M3_MORTALITY_USTORY_SZPF', 'FATES_STOREC_CANOPY_SZPF','FATES_LEAFC_CANOPY_SZPF','FATES_LAI_CANOPY_SZPF','FATES_CROWNAREA_CANOPY_SZPF', 'FATES_CROWNAREA_USTORY_SZPF','FATES_NPLANT_CANOPY_SZPF','FATES_MORTALITY_USTORY_SZPF','FATES_STOREC_USTORY_SZPF', 'FATES_LEAFC_USTORY_SZPF','FATES_LAI_USTORY_SZPF','FATES_NPLANT_USTORY_SZPF','FATES_CWD_ABOVEGROUND_DC', From be904a7da1b5ee182f2dde09c3efa50f69d43dc1 Mon Sep 17 00:00:00 2001 From: Ryan Knox Date: Mon, 10 Jun 2024 11:39:32 -0600 Subject: [PATCH 03/12] using flush_allvars --- src/utils/clmfates_interfaceMod.F90 | 49 ++--------------------------- 1 file changed, 2 insertions(+), 47 deletions(-) diff --git a/src/utils/clmfates_interfaceMod.F90 b/src/utils/clmfates_interfaceMod.F90 index 98845f8e62..a405850004 100644 --- a/src/utils/clmfates_interfaceMod.F90 +++ b/src/utils/clmfates_interfaceMod.F90 @@ -1973,29 +1973,7 @@ subroutine restart( this, bounds_proc, ncid, flag, waterdiagnosticbulk_inst, & ! not overwright values outside the columns that it is in charge of. ! ------------------------------------------------------------------------ - ! tbd: fates_hist%flush_all_hvars(nc) - - if_dim1: if(fates_history_dimlevel(1)>0) then - call fates_hist%flush_hvars(nc,upfreq_in=group_hifr_simple) - if (use_fates_planthydro) then - call fates_hist%flush_hvars(nc,upfreq_in=group_hydr_simple) - end if - if(fates_history_dimlevel(1)>1) then - call fates_hist%flush_hvars(nc,upfreq_in=group_hifr_complx) - if (use_fates_planthydro) then - call fates_hist%flush_hvars(nc,upfreq_in=group_hydr_complx) - end if - end if - end if if_dim1 - - if_dim2: if(fates_history_dimlevel(2)>0) then - call fates_hist%flush_hvars(nc,upfreq_in=group_dyna_simple) - call fates_hist%flush_hvars(nc,upfreq_in=group_nflx_simple) - if(fates_history_dimlevel(2)>1) then - call fates_hist%flush_hvars(nc,upfreq_in=group_dyna_complx) - call fates_hist%flush_hvars(nc,upfreq_in=group_nflx_complx) - end if - end if if_dim2 + call fates_hist%flush_all_hvars(nc) call fates_hist%update_history_dyn( nc, & this%fates(nc)%nsites, & @@ -2181,30 +2159,7 @@ subroutine init_coldstart(this, waterstatebulk_inst, waterdiagnosticbulk_inst, & ! We also start off by setting all values on FATES columns to zero. ! ------------------------------------------------------------------------ - ! tbd: fates_hist%flush_all_hvars(nc) - - if_dim1: if(fates_history_dimlevel(1)>0) then - call fates_hist%flush_hvars(nc,upfreq_in=group_hifr_simple) - if (use_fates_planthydro) then - call fates_hist%flush_hvars(nc,upfreq_in=group_hydr_simple) - end if - if(fates_history_dimlevel(1)>1) then - call fates_hist%flush_hvars(nc,upfreq_in=group_hifr_complx) - if (use_fates_planthydro) then - call fates_hist%flush_hvars(nc,upfreq_in=group_hydr_complx) - end if - end if - end if if_dim1 - - if_dim2: if(fates_history_dimlevel(2)>0) then - call fates_hist%flush_hvars(nc,upfreq_in=group_dyna_simple) - call fates_hist%flush_hvars(nc,upfreq_in=group_nflx_simple) - if(fates_history_dimlevel(2)>1) then - call fates_hist%flush_hvars(nc,upfreq_in=group_dyna_complx) - call fates_hist%flush_hvars(nc,upfreq_in=group_nflx_complx) - end if - end if if_dim2 - + call fates_hist%flush_all_hvars(nc) call fates_hist%update_history_dyn( nc, & this%fates(nc)%nsites, & From 34d7be9d8a8d5355a709a67871f4d38e0e2f14ca Mon Sep 17 00:00:00 2001 From: Ryan Knox Date: Mon, 10 Jun 2024 11:40:26 -0600 Subject: [PATCH 04/12] removing unused use statements --- src/utils/clmfates_interfaceMod.F90 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/utils/clmfates_interfaceMod.F90 b/src/utils/clmfates_interfaceMod.F90 index a405850004..e97d9b3e37 100644 --- a/src/utils/clmfates_interfaceMod.F90 +++ b/src/utils/clmfates_interfaceMod.F90 @@ -134,10 +134,6 @@ module CLMFatesInterfaceMod use FatesParametersInterface, only : fates_parameters_type use FatesInterfaceMod , only : DetermineGridCellNeighbors - use FatesIOVariableKindMod, only : group_dyna_simple, group_dyna_complx - use FatesIOVariableKindMod, only : group_hifr_simple, group_hifr_complx - use FatesIOVariableKindMod, only : group_nflx_simple, group_nflx_complx - use FatesIOVariableKindMod, only : group_hydr_simple, group_hydr_complx use FatesHistoryInterfaceMod, only : fates_hist use FatesRestartInterfaceMod, only : fates_restart_interface_type From 838ea5f3bdab72ed9b54db969c23a86f548e3114 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Wed, 24 Jul 2024 10:47:58 -0700 Subject: [PATCH 05/12] move fates and update land use history outputs This moves the land use outputs from the baseline fates testmod into the LUH2 base testmod --- cime_config/testdefs/testmods_dirs/clm/Fates/user_nl_clm | 3 +-- .../testdefs/testmods_dirs/clm/FatesColdLUH2/user_nl_clm | 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 91df3e2e61..8bd9f01335 100644 --- a/cime_config/testdefs/testmods_dirs/clm/Fates/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/Fates/user_nl_clm @@ -26,5 +26,4 @@ hist_fincl1 = 'FATES_NCOHORTS', 'FATES_TRIMMING', 'FATES_AREA_PLANTS', 'FATES_NEP', 'FATES_HET_RESP', 'FATES_FIRE_CLOSS', 'FATES_FIRE_FLUX_EL', 'FATES_CBALANCE_ERROR', 'FATES_ERROR_EL', 'FATES_LEAF_ALLOC', 'FATES_SEED_ALLOC', 'FATES_STEM_ALLOC', 'FATES_FROOT_ALLOC', -'FATES_CROOT_ALLOC', 'FATES_STORE_ALLOC', -'FATES_PATCHAREA_LU', 'FATES_DISTURBANCE_RATE_MATRIX_LULU' +'FATES_CROOT_ALLOC', 'FATES_STORE_ALLOC' diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdLUH2/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdLUH2/user_nl_clm index e25490ffbb..6478669bee 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdLUH2/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdLUH2/user_nl_clm @@ -7,3 +7,5 @@ use_fates_nocomp = .true. use_fates_fixed_biogeog = .true. use_fates_sp = .false. use_fates_potentialveg = .false. +hist_fincl1 = 'FATES_PATCHAREA_LU', 'FATES_DISTURBANCE_RATE_MATRIX_LULU', +'FATES_TRANSITIONS_MATRIX_LULU' From 472891822d219c503dec159f991daa670ad7a10c Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Wed, 24 Jul 2024 10:51:31 -0700 Subject: [PATCH 06/12] update fates satellite phenology test coverage This moves one of the FatesColdSatPhen tests to a gnu compiler to provide compiler coverage for issues like #2656. This also adds an nvhpc compiler test to the fates test suite. --- cime_config/testdefs/testlist_clm.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 59044feb10..dc335e03da 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -1998,6 +1998,7 @@ + @@ -3169,7 +3170,7 @@ - + From d393cbfcdad4ed023cf97736265e819e6c195687 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Fri, 26 Jul 2024 09:14:00 -0700 Subject: [PATCH 07/12] update fates tag This addresses #2656 --- .gitmodules | 2 +- src/fates | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 19bc024208..4e9f5b51fb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,7 +28,7 @@ [submodule "fates"] path = src/fates url = https://github.com/NGEET/fates -fxtag = sci.1.77.1_api.36.0.0 +fxtag = sci.1.77.2_api.36.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/src/fates b/src/fates index 1982b0032c..e372f0b6cd 160000 --- a/src/fates +++ b/src/fates @@ -1 +1 @@ -Subproject commit 1982b0032c3cab6278892eccb85f643114ffb1af +Subproject commit e372f0b6cdf46f76f888ee6ac92d9a3572464e8b From cc96bedc0b848d251c1a959598b06a11bbf10e4b Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Sat, 27 Jul 2024 08:58:51 -0700 Subject: [PATCH 08/12] fix fates history output type in LUH2 tests --- .../testdefs/testmods_dirs/clm/FatesColdLUH2/user_nl_clm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdLUH2/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdLUH2/user_nl_clm index 6478669bee..55650230a4 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdLUH2/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdLUH2/user_nl_clm @@ -8,4 +8,4 @@ use_fates_fixed_biogeog = .true. use_fates_sp = .false. use_fates_potentialveg = .false. hist_fincl1 = 'FATES_PATCHAREA_LU', 'FATES_DISTURBANCE_RATE_MATRIX_LULU', -'FATES_TRANSITIONS_MATRIX_LULU' +'FATES_TRANSITION_MATRIX_LULU' From 9afb92152bb65d005022db52c0d586c6737f795c Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Thu, 29 Aug 2024 09:41:24 -0700 Subject: [PATCH 09/12] update fates tag to latest This brings fates up to the latest tag (fire weather refactor) --- .gitmodules | 2 +- src/fates | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index d16396da55..7274b9acd2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,7 +28,7 @@ [submodule "fates"] path = src/fates url = https://github.com/NGEET/fates -fxtag = sci.1.77.2_api.36.0.0 +fxtag = sci.1.78.2_api.36.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/src/fates b/src/fates index e372f0b6cd..e06e0dfcaf 160000 --- a/src/fates +++ b/src/fates @@ -1 +1 @@ -Subproject commit e372f0b6cdf46f76f888ee6ac92d9a3572464e8b +Subproject commit e06e0dfcaf6347993d47dc29944e952d3e4412f7 From 04d45c77ed8c50a490ee022f058592ef79a94515 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Wed, 4 Sep 2024 22:47:39 -0700 Subject: [PATCH 10/12] add changelog --- doc/ChangeLog | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++ doc/ChangeSum | 1 + 2 files changed, 79 insertions(+) diff --git a/doc/ChangeLog b/doc/ChangeLog index 3499c7d720..79526be61c 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,4 +1,82 @@ =============================================================== +Tag name: ctsm5.2.028 +Originator(s): glemieux (Gregory Lemieux, LBNL, glemieux@lbl.gov) +Date: Wed Sep 4 23:21:30 MDT 2024 +One-line Summary: FATES history flushing update + +Purpose and description of changes +---------------------------------- + +This updates the way in which FATES history output is flushed during model initialization +utilizing a new FATES-side subroutine, flush_all_hvars. This update also makes corrections +to a subset of FATES testmods as well as expands the FATES test list by duplicating two +existing tests to run on different compilers for better coverage. The FATES submodule tag +has been updated to the latest scientific tag as well. + + +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 #2657 Add FATES_TRANSITIONS_MATRIX_LULU to FatesColdLUH2 testmods + +Notes of particular relevance for developers: +--------------------------------------------- +Changes to tests or testing: + +Adds nvhpc and gnu FatesSatColdPhen smoke tests to the fates list to expand compiler +coverage. + +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 ----- OK + izumi ------- OK + + fates tests: (give name of baseline if different from CTSM tagname, normally fates baselines are fates--) + derecho ----- OK + izumi ------- OK + +Answer changes +-------------- + +Changes answers relative to baseline: Yes, for FATES tests only + +Changes are consistent with differences in FATES_EFFECT_WSPEED due to NGEET/fates#1215 + +Other details +------------- +List any git submodules updated (cime, rtm, mosart, cism, fates, etc.): + + FATES: sci.1.77.2_api.36.0.0 -> sci.1.78.2_api.36.0.0 + +Pull Requests that document the changes (include PR ids): + https://github.com/ESCOMP/ctsm/pull/2594 + +=============================================================== +=============================================================== Tag name: ctsm5.2.027 Originator(s): erik (Erik Kluzek,UCAR/TSS,303-497-1326) Date: Wed 28 Aug 2024 09:13:22 PM MDT diff --git a/doc/ChangeSum b/doc/ChangeSum index fdf253760f..f8adaa60eb 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -1,5 +1,6 @@ Tag Who Date Summary ============================================================================================================================ + ctsm5.2.028 glemieux 09/04/2024 FATES history flushing update ctsm5.2.027 erik 08/28/2024 Merge b4b-dev ctsm5.2.026 slevis 08/23/2024 Turn on excess ice, explicit AC, Leung_2023 for clm6 ctsm5.2.025 samrabin 08/23/2024 Minor fixes to li2024 fire methods From 9a6cd4417d24ddaf775e0aa5f13481cbe15b4322 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Wed, 4 Sep 2024 22:49:32 -0700 Subject: [PATCH 11/12] correct changelog and sum author --- doc/ChangeLog | 3 ++- doc/ChangeSum | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 79526be61c..0e6db9823e 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,6 +1,7 @@ =============================================================== Tag name: ctsm5.2.028 -Originator(s): glemieux (Gregory Lemieux, LBNL, glemieux@lbl.gov) +Originator(s): rgknox (Ryan Knox, LBNL, rgknox@lbl.gov) + glemieux (Gregory Lemieux, LBNL, glemieux@lbl.gov) Date: Wed Sep 4 23:21:30 MDT 2024 One-line Summary: FATES history flushing update diff --git a/doc/ChangeSum b/doc/ChangeSum index f8adaa60eb..82c7a2a6ef 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -1,6 +1,6 @@ Tag Who Date Summary ============================================================================================================================ - ctsm5.2.028 glemieux 09/04/2024 FATES history flushing update + ctsm5.2.028 rgknox 09/04/2024 FATES history flushing update ctsm5.2.027 erik 08/28/2024 Merge b4b-dev ctsm5.2.026 slevis 08/23/2024 Turn on excess ice, explicit AC, Leung_2023 for clm6 ctsm5.2.025 samrabin 08/23/2024 Minor fixes to li2024 fire methods From 249f850f8108ddc5aa05e0069fb60ff4a7db3561 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Thu, 5 Sep 2024 14:50:07 -0600 Subject: [PATCH 12/12] Update date in change files --- doc/ChangeLog | 2 +- doc/ChangeSum | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 0e6db9823e..e553a59730 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -2,7 +2,7 @@ Tag name: ctsm5.2.028 Originator(s): rgknox (Ryan Knox, LBNL, rgknox@lbl.gov) glemieux (Gregory Lemieux, LBNL, glemieux@lbl.gov) -Date: Wed Sep 4 23:21:30 MDT 2024 +Date: Thu 05 Sep 2024 02:47:14 PM MDT One-line Summary: FATES history flushing update Purpose and description of changes diff --git a/doc/ChangeSum b/doc/ChangeSum index 82c7a2a6ef..45bab07440 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -1,6 +1,6 @@ Tag Who Date Summary ============================================================================================================================ - ctsm5.2.028 rgknox 09/04/2024 FATES history flushing update + ctsm5.2.028 rgknox 09/05/2024 FATES history flushing update ctsm5.2.027 erik 08/28/2024 Merge b4b-dev ctsm5.2.026 slevis 08/23/2024 Turn on excess ice, explicit AC, Leung_2023 for clm6 ctsm5.2.025 samrabin 08/23/2024 Minor fixes to li2024 fire methods