From b4415079927843cb752d2d6e6131c96c406f20a7 Mon Sep 17 00:00:00 2001 From: Ryan Knox Date: Wed, 4 Dec 2024 10:49:31 -0700 Subject: [PATCH 01/22] moved the passing of the use_luh2 flag to fates earlier in the sequence to allow memory allocation handling --- src/utils/clmfates_interfaceMod.F90 | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/utils/clmfates_interfaceMod.F90 b/src/utils/clmfates_interfaceMod.F90 index 269189d1b7..d580615cbc 100644 --- a/src/utils/clmfates_interfaceMod.F90 +++ b/src/utils/clmfates_interfaceMod.F90 @@ -305,6 +305,7 @@ subroutine CLMFatesGlobals1(surf_numpft,surf_numcft,maxsoil_patches) integer :: pass_nocomp integer :: pass_sp integer :: pass_masterproc + integer :: pass_luh logical :: verbose_output type(fates_param_reader_ctsm_impl) :: var_reader @@ -348,6 +349,14 @@ subroutine CLMFatesGlobals1(surf_numpft,surf_numcft,maxsoil_patches) end if call set_fates_ctrlparms('masterproc',ival=pass_masterproc) + ! FATES landuse modes + if(use_fates_luh) then + pass_luh = 1 + else + pass_luh = 0 + end if + call set_fates_ctrlparms('use_luh2',ival=pass_luh) + end if @@ -540,16 +549,12 @@ subroutine CLMFatesGlobals2() ! FATES landuse modes if(use_fates_luh) then - pass_use_luh = 1 pass_num_luh_states = num_landuse_state_vars pass_num_luh_transitions = num_landuse_transition_vars else - pass_use_luh = 0 pass_num_luh_states = 0 pass_num_luh_transitions = 0 end if - - call set_fates_ctrlparms('use_luh2',ival=pass_use_luh) call set_fates_ctrlparms('num_luh2_states',ival=pass_num_luh_states) call set_fates_ctrlparms('num_luh2_transitions',ival=pass_num_luh_transitions) From 4bff2f28473af91f3b3fb248c360eb4985653cb6 Mon Sep 17 00:00:00 2001 From: Ryan Knox Date: Wed, 4 Dec 2024 12:15:26 -0700 Subject: [PATCH 02/22] updated naming convention of local variables --- src/utils/clmfates_interfaceMod.F90 | 33 ++++++++++++++--------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/src/utils/clmfates_interfaceMod.F90 b/src/utils/clmfates_interfaceMod.F90 index d580615cbc..bee69cce45 100644 --- a/src/utils/clmfates_interfaceMod.F90 +++ b/src/utils/clmfates_interfaceMod.F90 @@ -301,11 +301,11 @@ subroutine CLMFatesGlobals1(surf_numpft,surf_numcft,maxsoil_patches) integer,intent(in) :: surf_numpft integer,intent(in) :: surf_numcft integer,intent(out) :: maxsoil_patches - integer :: pass_biogeog - integer :: pass_nocomp - integer :: pass_sp + integer :: pass_use_fixed_biogeog + integer :: pass_use_nocomp + integer :: pass_use_sp integer :: pass_masterproc - integer :: pass_luh + integer :: pass_use_luh2 logical :: verbose_output type(fates_param_reader_ctsm_impl) :: var_reader @@ -322,25 +322,25 @@ subroutine CLMFatesGlobals1(surf_numpft,surf_numcft,maxsoil_patches) ! Send parameters individually if(use_fates_fixed_biogeog)then - pass_biogeog = 1 + pass_use_fixed_biogeog = 1 else - pass_biogeog = 0 + pass_use_fixed_biogeog = 0 end if - call set_fates_ctrlparms('use_fixed_biogeog',ival=pass_biogeog) + call set_fates_ctrlparms('use_fixed_biogeog',ival=pass_use_fixed_biogeog) if(use_fates_nocomp)then - pass_nocomp = 1 + pass_use_nocomp = 1 else - pass_nocomp = 0 + pass_use_nocomp = 0 end if - call set_fates_ctrlparms('use_nocomp',ival=pass_nocomp) + call set_fates_ctrlparms('use_nocomp',ival=pass_use_nocomp) if(use_fates_sp)then - pass_sp = 1 + pass_use_sp = 1 else - pass_sp = 0 + pass_use_sp = 0 end if - call set_fates_ctrlparms('use_sp',ival=pass_sp) + call set_fates_ctrlparms('use_sp',ival=pass_use_sp) if(masterproc)then pass_masterproc = 1 @@ -351,11 +351,11 @@ subroutine CLMFatesGlobals1(surf_numpft,surf_numcft,maxsoil_patches) ! FATES landuse modes if(use_fates_luh) then - pass_luh = 1 + pass_use_luh2 = 1 else - pass_luh = 0 + pass_use_luh2 = 0 end if - call set_fates_ctrlparms('use_luh2',ival=pass_luh) + call set_fates_ctrlparms('use_luh2',ival=pass_use_luh2) end if @@ -404,7 +404,6 @@ subroutine CLMFatesGlobals2() integer :: pass_is_restart integer :: pass_cohort_age_tracking integer :: pass_tree_damage - integer :: pass_use_luh integer :: pass_use_potentialveg integer :: pass_num_luh_states integer :: pass_num_luh_transitions From cf5d00dcd534fa6bce784eb46abb7aa9bae5a7a7 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Tue, 14 Jan 2025 10:51:25 -0800 Subject: [PATCH 03/22] add graceful failure if for Meier2022 and use_fates combo --- bld/CLMBuildNamelist.pm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bld/CLMBuildNamelist.pm b/bld/CLMBuildNamelist.pm index ab0aab0cc5..f72959f55f 100755 --- a/bld/CLMBuildNamelist.pm +++ b/bld/CLMBuildNamelist.pm @@ -2125,10 +2125,13 @@ sub setup_logic_roughness_methods { $log->fatal_error("$var is incorrect entry for the namelist variable z0param_method; expected Meier2022 or ZengWang2007"); } my $phys = $physv->as_string(); - if ( $phys eq "clm4_5" || $phys eq "clm5_0" ) { - if ( $var eq "Meier2022" ) { + if ( $var eq "Meier2022" ) { + if ( $phys eq "clm4_5" || $phys eq "clm5_0" ) { $log->fatal_error("z0param_method = $var and phys = $phys, but this method has been tested only with clm6_0 and later versions; to use with earlier versions, disable this error, and add Meier2022 parameters to the corresponding params file"); } + if ( &value_is_true($nl_flags->{'use_fates'}) ) { + $log->fatal_error("z0param_method = $var and use_fates currently are not compatible. Please update the z0param_method to ZengWang2007") + } } } #------------------------------------------------------------------------------- From dbb619273b73e642b2c2eaefe452dcc95e45bca1 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Tue, 14 Jan 2025 11:35:01 -0800 Subject: [PATCH 04/22] add default option to z0param_method If fates is on, default to ZengWang2007, otherwise use Meier2022 --- bld/namelist_files/namelist_defaults_ctsm.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml index cee72ca5cf..838c28da84 100644 --- a/bld/namelist_files/namelist_defaults_ctsm.xml +++ b/bld/namelist_files/namelist_defaults_ctsm.xml @@ -540,7 +540,9 @@ attributes from the config_cache.xml file (with keys converted to upper-case). ZengWang2007 -Meier2022 + +ZengWang2007 +Meier2022 .true. .false. From 43407e152c887017fa2d7ccbded868c3e7eabef4 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Tue, 14 Jan 2025 15:58:09 -0800 Subject: [PATCH 05/22] add endrun call during initialization if Meier2022 is run with fates --- src/main/clm_initializeMod.F90 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/clm_initializeMod.F90 b/src/main/clm_initializeMod.F90 index 46353539ce..ec0fbeb024 100644 --- a/src/main/clm_initializeMod.F90 +++ b/src/main/clm_initializeMod.F90 @@ -57,7 +57,7 @@ subroutine initialize1(dtime) use clm_varpar , only: clm_varpar_init use clm_varcon , only: clm_varcon_init use landunit_varcon , only: landunit_varcon_init - use clm_varctl , only: fsurdat, version + use clm_varctl , only: fsurdat, version, z0param_method use surfrdMod , only: surfrd_get_num_patches, surfrd_get_nlevurb, surfrd_compat_check use controlMod , only: control_init, control_print, NLFilename use ncdio_pio , only: ncd_pio_init @@ -108,6 +108,10 @@ subroutine initialize1(dtime) ! number of patches per column. We still use numcft from the surface ! file though... if(use_fates) then + if (z0param_method == 'Meier2022') then + call endrun(msg='ERROR clm_initializeMod: '//& + 'FATES is not compatible with Meier2022') + end if call CLMFatesGlobals1(actual_numpft, actual_numcft, actual_maxsoil_patches) end if From cb361ebe234fdd79cca28832da9fb404f9973e16 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Tue, 14 Jan 2025 22:39:10 -0800 Subject: [PATCH 06/22] update comment and error message with issue number --- bld/CLMBuildNamelist.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bld/CLMBuildNamelist.pm b/bld/CLMBuildNamelist.pm index f72959f55f..791e5a4af2 100755 --- a/bld/CLMBuildNamelist.pm +++ b/bld/CLMBuildNamelist.pm @@ -2129,8 +2129,9 @@ sub setup_logic_roughness_methods { if ( $phys eq "clm4_5" || $phys eq "clm5_0" ) { $log->fatal_error("z0param_method = $var and phys = $phys, but this method has been tested only with clm6_0 and later versions; to use with earlier versions, disable this error, and add Meier2022 parameters to the corresponding params file"); } + # Make sure that fates and meier2022 are not both active due to issue #2932 if ( &value_is_true($nl_flags->{'use_fates'}) ) { - $log->fatal_error("z0param_method = $var and use_fates currently are not compatible. Please update the z0param_method to ZengWang2007") + $log->fatal_error("z0param_method = $var and use_fates currently are not compatible. Please update the z0param_method to ZengWang2007. See issue #2932 for more information.") } } } From 57f3d217b22acf5a08e85ecab4b0ab60b4207799 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Wed, 15 Jan 2025 00:13:42 -0700 Subject: [PATCH 07/22] add failure unit test for Meier2022 and fates --- bld/unit_testers/build-namelist_test.pl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bld/unit_testers/build-namelist_test.pl b/bld/unit_testers/build-namelist_test.pl index d42487cfdb..a3630f3286 100755 --- a/bld/unit_testers/build-namelist_test.pl +++ b/bld/unit_testers/build-namelist_test.pl @@ -163,10 +163,10 @@ sub cat_and_create_namelistinfile { # # Figure out number of tests that will run # -my $ntests = 3263; +my $ntests = 3264; if ( defined($opts{'compare'}) ) { - $ntests += 1979; + $ntests += 1980; } plan( tests=>$ntests ); @@ -1185,6 +1185,10 @@ sub cat_and_create_namelistinfile { namelst=>"use_hydrstress=.true.", phys=>"clm5_0", }, + "useMeierwithFATES" =>{ options=>"-bgc fates -envxml_dir . -no-megan", + namelst=>"z0param_method=Meier2022", + phys=>"clm5_0", + }, "noanthro_w_crop" =>{ options=>"-envxml_dir . -res 0.9x1.25 -bgc bgc -crop -use_case 1850_noanthro_control", namelst=>"", phys=>"clm5_0", From 97ac82306c231c79c393449687c704bcb0b64033 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Wed, 15 Jan 2025 09:33:04 -0800 Subject: [PATCH 08/22] add use_fates to add_default call in roughness bld logic this avoids the need to set a `.true.` condition for z0param_method in the defaults --- bld/CLMBuildNamelist.pm | 2 +- bld/namelist_files/namelist_defaults_ctsm.xml | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/bld/CLMBuildNamelist.pm b/bld/CLMBuildNamelist.pm index 791e5a4af2..93004ad1c4 100755 --- a/bld/CLMBuildNamelist.pm +++ b/bld/CLMBuildNamelist.pm @@ -2118,7 +2118,7 @@ sub setup_logic_roughness_methods { my ($opts, $nl_flags, $definition, $defaults, $nl, $physv) = @_; add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'z0param_method', - 'phys'=>$nl_flags->{'phys'} ); + 'phys'=>$nl_flags->{'phys'} , 'use_fates'=>$nl_flags->{'use_fates'}); my $var = remove_leading_and_trailing_quotes( $nl->get_value("z0param_method") ); if ( $var ne "Meier2022" && $var ne "ZengWang2007" ) { diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml index 838c28da84..64e00527fe 100644 --- a/bld/namelist_files/namelist_defaults_ctsm.xml +++ b/bld/namelist_files/namelist_defaults_ctsm.xml @@ -540,8 +540,6 @@ attributes from the config_cache.xml file (with keys converted to upper-case). ZengWang2007 - -ZengWang2007 Meier2022 .true. From 17ca334ae7781abf215817d787bbc07781613a60 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Wed, 15 Jan 2025 13:37:02 -0800 Subject: [PATCH 09/22] change secondary forest history names per ngeet/fates#1273 --- .../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 92434df000..099f1dfab8 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm @@ -8,7 +8,7 @@ use_fates_tree_damage = .true. hist_ndens = 1 hist_fincl1 = 'FATES_TLONGTERM', 'FATES_TGROWTH','FATES_SEEDS_IN_GRIDCELL_PF','FATES_SEEDS_OUT_GRIDCELL_PF','FATES_NCL_AP', -'FATES_NPATCH_AP','FATES_VEGC_AP','FATES_SECONDAREA_ANTHRODIST_AP','FATES_SECONDAREA_DIST_AP', +'FATES_NPATCH_AP','FATES_VEGC_AP','FATES_SECONDAREA_ANTHRODISTAGE_AP','FATES_SECONDARY_AREA_AP', 'FATES_FUEL_AMOUNT_APFC','FATES_STOREC_TF_USTORY_SZPF','FATES_STOREC_TF_CANOPY_SZPF', 'FATES_CROWNAREA_CLLL','FATES_ABOVEGROUND_MORT_SZPF', 'FATES_ABOVEGROUND_PROD_SZPF','FATES_NPLANT_SZAP','FATES_NPLANT_CANOPY_SZAP', From 23b30aed8a9154e760407af3a73f24bf6f115e6f Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Wed, 15 Jan 2025 15:19:15 -0800 Subject: [PATCH 10/22] Revert "add endrun call during initialization if Meier2022 is run with fates" This reverts commit 43407e152c887017fa2d7ccbded868c3e7eabef4. --- src/main/clm_initializeMod.F90 | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/clm_initializeMod.F90 b/src/main/clm_initializeMod.F90 index ec0fbeb024..46353539ce 100644 --- a/src/main/clm_initializeMod.F90 +++ b/src/main/clm_initializeMod.F90 @@ -57,7 +57,7 @@ subroutine initialize1(dtime) use clm_varpar , only: clm_varpar_init use clm_varcon , only: clm_varcon_init use landunit_varcon , only: landunit_varcon_init - use clm_varctl , only: fsurdat, version, z0param_method + use clm_varctl , only: fsurdat, version use surfrdMod , only: surfrd_get_num_patches, surfrd_get_nlevurb, surfrd_compat_check use controlMod , only: control_init, control_print, NLFilename use ncdio_pio , only: ncd_pio_init @@ -108,10 +108,6 @@ subroutine initialize1(dtime) ! number of patches per column. We still use numcft from the surface ! file though... if(use_fates) then - if (z0param_method == 'Meier2022') then - call endrun(msg='ERROR clm_initializeMod: '//& - 'FATES is not compatible with Meier2022') - end if call CLMFatesGlobals1(actual_numpft, actual_numcft, actual_maxsoil_patches) end if From ccb55dab6f582a9ca7ac72677e2d768b522859c2 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Wed, 15 Jan 2025 15:19:30 -0800 Subject: [PATCH 11/22] add Meier2022 check in control_init fates section --- src/main/controlMod.F90 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/controlMod.F90 b/src/main/controlMod.F90 index e8121519aa..c07909c67e 100644 --- a/src/main/controlMod.F90 +++ b/src/main/controlMod.F90 @@ -518,6 +518,11 @@ subroutine control_init(dtime) errMsg(sourcefile, __LINE__)) end if + if (z0param_method == 'Meier2022') then + call endrun(msg=' ERROR: Surface roughness parameterization Meier2022 is not compatible with FATES.'//& + errMsg(sourcefile, __LINE__)) + end if + else ! These do default to false anyway, but this emphasizes they From 51d5bf5e27418081cbc3a5fea5a62c5d8a7be472 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Thu, 30 Jan 2025 17:15:25 -0800 Subject: [PATCH 12/22] fix fates secondary history output name in allvars --- .../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 099f1dfab8..180c339207 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm @@ -8,7 +8,7 @@ use_fates_tree_damage = .true. hist_ndens = 1 hist_fincl1 = 'FATES_TLONGTERM', 'FATES_TGROWTH','FATES_SEEDS_IN_GRIDCELL_PF','FATES_SEEDS_OUT_GRIDCELL_PF','FATES_NCL_AP', -'FATES_NPATCH_AP','FATES_VEGC_AP','FATES_SECONDAREA_ANTHRODISTAGE_AP','FATES_SECONDARY_AREA_AP', +'FATES_NPATCH_AP','FATES_VEGC_AP','FATES_SECONDARY_ANTHRODISTAGE_AP','FATES_SECONDARY_AREA_AP', 'FATES_FUEL_AMOUNT_APFC','FATES_STOREC_TF_USTORY_SZPF','FATES_STOREC_TF_CANOPY_SZPF', 'FATES_CROWNAREA_CLLL','FATES_ABOVEGROUND_MORT_SZPF', 'FATES_ABOVEGROUND_PROD_SZPF','FATES_NPLANT_SZAP','FATES_NPLANT_CANOPY_SZAP', From 1137ffa90c434ff5413f97d20dc50a4764a977fd Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Thu, 30 Jan 2025 22:33:52 -0800 Subject: [PATCH 13/22] add missing variables that should be in allvars --- .../testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm | 3 ++- 1 file changed, 2 insertions(+), 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 180c339207..18b6cc66c8 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm @@ -56,4 +56,5 @@ hist_fincl1 = 'FATES_TLONGTERM', 'FATES_PARSUN_CL','FATES_PARSHA_CL','FATES_LAISUN_CLLL','FATES_LAISHA_CLLL','FATES_LAISUN_CLLLPF', 'FATES_LAISHA_CLLLPF','FATES_PARPROF_DIR_CLLLPF','FATES_PARPROF_DIF_CLLLPF','FATES_LAISUN_CL','FATES_LAISHA_CL', 'FATES_PARPROF_DIR_CLLL','FATES_PARPROF_DIF_CLLL','FATES_NET_C_UPTAKE_CLLL','FATES_CROWNFRAC_CLLLPF', -'FATES_LBLAYER_COND_AP','FATES_STOMATAL_COND_AP' +'FATES_LBLAYER_COND_AP','FATES_STOMATAL_COND_AP','FATES_TLONGTERM','FATES_PRIMARY_AREA_AP','FATES_NPP_LU', +'FATES_L2FR_CLSZPF','FATES_GPP_LU','FATES_C13DISC_SZPF' From b1668f4a3ef89527759368eafd2a05d0133f9da6 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Thu, 30 Jan 2025 23:44:32 -0800 Subject: [PATCH 14/22] remove fates_l2fr_clszpf for fatescoldallvars --- .../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 18b6cc66c8..286c27ea56 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm @@ -57,4 +57,4 @@ hist_fincl1 = 'FATES_TLONGTERM', 'FATES_LAISHA_CLLLPF','FATES_PARPROF_DIR_CLLLPF','FATES_PARPROF_DIF_CLLLPF','FATES_LAISUN_CL','FATES_LAISHA_CL', 'FATES_PARPROF_DIR_CLLL','FATES_PARPROF_DIF_CLLL','FATES_NET_C_UPTAKE_CLLL','FATES_CROWNFRAC_CLLLPF', 'FATES_LBLAYER_COND_AP','FATES_STOMATAL_COND_AP','FATES_TLONGTERM','FATES_PRIMARY_AREA_AP','FATES_NPP_LU', -'FATES_L2FR_CLSZPF','FATES_GPP_LU','FATES_C13DISC_SZPF' +'FATES_GPP_LU','FATES_C13DISC_SZPF' From a346a1874fae8cf988d41fe60ca069cb84a0486e Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Fri, 31 Jan 2025 08:37:50 -0800 Subject: [PATCH 15/22] update fates tag to sci.1.80.11_api.37.0.0 --- .gitmodules | 2 +- src/fates | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 3b7de3fd60..0771c90237 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,7 +28,7 @@ [submodule "fates"] path = src/fates url = https://github.com/NGEET/fates -fxtag = sci.1.80.4_api.37.0.0 +fxtag = sci.1.80.11_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/src/fates b/src/fates index 296e1d6a45..48b3085f65 160000 --- a/src/fates +++ b/src/fates @@ -1 +1 @@ -Subproject commit 296e1d6a45f05a800073d376286d0537d2290e96 +Subproject commit 48b3085f65bd00f7ee1eb2c134a6af188a639dbc From 0ac98fb909abc8d0a248e4e93460149d56195c2b Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Sun, 2 Feb 2025 18:11:11 -0800 Subject: [PATCH 16/22] add fates issue 1324 to the expected failure list --- 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 9735c02f4c..c092243a27 100644 --- a/cime_config/testdefs/ExpectedTestFails.xml +++ b/cime_config/testdefs/ExpectedTestFails.xml @@ -350,6 +350,13 @@ + + + FAIL + fates#1324 + + + From f31299b93b4c059bd2d5e15473076df4322661eb Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Mon, 3 Feb 2025 12:00:01 -0800 Subject: [PATCH 17/22] Revert "add fates issue 1324 to the expected failure list" This reverts commit 0ac98fb909abc8d0a248e4e93460149d56195c2b. --- cime_config/testdefs/ExpectedTestFails.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml index c092243a27..9735c02f4c 100644 --- a/cime_config/testdefs/ExpectedTestFails.xml +++ b/cime_config/testdefs/ExpectedTestFails.xml @@ -350,13 +350,6 @@ - - - FAIL - fates#1324 - - - From 2322c7ba2ece5bf81ffc220aba7c7502417dcc43 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Mon, 3 Feb 2025 12:00:59 -0800 Subject: [PATCH 18/22] remove FATES_C13_DISC_SZPF This is an older, low-priority issue. The fates team decided to remove this to avoid having this as a recurring expected failure. --- .../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 286c27ea56..203aa8f717 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm @@ -57,4 +57,4 @@ hist_fincl1 = 'FATES_TLONGTERM', 'FATES_LAISHA_CLLLPF','FATES_PARPROF_DIR_CLLLPF','FATES_PARPROF_DIF_CLLLPF','FATES_LAISUN_CL','FATES_LAISHA_CL', 'FATES_PARPROF_DIR_CLLL','FATES_PARPROF_DIF_CLLL','FATES_NET_C_UPTAKE_CLLL','FATES_CROWNFRAC_CLLLPF', 'FATES_LBLAYER_COND_AP','FATES_STOMATAL_COND_AP','FATES_TLONGTERM','FATES_PRIMARY_AREA_AP','FATES_NPP_LU', -'FATES_GPP_LU','FATES_C13DISC_SZPF' +'FATES_GPP_LU' From 85fbb83432aa795eacf98c94b4698da2b5377971 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Tue, 4 Feb 2025 10:00:39 -0800 Subject: [PATCH 19/22] update Changelog and Changesum --- doc/ChangeLog | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++ doc/ChangeSum | 1 + 2 files changed, 87 insertions(+) diff --git a/doc/ChangeLog b/doc/ChangeLog index 0dc446448b..4dfec62fd9 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,4 +1,90 @@ =============================================================== +Tag name: ctsm5.3.022 +Originator(s): glemieux (Gregory Lemieux, LBNL, glemieux@lbl.gov) +Date: Tue Feb 4 09:41:49 AM PST 2025 +One-line Summary: Update FATES namelist build to avoid Meier2022 + +Purpose and description of changes +---------------------------------- + +This tag brings in three updates, the primary of which is an update to the namelist +build to avoid running FATES with roughness method Meier2022 in light of recently +discovered incompatibility between FATES and this method. FATES will now used +ZengWang2007 for all run mode. + +The other two updates are fairly minor changes. One is a B4B change to the order in +which the use_fates_luh flag is passed to FATES. The other is an update to history +outputs for the FatesColdAllVars testmod per a recent FATES-side update. + + +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_0 + +[ ] ctsm5_0-nwp + +[ ] clm4_5 + + +Bugs fixed +---------- + + #2932 - 'Meier 2022' z0 parameterization causes errors with FATES + +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 + + regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing): + + derecho ----- OK + izumi ------- + + fates tests: (give name of baseline if different from CTSM tagname, normally fates baselines are fates--) + derecho ----- OK + izumi ------- + +If the tag used for baseline comparisons was NOT the previous tag, note that here: + + fates suite tested against fates-sci.1.80.10_api.37.0.0-ctsm5.3.021 + +Answer changes +-------------- + +Changes answers relative to baseline: Yes, only some FATES tests + + The FATES tag has been updated from sci.1.80.4_api.37.0.0 to sci.1.80.11_api.37.0.0, + which includes a number of bug fixes some of which result in changes to some baselines. + Additional, all tests using Clm60Fates based compsets have DIFFs due to the roughness + method update. + +Other details +------------- +List any git submodules updated (cime, rtm, mosart, cism, fates, etc.): + fates: sci.1.80.4_api.37.0.0 -> sci.1.80.11_api.37.0.0 + +Pull Requests that document the changes (include PR ids): +(https://github.com/ESCOMP/ctsm/pull) + https://github.com/ESCOMP/CTSM/pull/2934 + https://github.com/ESCOMP/CTSM/pull/2936 + https://github.com/ESCOMP/CTSM/pull/2898 + https://github.com/NGEET/FATES/pull/1273 + +=============================================================== +=============================================================== Tag name: ctsm5.3.021 Originator(s): samrabin (Sam Rabin, UCAR/TSS) Date: Wed 29 Jan 2025 04:21:40 PM MST diff --git a/doc/ChangeSum b/doc/ChangeSum index e411947225..2f84a99599 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -1,5 +1,6 @@ Tag Who Date Summary ============================================================================================================================ + ctsm5.3.022 glemieux 02/04/2025 Update FATES namelist build to avoid Meier2022 ctsm5.3.021 samrabin 01/29/2025 Standardize time metadata (release tag for ctsm5.3) ctsm5.3.020 samrabin 01/17/2025 Merge b4b-dev ctsm5.3.019 olyson 01/14/2025 Stop running 0th time step From 57f5518df32d1746ef42e6afc54323e73ae997ac Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Tue, 4 Feb 2025 11:31:29 -0800 Subject: [PATCH 20/22] update fates izumi results for ctsm5.3.022 --- doc/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 4dfec62fd9..4e4285705b 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -55,7 +55,7 @@ Testing summary: fates tests: (give name of baseline if different from CTSM tagname, normally fates baselines are fates--) derecho ----- OK - izumi ------- + izumi ------- OK If the tag used for baseline comparisons was NOT the previous tag, note that here: From eeaeff50e5919aff6c3d25b48c6e65874da23b9c Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Thu, 6 Feb 2025 08:54:31 -0800 Subject: [PATCH 21/22] update izumi aux_clm test results --- doc/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 4e4285705b..e555934f57 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -51,7 +51,7 @@ Testing summary: regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing): derecho ----- OK - izumi ------- + izumi ------- OK fates tests: (give name of baseline if different from CTSM tagname, normally fates baselines are fates--) derecho ----- OK From fa83fb175cb35743a0d827b42811bd6254de8e97 Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Thu, 6 Feb 2025 11:23:25 -0700 Subject: [PATCH 22/22] Update ChangeLog/Sum times. --- doc/ChangeLog | 2 +- doc/ChangeSum | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index e555934f57..a79058bf08 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,7 +1,7 @@ =============================================================== Tag name: ctsm5.3.022 Originator(s): glemieux (Gregory Lemieux, LBNL, glemieux@lbl.gov) -Date: Tue Feb 4 09:41:49 AM PST 2025 +Date: Thu Feb 6 11:22:48 MST 2025 One-line Summary: Update FATES namelist build to avoid Meier2022 Purpose and description of changes diff --git a/doc/ChangeSum b/doc/ChangeSum index 2f84a99599..e4f4a7455f 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -1,6 +1,6 @@ Tag Who Date Summary ============================================================================================================================ - ctsm5.3.022 glemieux 02/04/2025 Update FATES namelist build to avoid Meier2022 + ctsm5.3.022 glemieux 02/06/2025 Update FATES namelist build to avoid Meier2022 ctsm5.3.021 samrabin 01/29/2025 Standardize time metadata (release tag for ctsm5.3) ctsm5.3.020 samrabin 01/17/2025 Merge b4b-dev ctsm5.3.019 olyson 01/14/2025 Stop running 0th time step