From 4b18e79ae14e8c56c51b718aad722ce679b37972 Mon Sep 17 00:00:00 2001 From: Samuel Levis Date: Tue, 25 Jun 2024 17:29:56 -0600 Subject: [PATCH] Replace clm45_monthly_matrixcn_soilCN30 testmod and test with clm60 --- .../clm/clm45_monthly_matrixcn_soilCN30/user_nl_clm | 2 -- .../include_user_mods | 0 .../clm/clm60_monthly_matrixcn_soilCN30/user_nl_clm | 4 ++++ 3 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 cime_config/testdefs/testmods_dirs/clm/clm45_monthly_matrixcn_soilCN30/user_nl_clm rename cime_config/testdefs/testmods_dirs/clm/{clm45_monthly_matrixcn_soilCN30 => clm60_monthly_matrixcn_soilCN30}/include_user_mods (100%) create mode 100644 cime_config/testdefs/testmods_dirs/clm/clm60_monthly_matrixcn_soilCN30/user_nl_clm diff --git a/cime_config/testdefs/testmods_dirs/clm/clm45_monthly_matrixcn_soilCN30/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/clm45_monthly_matrixcn_soilCN30/user_nl_clm deleted file mode 100644 index c7436f5acb..0000000000 --- a/cime_config/testdefs/testmods_dirs/clm/clm45_monthly_matrixcn_soilCN30/user_nl_clm +++ /dev/null @@ -1,2 +0,0 @@ - use_soil_matrixcn = .true. - paramfile = '$DIN_LOC_ROOT/lnd/clm2/paramdata/clm45_params.soilCN30.c220321.nc' diff --git a/cime_config/testdefs/testmods_dirs/clm/clm45_monthly_matrixcn_soilCN30/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/clm60_monthly_matrixcn_soilCN30/include_user_mods similarity index 100% rename from cime_config/testdefs/testmods_dirs/clm/clm45_monthly_matrixcn_soilCN30/include_user_mods rename to cime_config/testdefs/testmods_dirs/clm/clm60_monthly_matrixcn_soilCN30/include_user_mods diff --git a/cime_config/testdefs/testmods_dirs/clm/clm60_monthly_matrixcn_soilCN30/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/clm60_monthly_matrixcn_soilCN30/user_nl_clm new file mode 100644 index 0000000000..d22154bef6 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/clm60_monthly_matrixcn_soilCN30/user_nl_clm @@ -0,0 +1,4 @@ +use_soil_matrixcn = .true. +paramfile = '/glade/u/home/slevis/paramfiles/ctsm60_params_cn30.c240625.nc' +! If we keep this paramfile, it should move to the repository +! paramfile = '$DIN_LOC_ROOT/lnd/clm2/paramdata/ctsm60_params_cn30.c240625.nc'