From 7d2259d531e2c089e013b48d29ea0a1f01a3fae8 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Mon, 23 Sep 2024 14:02:13 -0700 Subject: [PATCH 1/5] update fates default parameter file with new ngee-a shrubs --- components/elm/bld/namelist_files/namelist_defaults.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/elm/bld/namelist_files/namelist_defaults.xml b/components/elm/bld/namelist_files/namelist_defaults.xml index beeae7858595..7d2390d267b1 100644 --- a/components/elm/bld/namelist_files/namelist_defaults.xml +++ b/components/elm/bld/namelist_files/namelist_defaults.xml @@ -134,7 +134,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case). -lnd/clm2/paramdata/fates_params_api.36.0.0_12pft_c240517.nc +lnd/clm2/paramdata/fates_params_api.36.1.0_12pft_c240926.nc lnd/clm2/paramdata/CNP_parameters_c131108.nc From f37edf7fdc23b23b01dcf4f73d62f79a44a6d92f Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Mon, 7 Oct 2024 16:31:11 -0700 Subject: [PATCH 2/5] correct default fates parameter for API36.1 --- components/elm/bld/namelist_files/namelist_defaults.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/elm/bld/namelist_files/namelist_defaults.xml b/components/elm/bld/namelist_files/namelist_defaults.xml index 7d2390d267b1..896fe5d73969 100644 --- a/components/elm/bld/namelist_files/namelist_defaults.xml +++ b/components/elm/bld/namelist_files/namelist_defaults.xml @@ -134,7 +134,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case). -lnd/clm2/paramdata/fates_params_api.36.1.0_12pft_c240926.nc +lnd/clm2/paramdata/fates_params_api.36.1.0_14pft_c241003.nc lnd/clm2/paramdata/CNP_parameters_c131108.nc From 39ca74583f72e8fb9286954c10ded5c8ba994fd1 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Mon, 7 Oct 2024 16:36:39 -0700 Subject: [PATCH 3/5] update fates submodule to sci.1.78.3_api.36.1.0 --- components/elm/src/external_models/fates | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/elm/src/external_models/fates b/components/elm/src/external_models/fates index 1982b0032c3c..825579d0b406 160000 --- a/components/elm/src/external_models/fates +++ b/components/elm/src/external_models/fates @@ -1 +1 @@ -Subproject commit 1982b0032c3cab6278892eccb85f643114ffb1af +Subproject commit 825579d0b406fe99344591b5ed8356e5c7aeebec From ed346d4bb74a67593308a85e8a7dd8ab5ffec564 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Mon, 7 Oct 2024 16:39:45 -0700 Subject: [PATCH 4/5] update fates hydro test module to change sapwood allometry mode This update calls the fates parameter modification tooling to set the grass allometry smode to 1, which is the default for all other fates PFTs. This is a temporary workaround for NGEET/fates#1254. --- .../testmods_dirs/elm/fateshydro/shell_commands | 15 +++++++++++++++ .../testmods_dirs/elm/fateshydro/user_nl_elm | 1 + 2 files changed, 16 insertions(+) diff --git a/components/elm/cime_config/testdefs/testmods_dirs/elm/fateshydro/shell_commands b/components/elm/cime_config/testdefs/testmods_dirs/elm/fateshydro/shell_commands index 84648f9222c6..e82b5ce85ff1 100644 --- a/components/elm/cime_config/testdefs/testmods_dirs/elm/fateshydro/shell_commands +++ b/components/elm/cime_config/testdefs/testmods_dirs/elm/fateshydro/shell_commands @@ -1,2 +1,17 @@ #!/bin/bash if [ `./xmlquery --value MACH` == bebop ]; then ./xmlchange --id LND_PIO_TYPENAME --val netcdf; fi +module load e4s +spack env activate gcc +spack load nco + +SRCDIR=`./xmlquery SRCROOT --value` +CASEDIR=`./xmlquery CASEROOT --value` +FATESDIR=$SRCDIR/src/fates +FATESPARAMFILE=$CASEDIR/fates_params_hydrograsstempfix.nc + +ncgen -o $FATESPARAMFILE $FATESDIR/parameter_files/fates_params_default.cdl + +$FATESDIR/tools/modify_fates_paramfile.py --O --fin $FATESPARAMFILE --fout $FATESPARAMFILE --var fates_allom_smode --val 1 --allpfts + +spack unload nco +module unload e4s diff --git a/components/elm/cime_config/testdefs/testmods_dirs/elm/fateshydro/user_nl_elm b/components/elm/cime_config/testdefs/testmods_dirs/elm/fateshydro/user_nl_elm index c74b77d05dc6..ea831e5483b9 100644 --- a/components/elm/cime_config/testdefs/testmods_dirs/elm/fateshydro/user_nl_elm +++ b/components/elm/cime_config/testdefs/testmods_dirs/elm/fateshydro/user_nl_elm @@ -5,6 +5,7 @@ hist_nhtfrq = -24 hist_empty_htapes = .true. use_fates_planthydro = .true. fates_spitfire_mode = 1 +fates_paramfile = '$CASEROOT/fates_params_hydrograsstempfix.nc' hist_fincl1 = 'FATES_ERRH2O_SZPF', 'FATES_TRAN_SZPF', 'FATES_SAPFLOW_SZPF', 'FATES_ITERH1_SZPF','FATES_ABSROOT_H2O_SZPF', 'FATES_TRANSROOT_H2O_SZPF','FATES_STEM_H2O_SZPF','FATES_LEAF_H2O_SZPF', From b8a44d4038ff666e73b075f1d82dc6ce52c14de8 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Fri, 11 Oct 2024 09:30:25 -0700 Subject: [PATCH 5/5] Revert "update fates hydro test module to change sapwood allometry mode" This reverts commit ed346d4bb74a67593308a85e8a7dd8ab5ffec564. --- .../testmods_dirs/elm/fateshydro/shell_commands | 15 --------------- .../testmods_dirs/elm/fateshydro/user_nl_elm | 1 - 2 files changed, 16 deletions(-) diff --git a/components/elm/cime_config/testdefs/testmods_dirs/elm/fateshydro/shell_commands b/components/elm/cime_config/testdefs/testmods_dirs/elm/fateshydro/shell_commands index e82b5ce85ff1..84648f9222c6 100644 --- a/components/elm/cime_config/testdefs/testmods_dirs/elm/fateshydro/shell_commands +++ b/components/elm/cime_config/testdefs/testmods_dirs/elm/fateshydro/shell_commands @@ -1,17 +1,2 @@ #!/bin/bash if [ `./xmlquery --value MACH` == bebop ]; then ./xmlchange --id LND_PIO_TYPENAME --val netcdf; fi -module load e4s -spack env activate gcc -spack load nco - -SRCDIR=`./xmlquery SRCROOT --value` -CASEDIR=`./xmlquery CASEROOT --value` -FATESDIR=$SRCDIR/src/fates -FATESPARAMFILE=$CASEDIR/fates_params_hydrograsstempfix.nc - -ncgen -o $FATESPARAMFILE $FATESDIR/parameter_files/fates_params_default.cdl - -$FATESDIR/tools/modify_fates_paramfile.py --O --fin $FATESPARAMFILE --fout $FATESPARAMFILE --var fates_allom_smode --val 1 --allpfts - -spack unload nco -module unload e4s diff --git a/components/elm/cime_config/testdefs/testmods_dirs/elm/fateshydro/user_nl_elm b/components/elm/cime_config/testdefs/testmods_dirs/elm/fateshydro/user_nl_elm index ea831e5483b9..c74b77d05dc6 100644 --- a/components/elm/cime_config/testdefs/testmods_dirs/elm/fateshydro/user_nl_elm +++ b/components/elm/cime_config/testdefs/testmods_dirs/elm/fateshydro/user_nl_elm @@ -5,7 +5,6 @@ hist_nhtfrq = -24 hist_empty_htapes = .true. use_fates_planthydro = .true. fates_spitfire_mode = 1 -fates_paramfile = '$CASEROOT/fates_params_hydrograsstempfix.nc' hist_fincl1 = 'FATES_ERRH2O_SZPF', 'FATES_TRAN_SZPF', 'FATES_SAPFLOW_SZPF', 'FATES_ITERH1_SZPF','FATES_ABSROOT_H2O_SZPF', 'FATES_TRANSROOT_H2O_SZPF','FATES_STEM_H2O_SZPF','FATES_LEAF_H2O_SZPF',