From b8a44d4038ff666e73b075f1d82dc6ce52c14de8 Mon Sep 17 00:00:00 2001 From: Gregory Lemieux Date: Fri, 11 Oct 2024 09:30:25 -0700 Subject: [PATCH] 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',