From 989c87f6bdef2f4fa2b95df6f0c84a6ef649ccf3 Mon Sep 17 00:00:00 2001 From: Teagan King Date: Tue, 21 Feb 2023 14:59:56 -0700 Subject: [PATCH 01/39] include PRISM precipitation data stream --- cime_config/config_component.xml | 7 +++++++ .../NEON/defaults/user_nl_datm_streams | 20 +++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml index 555a0ce9b5..b5741e5b40 100644 --- a/cime_config/config_component.xml +++ b/cime_config/config_component.xml @@ -295,6 +295,13 @@ ABBY,BLAN,CPER,DEJU,GRSM,HEAL,KONA,LENO,NIWO,ONAQ,PUUM,SERC,SRER,TALL,TREE,WOOD, BARR,BONA,DCFS,DELA,GUAN,JERC,KONZ,MLBS,NOGP,ORNL,RMNP,SJER,STEI,TEAK,UKFS,WREF, BART,CLBJ,DSNY,HARV,JORN,LAJA,MOAB,OAES,OSBS,SCBI,SOAP,STER,TOOL,UNDE,YELL, + ABBY.PRECIP,BLAN.PRECIP,CPER.PRECIP,DEJU.PRECIP,GRSM.PRECIP,HEAL.PRECIP,KONA.PRECIP, + LENO.PRECIP,NIWO.PRECIP,ONAQ.PRECIP,PUUM.PRECIP,SERC.PRECIP,SRER.PRECIP,TALL.PRECIP, + TREE.PRECIP,WOOD.PRECIP,BARR.PRECIP,BONA.PRECIP,DCFS.PRECIP,DELA.PRECIP,GUAN.PRECIP, + JERC.PRECIP,KONZ.PRECIP,MLBS.PRECIP,NOGP.PRECIP,ORNL.PRECIP,RMNP.PRECIP,SJER.PRECIP, + STEI.PRECIP,TEAK.PRECIP,UKFS.PRECIP,WREF.PRECIP,BART.PRECIP,CLBJ.PRECIP,DSNY.PRECIP, + HARV.PRECIP,JORN.PRECIP,LAJA.PRECIP,MOAB.PRECIP,OAES.PRECIP,OSBS.PRECIP,SCBI.PRECIP, + SOAP.PRECIP,STER.PRECIP,TOOL.PRECIP,UNDE.PRECIP,YELL.PRECIP, run_component_ctsm diff --git a/cime_config/usermods_dirs/NEON/defaults/user_nl_datm_streams b/cime_config/usermods_dirs/NEON/defaults/user_nl_datm_streams index 36f1e72b3a..636ceb2ad8 100644 --- a/cime_config/usermods_dirs/NEON/defaults/user_nl_datm_streams +++ b/cime_config/usermods_dirs/NEON/defaults/user_nl_datm_streams @@ -37,3 +37,23 @@ preso3.SSP3-7.0:year_first=2018 preso3.SSP3-7.0:year_last=2022 preso3.SSP3-7.0:year_align=2018 preso3.SSP3-7.0:dtlimit=30 + +NEON.${NEONSITE}:datavars = \ + FSDS Faxa_swdn, \ + ZBOT Sa_z, \ + TBOT Sa_tbot, \ + WIND Sa_wind, \ + RH Sa_rh, \ + PSRF Sa_pbot, \ + FLDS Faxa_lwdn + +NEON.${NEONSITE}.PRECIP:datavars = \ + PRECIP Faxa_precn + +NEON.${NEONSITE}.PRECIP:datafiles = \ + /glade/u/home/tking/neon/prism_${NEONSITE}_2018.nc, \ + /glade/u/home/tking/neon/prism_${NEONSITE}_2019.nc, \ + /glade/u/home/tking/neon/prism_${NEONSITE}_2020.nc, \ + /glade/u/home/tking/neon/prism_${NEONSITE}_2021.nc, \ + /glade/u/home/tking/neon/prism_${NEONSITE}_2022.nc + From 22862978cbb8b269b4af80c27a13f59f2deab52a Mon Sep 17 00:00:00 2001 From: Teagan King Date: Tue, 21 Feb 2023 16:46:51 -0700 Subject: [PATCH 02/39] remove unnecessary shell commands for gap filling --- cime_config/usermods_dirs/NEON/NIWO/shell_commands | 1 - 1 file changed, 1 deletion(-) diff --git a/cime_config/usermods_dirs/NEON/NIWO/shell_commands b/cime_config/usermods_dirs/NEON/NIWO/shell_commands index a3e73ca343..65926f2188 100644 --- a/cime_config/usermods_dirs/NEON/NIWO/shell_commands +++ b/cime_config/usermods_dirs/NEON/NIWO/shell_commands @@ -1,4 +1,3 @@ ./xmlchange NEONSITE=NIWO ./xmlchange PTS_LON=254.41676 ./xmlchange PTS_LAT=40.05236 -./xmlchange DATM_YR_END=2018 From 397eb22678be387eceeed696cd34ea8feca1d21c Mon Sep 17 00:00:00 2001 From: Teagan King Date: Tue, 7 Mar 2023 10:07:28 -0700 Subject: [PATCH 03/39] changed name of PRISM PRECIP stream --- cime_config/config_component.xml | 17 ++++++++++------- .../NEON/defaults/user_nl_datm_streams | 4 ++-- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml index b5741e5b40..243c866bbd 100644 --- a/cime_config/config_component.xml +++ b/cime_config/config_component.xml @@ -295,13 +295,16 @@ ABBY,BLAN,CPER,DEJU,GRSM,HEAL,KONA,LENO,NIWO,ONAQ,PUUM,SERC,SRER,TALL,TREE,WOOD, BARR,BONA,DCFS,DELA,GUAN,JERC,KONZ,MLBS,NOGP,ORNL,RMNP,SJER,STEI,TEAK,UKFS,WREF, BART,CLBJ,DSNY,HARV,JORN,LAJA,MOAB,OAES,OSBS,SCBI,SOAP,STER,TOOL,UNDE,YELL, - ABBY.PRECIP,BLAN.PRECIP,CPER.PRECIP,DEJU.PRECIP,GRSM.PRECIP,HEAL.PRECIP,KONA.PRECIP, - LENO.PRECIP,NIWO.PRECIP,ONAQ.PRECIP,PUUM.PRECIP,SERC.PRECIP,SRER.PRECIP,TALL.PRECIP, - TREE.PRECIP,WOOD.PRECIP,BARR.PRECIP,BONA.PRECIP,DCFS.PRECIP,DELA.PRECIP,GUAN.PRECIP, - JERC.PRECIP,KONZ.PRECIP,MLBS.PRECIP,NOGP.PRECIP,ORNL.PRECIP,RMNP.PRECIP,SJER.PRECIP, - STEI.PRECIP,TEAK.PRECIP,UKFS.PRECIP,WREF.PRECIP,BART.PRECIP,CLBJ.PRECIP,DSNY.PRECIP, - HARV.PRECIP,JORN.PRECIP,LAJA.PRECIP,MOAB.PRECIP,OAES.PRECIP,OSBS.PRECIP,SCBI.PRECIP, - SOAP.PRECIP,STER.PRECIP,TOOL.PRECIP,UNDE.PRECIP,YELL.PRECIP, + PRISM_PRECIP.ABBY,PRISM_PRECIP.BLAN,PRISM_PRECIP.CPER,PRISM_PRECIP.DEJU,PRISM_PRECIP.GRSM, + PRISM_PRECIP.HEAL,PRISM_PRECIP.KONA,PRISM_PRECIP.LENO,PRISM_PRECIP.NIWO,PRISM_PRECIP.ONAQ, + PRISM_PRECIP.PUUM,PRISM_PRECIP.SERC,PRISM_PRECIP.SRER,PRISM_PRECIP.TALL,PRISM_PRECIP.TREE, + PRISM_PRECIP.WOOD,PRISM_PRECIP.BARR,PRISM_PRECIP.BONA,PRISM_PRECIP.DCFS,PRISM_PRECIP.DELA, + PRISM_PRECIP.GUAN,PRISM_PRECIP.JERC,PRISM_PRECIP.KONZ,PRISM_PRECIP.MLBS,PRISM_PRECIP.NOGP, + PRISM_PRECIP.ORNL,PRISM_PRECIP.RMNP,PRISM_PRECIP.SJER,PRISM_PRECIP.STEI,PRISM_PRECIP.TEAK, + PRISM_PRECIP.UKFS,PRISM_PRECIP.WREF,PRISM_PRECIP.BART,PRISM_PRECIP.CLBJ,PRISM_PRECIP.DSNY, + PRISM_PRECIP.HARV,PRISM_PRECIP.JORN,PRISM_PRECIP.LAJA,PRISM_PRECIP.MOAB,PRISM_PRECIP.OAES, + PRISM_PRECIP.OSBS,PRISM_PRECIP.SCBI,PRISM_PRECIP.SOAP,PRISM_PRECIP.STER,PRISM_PRECIP.TOOL, + PRISM_PRECIP.UNDE,PRISM_PRECIP.YELL, run_component_ctsm diff --git a/cime_config/usermods_dirs/NEON/defaults/user_nl_datm_streams b/cime_config/usermods_dirs/NEON/defaults/user_nl_datm_streams index 636ceb2ad8..78fff234d6 100644 --- a/cime_config/usermods_dirs/NEON/defaults/user_nl_datm_streams +++ b/cime_config/usermods_dirs/NEON/defaults/user_nl_datm_streams @@ -47,10 +47,10 @@ NEON.${NEONSITE}:datavars = \ PSRF Sa_pbot, \ FLDS Faxa_lwdn -NEON.${NEONSITE}.PRECIP:datavars = \ +NEON.PRISM_PRECIP.${NEONSITE}:datavars = \ PRECIP Faxa_precn -NEON.${NEONSITE}.PRECIP:datafiles = \ +NEON.PRISM_PRECIP${NEONSITE}:datafiles = \ /glade/u/home/tking/neon/prism_${NEONSITE}_2018.nc, \ /glade/u/home/tking/neon/prism_${NEONSITE}_2019.nc, \ /glade/u/home/tking/neon/prism_${NEONSITE}_2020.nc, \ From fc3d4930ad97c1c7804052b537f30bb93f34341d Mon Sep 17 00:00:00 2001 From: Teagan King Date: Tue, 14 Mar 2023 13:32:18 -0600 Subject: [PATCH 04/39] bug fix to get PRISM datm stream working --- cime_config/usermods_dirs/NEON/defaults/user_nl_datm_streams | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/usermods_dirs/NEON/defaults/user_nl_datm_streams b/cime_config/usermods_dirs/NEON/defaults/user_nl_datm_streams index 78fff234d6..16b7c739a7 100644 --- a/cime_config/usermods_dirs/NEON/defaults/user_nl_datm_streams +++ b/cime_config/usermods_dirs/NEON/defaults/user_nl_datm_streams @@ -50,7 +50,7 @@ NEON.${NEONSITE}:datavars = \ NEON.PRISM_PRECIP.${NEONSITE}:datavars = \ PRECIP Faxa_precn -NEON.PRISM_PRECIP${NEONSITE}:datafiles = \ +NEON.PRISM_PRECIP.${NEONSITE}:datafiles = \ /glade/u/home/tking/neon/prism_${NEONSITE}_2018.nc, \ /glade/u/home/tking/neon/prism_${NEONSITE}_2019.nc, \ /glade/u/home/tking/neon/prism_${NEONSITE}_2020.nc, \ From f9e2a3bda960ede1b95e081063f6af5b66044c56 Mon Sep 17 00:00:00 2001 From: Teagan King Date: Wed, 22 Mar 2023 12:19:24 -0600 Subject: [PATCH 05/39] temporary updates for nl and stream changes --- cime_config/config_component.xml | 4 +++- cime_config/usermods_dirs/NEON/FATES/defaults/shell_commands | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml index 243c866bbd..82c2d545b3 100644 --- a/cime_config/config_component.xml +++ b/cime_config/config_component.xml @@ -244,7 +244,9 @@ Dataset name for user-created datasets. This is used as the argument in Buildconf/clm.buildnml to build-namelist -clm_usr_name. An example of such a dataset would be 1x1pt_boulderCO_c090722. The default value is UNSET. - This is an advanced flag and should only be used by expert users. + This is an advanced flag and should only be used by expert users. For NEON + cases, this can be set to either NEON or NEON.PRISM, the latter of which would + PRISM precipitation instead of the default NEON precipitation. diff --git a/cime_config/usermods_dirs/NEON/FATES/defaults/shell_commands b/cime_config/usermods_dirs/NEON/FATES/defaults/shell_commands index 7095e1def7..084e0027ba 100644 --- a/cime_config/usermods_dirs/NEON/FATES/defaults/shell_commands +++ b/cime_config/usermods_dirs/NEON/FATES/defaults/shell_commands @@ -1,5 +1,6 @@ #!/bin/bash -./xmlchange CLM_USRDAT_NAME=NEON +./xmlchange CLM_USRDAT_NAME=NEON.PRISM +# we should also ensure that this can be set to NEON.PRISM ./xmlchange CCSM_CO2_PPMV=408.83 # Set data forcing data to future scenario so will have data from 2018 to present-day ./xmlchange DATM_PRESAERO=SSP3-7.0 From c0574b4451d195119b83a6e5344c78a9b3e41d60 Mon Sep 17 00:00:00 2001 From: Teagan King Date: Wed, 22 Mar 2023 12:29:20 -0600 Subject: [PATCH 06/39] temporary updates for nl and stream changes --- cime_config/usermods_dirs/NEON/FATES/defaults/shell_commands | 2 +- cime_config/usermods_dirs/NEON/defaults/shell_commands | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cime_config/usermods_dirs/NEON/FATES/defaults/shell_commands b/cime_config/usermods_dirs/NEON/FATES/defaults/shell_commands index 084e0027ba..aacfad8e15 100644 --- a/cime_config/usermods_dirs/NEON/FATES/defaults/shell_commands +++ b/cime_config/usermods_dirs/NEON/FATES/defaults/shell_commands @@ -1,5 +1,5 @@ #!/bin/bash -./xmlchange CLM_USRDAT_NAME=NEON.PRISM +./xmlchange CLM_USRDAT_NAME=NEON # we should also ensure that this can be set to NEON.PRISM ./xmlchange CCSM_CO2_PPMV=408.83 # Set data forcing data to future scenario so will have data from 2018 to present-day diff --git a/cime_config/usermods_dirs/NEON/defaults/shell_commands b/cime_config/usermods_dirs/NEON/defaults/shell_commands index 7095e1def7..0cbba60f84 100644 --- a/cime_config/usermods_dirs/NEON/defaults/shell_commands +++ b/cime_config/usermods_dirs/NEON/defaults/shell_commands @@ -1,5 +1,6 @@ #!/bin/bash ./xmlchange CLM_USRDAT_NAME=NEON +# This is where we want to implement NEON.PRISM; in the current state, doing so causes SVN failures ./xmlchange CCSM_CO2_PPMV=408.83 # Set data forcing data to future scenario so will have data from 2018 to present-day ./xmlchange DATM_PRESAERO=SSP3-7.0 From d94f5d09a9b505e844920b2d4dff18d291af7c26 Mon Sep 17 00:00:00 2001 From: Teagan King Date: Wed, 29 Mar 2023 15:11:07 -0600 Subject: [PATCH 07/39] include third datm stream for NEON --- cime_config/config_component.xml | 10 ++++++++++ cime_config/usermods_dirs/NEON/NIWO/shell_commands | 2 ++ cime_config/usermods_dirs/NEON/defaults/shell_commands | 2 +- .../usermods_dirs/NEON/defaults/user_nl_datm_streams | 10 ---------- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml index 82c2d545b3..7e11047b6b 100644 --- a/cime_config/config_component.xml +++ b/cime_config/config_component.xml @@ -297,6 +297,16 @@ ABBY,BLAN,CPER,DEJU,GRSM,HEAL,KONA,LENO,NIWO,ONAQ,PUUM,SERC,SRER,TALL,TREE,WOOD, BARR,BONA,DCFS,DELA,GUAN,JERC,KONZ,MLBS,NOGP,ORNL,RMNP,SJER,STEI,TEAK,UKFS,WREF, BART,CLBJ,DSNY,HARV,JORN,LAJA,MOAB,OAES,OSBS,SCBI,SOAP,STER,TOOL,UNDE,YELL, + NEON_PRECIP.ABBY,NEON_PRECIP.BLAN,NEON_PRECIP.CPER,NEON_PRECIP.DEJU,NEON_PRECIP.GRSM, + NEON_PRECIP.HEAL,NEON_PRECIP.KONA,NEON_PRECIP.LENO,NEON_PRECIP.NIWO,NEON_PRECIP.ONAQ, + NEON_PRECIP.PUUM,NEON_PRECIP.SERC,NEON_PRECIP.SRER,NEON_PRECIP.TALL,NEON_PRECIP.TREE, + NEON_PRECIP.WOOD,NEON_PRECIP.BARR,NEON_PRECIP.BONA,NEON_PRECIP.DCFS,NEON_PRECIP.DELA, + NEON_PRECIP.GUAN,NEON_PRECIP.JERC,NEON_PRECIP.KONZ,NEON_PRECIP.MLBS,NEON_PRECIP.NOGP, + NEON_PRECIP.ORNL,NEON_PRECIP.RMNP,NEON_PRECIP.SJER,NEON_PRECIP.STEI,NEON_PRECIP.TEAK, + NEON_PRECIP.UKFS,NEON_PRECIP.WREF,NEON_PRECIP.BART,NEON_PRECIP.CLBJ,NEON_PRECIP.DSNY, + NEON_PRECIP.HARV,NEON_PRECIP.JORN,NEON_PRECIP.LAJA,NEON_PRECIP.MOAB,NEON_PRECIP.OAES, + NEON_PRECIP.OSBS,NEON_PRECIP.SCBI,NEON_PRECIP.SOAP,NEON_PRECIP.STER,NEON_PRECIP.TOOL, + NEON_PRECIP.UNDE,NEON_PRECIP.YELL, PRISM_PRECIP.ABBY,PRISM_PRECIP.BLAN,PRISM_PRECIP.CPER,PRISM_PRECIP.DEJU,PRISM_PRECIP.GRSM, PRISM_PRECIP.HEAL,PRISM_PRECIP.KONA,PRISM_PRECIP.LENO,PRISM_PRECIP.NIWO,PRISM_PRECIP.ONAQ, PRISM_PRECIP.PUUM,PRISM_PRECIP.SERC,PRISM_PRECIP.SRER,PRISM_PRECIP.TALL,PRISM_PRECIP.TREE, diff --git a/cime_config/usermods_dirs/NEON/NIWO/shell_commands b/cime_config/usermods_dirs/NEON/NIWO/shell_commands index 65926f2188..746a47d8c0 100644 --- a/cime_config/usermods_dirs/NEON/NIWO/shell_commands +++ b/cime_config/usermods_dirs/NEON/NIWO/shell_commands @@ -1,3 +1,5 @@ ./xmlchange NEONSITE=NIWO ./xmlchange PTS_LON=254.41676 ./xmlchange PTS_LAT=40.05236 +./xmlchange DATM_YR_END=2018 +# remove DATM_YR_END xml change when running with PRISM precipitation diff --git a/cime_config/usermods_dirs/NEON/defaults/shell_commands b/cime_config/usermods_dirs/NEON/defaults/shell_commands index 0cbba60f84..ad23164b73 100644 --- a/cime_config/usermods_dirs/NEON/defaults/shell_commands +++ b/cime_config/usermods_dirs/NEON/defaults/shell_commands @@ -1,6 +1,6 @@ #!/bin/bash ./xmlchange CLM_USRDAT_NAME=NEON -# This is where we want to implement NEON.PRISM; in the current state, doing so causes SVN failures +# This can be set to either NEON or NEON.PRISM ./xmlchange CCSM_CO2_PPMV=408.83 # Set data forcing data to future scenario so will have data from 2018 to present-day ./xmlchange DATM_PRESAERO=SSP3-7.0 diff --git a/cime_config/usermods_dirs/NEON/defaults/user_nl_datm_streams b/cime_config/usermods_dirs/NEON/defaults/user_nl_datm_streams index 16b7c739a7..53c4e4e4a7 100644 --- a/cime_config/usermods_dirs/NEON/defaults/user_nl_datm_streams +++ b/cime_config/usermods_dirs/NEON/defaults/user_nl_datm_streams @@ -47,13 +47,3 @@ NEON.${NEONSITE}:datavars = \ PSRF Sa_pbot, \ FLDS Faxa_lwdn -NEON.PRISM_PRECIP.${NEONSITE}:datavars = \ - PRECIP Faxa_precn - -NEON.PRISM_PRECIP.${NEONSITE}:datafiles = \ - /glade/u/home/tking/neon/prism_${NEONSITE}_2018.nc, \ - /glade/u/home/tking/neon/prism_${NEONSITE}_2019.nc, \ - /glade/u/home/tking/neon/prism_${NEONSITE}_2020.nc, \ - /glade/u/home/tking/neon/prism_${NEONSITE}_2021.nc, \ - /glade/u/home/tking/neon/prism_${NEONSITE}_2022.nc - From e09b21c9e6a596567ac8a20b693df681943d0ab0 Mon Sep 17 00:00:00 2001 From: Teagan King Date: Fri, 31 Mar 2023 12:26:49 -0600 Subject: [PATCH 08/39] implement shell command switch for datm_yr_* --- cime_config/usermods_dirs/NEON/MLBS/shell_commands | 4 +++- cime_config/usermods_dirs/NEON/MOAB/shell_commands | 4 +++- cime_config/usermods_dirs/NEON/NIWO/shell_commands | 4 +++- cime_config/usermods_dirs/NEON/ONAQ/shell_commands | 4 +++- cime_config/usermods_dirs/NEON/SJER/shell_commands | 5 ++++- cime_config/usermods_dirs/NEON/TEAK/shell_commands | 5 ++++- cime_config/usermods_dirs/NEON/WREF/shell_commands | 5 ++++- cime_config/usermods_dirs/NEON/YELL/shell_commands | 5 ++++- 8 files changed, 28 insertions(+), 8 deletions(-) diff --git a/cime_config/usermods_dirs/NEON/MLBS/shell_commands b/cime_config/usermods_dirs/NEON/MLBS/shell_commands index d5de0f64eb..3070c7d594 100644 --- a/cime_config/usermods_dirs/NEON/MLBS/shell_commands +++ b/cime_config/usermods_dirs/NEON/MLBS/shell_commands @@ -2,7 +2,9 @@ ./xmlchange NEONSITE=MLBS ./xmlchange PTS_LON=279.47575 ./xmlchange PTS_LAT=37.37783 -./xmlchange DATM_YR_END=2019 +if [[$CLM_USRDAT_NAME = 'NEON']]; then + ./xmlchange DATM_YR_END=2019 +fi # Different default number of months to run for transient case if [[ $compset =~ ^HIST ]]; then ./xmlchange DATM_YR_END=2020 diff --git a/cime_config/usermods_dirs/NEON/MOAB/shell_commands b/cime_config/usermods_dirs/NEON/MOAB/shell_commands index 96d0bcbe68..c6e483d0a9 100644 --- a/cime_config/usermods_dirs/NEON/MOAB/shell_commands +++ b/cime_config/usermods_dirs/NEON/MOAB/shell_commands @@ -2,7 +2,9 @@ ./xmlchange NEONSITE=MOAB ./xmlchange PTS_LON=250.61118 ./xmlchange PTS_LAT=38.25136 -./xmlchange DATM_YR_END=2020 +if [[$CLM_USRDAT_NAME = 'NEON']]; then + ./xmlchange DATM_YR_END=2020 +fi # Different default number of months to run for transient case if [[ $compset =~ ^HIST ]]; then ./xmlchange DATM_YR_END=2021 diff --git a/cime_config/usermods_dirs/NEON/NIWO/shell_commands b/cime_config/usermods_dirs/NEON/NIWO/shell_commands index 746a47d8c0..3f40b8b514 100644 --- a/cime_config/usermods_dirs/NEON/NIWO/shell_commands +++ b/cime_config/usermods_dirs/NEON/NIWO/shell_commands @@ -1,5 +1,7 @@ ./xmlchange NEONSITE=NIWO ./xmlchange PTS_LON=254.41676 ./xmlchange PTS_LAT=40.05236 -./xmlchange DATM_YR_END=2018 +if [[$CLM_USRDAT_NAME = 'NEON']]; then + ./xmlchange DATM_YR_END=2018 +fi # remove DATM_YR_END xml change when running with PRISM precipitation diff --git a/cime_config/usermods_dirs/NEON/ONAQ/shell_commands b/cime_config/usermods_dirs/NEON/ONAQ/shell_commands index 511813398b..9b54cfb0a9 100644 --- a/cime_config/usermods_dirs/NEON/ONAQ/shell_commands +++ b/cime_config/usermods_dirs/NEON/ONAQ/shell_commands @@ -2,7 +2,9 @@ ./xmlchange NEONSITE=ONAQ ./xmlchange PTS_LON=247.54755 ./xmlchange PTS_LAT=40.17760 -./xmlchange DATM_YR_END=2019 +if [[$CLM_USRDAT_NAME = 'NEON']]; then + ./xmlchange DATM_YR_END=2019 +fi # Different default number of months to run for transient case if [[ $compset =~ ^HIST ]]; then ./xmlchange DATM_YR_END=2020 diff --git a/cime_config/usermods_dirs/NEON/SJER/shell_commands b/cime_config/usermods_dirs/NEON/SJER/shell_commands index 6e05d23792..e521af98a8 100644 --- a/cime_config/usermods_dirs/NEON/SJER/shell_commands +++ b/cime_config/usermods_dirs/NEON/SJER/shell_commands @@ -2,7 +2,10 @@ ./xmlchange NEONSITE=SJER ./xmlchange PTS_LON=240.267 ./xmlchange PTS_LAT=37.107117 -./xmlchange DATM_YR_ALIGN=2019,DATM_YR_START=2019 +./xmlchange DATM_YR_ALIGN=2019 +if [[$CLM_USRDAT_NAME = 'NEON']]; then + ./xmlchange DATM_YR_START=2019 +fi # Different default start date and number of months to run for transient case if [[ $compset =~ ^HIST ]]; then ./xmlchange RUN_STARTDATE=2019-01-01 diff --git a/cime_config/usermods_dirs/NEON/TEAK/shell_commands b/cime_config/usermods_dirs/NEON/TEAK/shell_commands index 9058eda022..c0930905a0 100644 --- a/cime_config/usermods_dirs/NEON/TEAK/shell_commands +++ b/cime_config/usermods_dirs/NEON/TEAK/shell_commands @@ -2,7 +2,10 @@ ./xmlchange NEONSITE=TEAK ./xmlchange PTS_LON=240.99424199999999 ./xmlchange PTS_LAT=37.006472 -./xmlchange DATM_YR_ALIGN=2019,DATM_YR_START=2019 +./xmlchange DATM_YR_ALIGN=2019 +if [[$CLM_USRDAT_NAME = 'NEON']]; then + ./xmlchange DATM_YR_START=2019 +fi # Different default start date and number of months to run for transient case if [[ $compset =~ ^HIST ]]; then ./xmlchange RUN_STARTDATE=2019-01-01 diff --git a/cime_config/usermods_dirs/NEON/WREF/shell_commands b/cime_config/usermods_dirs/NEON/WREF/shell_commands index 807055ae6e..e6fc742fe3 100644 --- a/cime_config/usermods_dirs/NEON/WREF/shell_commands +++ b/cime_config/usermods_dirs/NEON/WREF/shell_commands @@ -2,7 +2,10 @@ ./xmlchange NEONSITE=WREF ./xmlchange PTS_LON=238.04162 ./xmlchange PTS_LAT=45.81637 -./xmlchange DATM_YR_ALIGN=2019,DATM_YR_START=2019 +./xmlchange DATM_YR_ALIGN=2019 +if [[$CLM_USRDAT_NAME = 'NEON']]; then + ./xmlchange DATM_YR_START=2019 +fi # Different default start date and number of months to run for transient case if [[ $compset =~ ^HIST ]]; then ./xmlchange RUN_STARTDATE=2019-01-01 diff --git a/cime_config/usermods_dirs/NEON/YELL/shell_commands b/cime_config/usermods_dirs/NEON/YELL/shell_commands index 800d7d01ad..d313af5dba 100644 --- a/cime_config/usermods_dirs/NEON/YELL/shell_commands +++ b/cime_config/usermods_dirs/NEON/YELL/shell_commands @@ -2,7 +2,10 @@ ./xmlchange NEONSITE=YELL ./xmlchange PTS_LON=249.45803999999998 ./xmlchange PTS_LAT=44.95597 -./xmlchange DATM_YR_ALIGN=2019,DATM_YR_START=2019 +./xmlchange DATM_YR_ALIGN=2019 +if [[$CLM_USRDAT_NAME = 'NEON']]; then + ./xmlchange DATM_YR_START=2019 +fi # Different default start date and number of months to run for transient case if [[ $compset =~ ^HIST ]]; then ./xmlchange RUN_STARTDATE=2019-01-01 From f11fe378abce6e68886994005967ea6cffa16914 Mon Sep 17 00:00:00 2001 From: Teagan King Date: Fri, 31 Mar 2023 13:56:32 -0600 Subject: [PATCH 09/39] update shell command if nesting and non CONUS sites --- cime_config/config_component.xml | 20 +++++++++---------- .../usermods_dirs/NEON/MLBS/shell_commands | 2 +- .../usermods_dirs/NEON/MOAB/shell_commands | 13 ++++++------ .../usermods_dirs/NEON/NIWO/shell_commands | 1 - .../usermods_dirs/NEON/ONAQ/shell_commands | 13 ++++++------ .../usermods_dirs/NEON/SJER/shell_commands | 13 ++++++------ .../usermods_dirs/NEON/TEAK/shell_commands | 13 ++++++------ .../usermods_dirs/NEON/WREF/shell_commands | 13 ++++++------ .../usermods_dirs/NEON/YELL/shell_commands | 13 ++++++------ 9 files changed, 53 insertions(+), 48 deletions(-) diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml index 7e11047b6b..786ce7cf42 100644 --- a/cime_config/config_component.xml +++ b/cime_config/config_component.xml @@ -307,16 +307,16 @@ NEON_PRECIP.HARV,NEON_PRECIP.JORN,NEON_PRECIP.LAJA,NEON_PRECIP.MOAB,NEON_PRECIP.OAES, NEON_PRECIP.OSBS,NEON_PRECIP.SCBI,NEON_PRECIP.SOAP,NEON_PRECIP.STER,NEON_PRECIP.TOOL, NEON_PRECIP.UNDE,NEON_PRECIP.YELL, - PRISM_PRECIP.ABBY,PRISM_PRECIP.BLAN,PRISM_PRECIP.CPER,PRISM_PRECIP.DEJU,PRISM_PRECIP.GRSM, - PRISM_PRECIP.HEAL,PRISM_PRECIP.KONA,PRISM_PRECIP.LENO,PRISM_PRECIP.NIWO,PRISM_PRECIP.ONAQ, - PRISM_PRECIP.PUUM,PRISM_PRECIP.SERC,PRISM_PRECIP.SRER,PRISM_PRECIP.TALL,PRISM_PRECIP.TREE, - PRISM_PRECIP.WOOD,PRISM_PRECIP.BARR,PRISM_PRECIP.BONA,PRISM_PRECIP.DCFS,PRISM_PRECIP.DELA, - PRISM_PRECIP.GUAN,PRISM_PRECIP.JERC,PRISM_PRECIP.KONZ,PRISM_PRECIP.MLBS,PRISM_PRECIP.NOGP, - PRISM_PRECIP.ORNL,PRISM_PRECIP.RMNP,PRISM_PRECIP.SJER,PRISM_PRECIP.STEI,PRISM_PRECIP.TEAK, - PRISM_PRECIP.UKFS,PRISM_PRECIP.WREF,PRISM_PRECIP.BART,PRISM_PRECIP.CLBJ,PRISM_PRECIP.DSNY, - PRISM_PRECIP.HARV,PRISM_PRECIP.JORN,PRISM_PRECIP.LAJA,PRISM_PRECIP.MOAB,PRISM_PRECIP.OAES, - PRISM_PRECIP.OSBS,PRISM_PRECIP.SCBI,PRISM_PRECIP.SOAP,PRISM_PRECIP.STER,PRISM_PRECIP.TOOL, - PRISM_PRECIP.UNDE,PRISM_PRECIP.YELL, + PRISM_PRECIP.ABBY,PRISM_PRECIP.BLAN,PRISM_PRECIP.CPER,PRISM_PRECIP.GRSM, + PRISM_PRECIP.KONA,PRISM_PRECIP.LENO,PRISM_PRECIP.NIWO,PRISM_PRECIP.ONAQ, + PRISM_PRECIP.SERC,PRISM_PRECIP.SRER,PRISM_PRECIP.TALL,PRISM_PRECIP.TREE, + PRISM_PRECIP.WOOD,PRISM_PRECIP.BONA,PRISM_PRECIP.DCFS,PRISM_PRECIP.DELA, + PRISM_PRECIP.JERC,PRISM_PRECIP.KONZ,PRISM_PRECIP.MLBS,PRISM_PRECIP.NOGP, + PRISM_PRECIP.ORNL,PRISM_PRECIP.RMNP,PRISM_PRECIP.SJER,PRISM_PRECIP.STEI, + PRISM_PRECIP.TEAK,PRISM_PRECIP.UKFS,PRISM_PRECIP.WREF,PRISM_PRECIP.BART, + PRISM_PRECIP.CLBJ,PRISM_PRECIP.DSNY,PRISM_PRECIP.HARV,PRISM_PRECIP.JORN, + PRISM_PRECIP.MOAB,PRISM_PRECIP.OAES,PRISM_PRECIP.OSBS,PRISM_PRECIP.SCBI, + PRISM_PRECIP.SOAP,PRISM_PRECIP.STER,PRISM_PRECIP.UNDE,PRISM_PRECIP.YELL, run_component_ctsm diff --git a/cime_config/usermods_dirs/NEON/MLBS/shell_commands b/cime_config/usermods_dirs/NEON/MLBS/shell_commands index 3070c7d594..376fc42add 100644 --- a/cime_config/usermods_dirs/NEON/MLBS/shell_commands +++ b/cime_config/usermods_dirs/NEON/MLBS/shell_commands @@ -3,7 +3,7 @@ ./xmlchange PTS_LON=279.47575 ./xmlchange PTS_LAT=37.37783 if [[$CLM_USRDAT_NAME = 'NEON']]; then - ./xmlchange DATM_YR_END=2019 + ./xmlchange DATM_YR_END=2019 fi # Different default number of months to run for transient case if [[ $compset =~ ^HIST ]]; then diff --git a/cime_config/usermods_dirs/NEON/MOAB/shell_commands b/cime_config/usermods_dirs/NEON/MOAB/shell_commands index c6e483d0a9..6a811c1e4a 100644 --- a/cime_config/usermods_dirs/NEON/MOAB/shell_commands +++ b/cime_config/usermods_dirs/NEON/MOAB/shell_commands @@ -3,10 +3,11 @@ ./xmlchange PTS_LON=250.61118 ./xmlchange PTS_LAT=38.25136 if [[$CLM_USRDAT_NAME = 'NEON']]; then - ./xmlchange DATM_YR_END=2020 -fi -# Different default number of months to run for transient case -if [[ $compset =~ ^HIST ]]; then - ./xmlchange DATM_YR_END=2021 - ./xmlchange STOP_N=36 + # Different default number of months to run for transient case + if [[ $compset =~ ^HIST ]]; then + ./xmlchange DATM_YR_END=2021 + ./xmlchange STOP_N=36 + else + ./xmlchange DATM_YR_END=2020 + fi fi diff --git a/cime_config/usermods_dirs/NEON/NIWO/shell_commands b/cime_config/usermods_dirs/NEON/NIWO/shell_commands index 3f40b8b514..483647d965 100644 --- a/cime_config/usermods_dirs/NEON/NIWO/shell_commands +++ b/cime_config/usermods_dirs/NEON/NIWO/shell_commands @@ -4,4 +4,3 @@ if [[$CLM_USRDAT_NAME = 'NEON']]; then ./xmlchange DATM_YR_END=2018 fi -# remove DATM_YR_END xml change when running with PRISM precipitation diff --git a/cime_config/usermods_dirs/NEON/ONAQ/shell_commands b/cime_config/usermods_dirs/NEON/ONAQ/shell_commands index 9b54cfb0a9..f38cc944b6 100644 --- a/cime_config/usermods_dirs/NEON/ONAQ/shell_commands +++ b/cime_config/usermods_dirs/NEON/ONAQ/shell_commands @@ -3,10 +3,11 @@ ./xmlchange PTS_LON=247.54755 ./xmlchange PTS_LAT=40.17760 if [[$CLM_USRDAT_NAME = 'NEON']]; then - ./xmlchange DATM_YR_END=2019 -fi -# Different default number of months to run for transient case -if [[ $compset =~ ^HIST ]]; then - ./xmlchange DATM_YR_END=2020 - ./xmlchange STOP_N=24 + # Different default number of months to run for transient case + if [[ $compset =~ ^HIST ]]; then + ./xmlchange DATM_YR_END=2020 + ./xmlchange STOP_N=24 + else + ./xmlchange DATM_YR_END=2019 + fi fi diff --git a/cime_config/usermods_dirs/NEON/SJER/shell_commands b/cime_config/usermods_dirs/NEON/SJER/shell_commands index e521af98a8..4b95814c7b 100644 --- a/cime_config/usermods_dirs/NEON/SJER/shell_commands +++ b/cime_config/usermods_dirs/NEON/SJER/shell_commands @@ -4,11 +4,12 @@ ./xmlchange PTS_LAT=37.107117 ./xmlchange DATM_YR_ALIGN=2019 if [[$CLM_USRDAT_NAME = 'NEON']]; then - ./xmlchange DATM_YR_START=2019 -fi -# Different default start date and number of months to run for transient case -if [[ $compset =~ ^HIST ]]; then - ./xmlchange RUN_STARTDATE=2019-01-01 - ./xmlchange STOP_N=39 + # Different default start date and number of months to run for transient case + if [[ $compset =~ ^HIST ]]; then + ./xmlchange RUN_STARTDATE=2019-01-01 + ./xmlchange STOP_N=39 + else + ./xmlchange DATM_YR_START=2019 + fi fi diff --git a/cime_config/usermods_dirs/NEON/TEAK/shell_commands b/cime_config/usermods_dirs/NEON/TEAK/shell_commands index c0930905a0..064354edb5 100644 --- a/cime_config/usermods_dirs/NEON/TEAK/shell_commands +++ b/cime_config/usermods_dirs/NEON/TEAK/shell_commands @@ -4,10 +4,11 @@ ./xmlchange PTS_LAT=37.006472 ./xmlchange DATM_YR_ALIGN=2019 if [[$CLM_USRDAT_NAME = 'NEON']]; then - ./xmlchange DATM_YR_START=2019 -fi -# Different default start date and number of months to run for transient case -if [[ $compset =~ ^HIST ]]; then - ./xmlchange RUN_STARTDATE=2019-01-01 - ./xmlchange STOP_N=39 + # Different default start date and number of months to run for transient case + if [[ $compset =~ ^HIST ]]; then + ./xmlchange RUN_STARTDATE=2019-01-01 + ./xmlchange STOP_N=39 + else + ./xmlchange DATM_YR_START=2019 + fi fi diff --git a/cime_config/usermods_dirs/NEON/WREF/shell_commands b/cime_config/usermods_dirs/NEON/WREF/shell_commands index e6fc742fe3..9be4d1719a 100644 --- a/cime_config/usermods_dirs/NEON/WREF/shell_commands +++ b/cime_config/usermods_dirs/NEON/WREF/shell_commands @@ -4,10 +4,11 @@ ./xmlchange PTS_LAT=45.81637 ./xmlchange DATM_YR_ALIGN=2019 if [[$CLM_USRDAT_NAME = 'NEON']]; then - ./xmlchange DATM_YR_START=2019 -fi -# Different default start date and number of months to run for transient case -if [[ $compset =~ ^HIST ]]; then - ./xmlchange RUN_STARTDATE=2019-01-01 - ./xmlchange STOP_N=39 + # Different default start date and number of months to run for transient case + if [[ $compset =~ ^HIST ]]; then + ./xmlchange RUN_STARTDATE=2019-01-01 + ./xmlchange STOP_N=39 + else + ./xmlchange DATM_YR_START=2019 + fi fi diff --git a/cime_config/usermods_dirs/NEON/YELL/shell_commands b/cime_config/usermods_dirs/NEON/YELL/shell_commands index d313af5dba..bb76a7cc34 100644 --- a/cime_config/usermods_dirs/NEON/YELL/shell_commands +++ b/cime_config/usermods_dirs/NEON/YELL/shell_commands @@ -4,10 +4,11 @@ ./xmlchange PTS_LAT=44.95597 ./xmlchange DATM_YR_ALIGN=2019 if [[$CLM_USRDAT_NAME = 'NEON']]; then - ./xmlchange DATM_YR_START=2019 -fi -# Different default start date and number of months to run for transient case -if [[ $compset =~ ^HIST ]]; then - ./xmlchange RUN_STARTDATE=2019-01-01 - ./xmlchange STOP_N=39 + # Different default start date and number of months to run for transient case + if [[ $compset =~ ^HIST ]]; then + ./xmlchange RUN_STARTDATE=2019-01-01 + ./xmlchange STOP_N=39 + else + ./xmlchange DATM_YR_START=2019 + fi fi From 84d7f0df9acbd718002652e98c50d327e2b56b02 Mon Sep 17 00:00:00 2001 From: Teagan King Date: Fri, 31 Mar 2023 14:36:24 -0600 Subject: [PATCH 10/39] remove BONA prism precip --- cime_config/config_component.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml index 786ce7cf42..b0f77cb1c3 100644 --- a/cime_config/config_component.xml +++ b/cime_config/config_component.xml @@ -310,13 +310,13 @@ PRISM_PRECIP.ABBY,PRISM_PRECIP.BLAN,PRISM_PRECIP.CPER,PRISM_PRECIP.GRSM, PRISM_PRECIP.KONA,PRISM_PRECIP.LENO,PRISM_PRECIP.NIWO,PRISM_PRECIP.ONAQ, PRISM_PRECIP.SERC,PRISM_PRECIP.SRER,PRISM_PRECIP.TALL,PRISM_PRECIP.TREE, - PRISM_PRECIP.WOOD,PRISM_PRECIP.BONA,PRISM_PRECIP.DCFS,PRISM_PRECIP.DELA, - PRISM_PRECIP.JERC,PRISM_PRECIP.KONZ,PRISM_PRECIP.MLBS,PRISM_PRECIP.NOGP, - PRISM_PRECIP.ORNL,PRISM_PRECIP.RMNP,PRISM_PRECIP.SJER,PRISM_PRECIP.STEI, - PRISM_PRECIP.TEAK,PRISM_PRECIP.UKFS,PRISM_PRECIP.WREF,PRISM_PRECIP.BART, - PRISM_PRECIP.CLBJ,PRISM_PRECIP.DSNY,PRISM_PRECIP.HARV,PRISM_PRECIP.JORN, - PRISM_PRECIP.MOAB,PRISM_PRECIP.OAES,PRISM_PRECIP.OSBS,PRISM_PRECIP.SCBI, - PRISM_PRECIP.SOAP,PRISM_PRECIP.STER,PRISM_PRECIP.UNDE,PRISM_PRECIP.YELL, + PRISM_PRECIP.WOOD,PRISM_PRECIP.DCFS,PRISM_PRECIP.DELA,PRISM_PRECIP.JERC, + PRISM_PRECIP.KONZ,PRISM_PRECIP.MLBS,PRISM_PRECIP.NOGP,PRISM_PRECIP.ORNL, + PRISM_PRECIP.RMNP,PRISM_PRECIP.SJER,PRISM_PRECIP.STEI,PRISM_PRECIP.TEAK, + PRISM_PRECIP.UKFS,PRISM_PRECIP.WREF,PRISM_PRECIP.BART,PRISM_PRECIP.CLBJ, + PRISM_PRECIP.DSNY,PRISM_PRECIP.HARV,PRISM_PRECIP.JORN,PRISM_PRECIP.MOAB, + PRISM_PRECIP.OAES,PRISM_PRECIP.OSBS,PRISM_PRECIP.SCBI,PRISM_PRECIP.SOAP, + PRISM_PRECIP.STER,PRISM_PRECIP.UNDE,PRISM_PRECIP.YELL, run_component_ctsm From cecbe6a65df970d218f56346fc4b5602ed98f891 Mon Sep 17 00:00:00 2001 From: Teagan King Date: Thu, 6 Apr 2023 11:22:09 -0600 Subject: [PATCH 11/39] include tests --- cime_config/testdefs/testlist_clm.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 4d074eae11..98d07eb75f 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -1552,6 +1552,16 @@ + + + + + + + + + + From 8d15cb3bbf4240a3e95a4fcf78366200b7152c3a Mon Sep 17 00:00:00 2001 From: Teagan King Date: Fri, 7 Apr 2023 12:54:42 -0600 Subject: [PATCH 12/39] update shell commands --- .../usermods_dirs/NEON/MLBS/shell_commands | 6 ++++-- .../usermods_dirs/NEON/MOAB/shell_commands | 5 ++--- .../usermods_dirs/NEON/NIWO/shell_commands | 4 +++- .../usermods_dirs/NEON/ONAQ/shell_commands | 11 +++++++---- .../usermods_dirs/NEON/SJER/shell_commands | 9 +++++---- .../usermods_dirs/NEON/TEAK/shell_commands | 18 ++++++++++-------- .../usermods_dirs/NEON/WREF/shell_commands | 11 +++++++---- .../usermods_dirs/NEON/YELL/shell_commands | 9 +++++---- 8 files changed, 43 insertions(+), 30 deletions(-) diff --git a/cime_config/usermods_dirs/NEON/MLBS/shell_commands b/cime_config/usermods_dirs/NEON/MLBS/shell_commands index 376fc42add..f21cbd680b 100644 --- a/cime_config/usermods_dirs/NEON/MLBS/shell_commands +++ b/cime_config/usermods_dirs/NEON/MLBS/shell_commands @@ -2,11 +2,13 @@ ./xmlchange NEONSITE=MLBS ./xmlchange PTS_LON=279.47575 ./xmlchange PTS_LAT=37.37783 -if [[$CLM_USRDAT_NAME = 'NEON']]; then +if [ $CLM_USRDAT_NAME=='NEON'] +then ./xmlchange DATM_YR_END=2019 fi # Different default number of months to run for transient case -if [[ $compset =~ ^HIST ]]; then +if [ $compset =~ ^HIST ] +then ./xmlchange DATM_YR_END=2020 ./xmlchange STOP_N=24 fi diff --git a/cime_config/usermods_dirs/NEON/MOAB/shell_commands b/cime_config/usermods_dirs/NEON/MOAB/shell_commands index 6a811c1e4a..c82e8879bf 100644 --- a/cime_config/usermods_dirs/NEON/MOAB/shell_commands +++ b/cime_config/usermods_dirs/NEON/MOAB/shell_commands @@ -2,12 +2,11 @@ ./xmlchange NEONSITE=MOAB ./xmlchange PTS_LON=250.61118 ./xmlchange PTS_LAT=38.25136 -if [[$CLM_USRDAT_NAME = 'NEON']]; then +if [$CLM_USRDAT_NAME=='NEON']; then + ./xmlchange DATM_YR_END=2020 # Different default number of months to run for transient case if [[ $compset =~ ^HIST ]]; then ./xmlchange DATM_YR_END=2021 ./xmlchange STOP_N=36 - else - ./xmlchange DATM_YR_END=2020 fi fi diff --git a/cime_config/usermods_dirs/NEON/NIWO/shell_commands b/cime_config/usermods_dirs/NEON/NIWO/shell_commands index 483647d965..4848702826 100644 --- a/cime_config/usermods_dirs/NEON/NIWO/shell_commands +++ b/cime_config/usermods_dirs/NEON/NIWO/shell_commands @@ -1,6 +1,8 @@ +#!/bin/bash ./xmlchange NEONSITE=NIWO ./xmlchange PTS_LON=254.41676 ./xmlchange PTS_LAT=40.05236 -if [[$CLM_USRDAT_NAME = 'NEON']]; then +if [ $CLM_USRDAT_NAME=="NEON" ] +then ./xmlchange DATM_YR_END=2018 fi diff --git a/cime_config/usermods_dirs/NEON/ONAQ/shell_commands b/cime_config/usermods_dirs/NEON/ONAQ/shell_commands index f38cc944b6..ae6f6d4a19 100644 --- a/cime_config/usermods_dirs/NEON/ONAQ/shell_commands +++ b/cime_config/usermods_dirs/NEON/ONAQ/shell_commands @@ -2,12 +2,15 @@ ./xmlchange NEONSITE=ONAQ ./xmlchange PTS_LON=247.54755 ./xmlchange PTS_LAT=40.17760 -if [[$CLM_USRDAT_NAME = 'NEON']]; then +if [ $CLM_USRDAT_NAME=='NEON' ] +then + echo "IN CLM_USRDAT_NAME LOOP!" + ./xmlchange DATM_YR_END=2019 # Different default number of months to run for transient case - if [[ $compset =~ ^HIST ]]; then + if [[ $compset =~ ^HIST ]] + then + echo "IN HIST COMPSET LOOP!" ./xmlchange DATM_YR_END=2020 ./xmlchange STOP_N=24 - else - ./xmlchange DATM_YR_END=2019 fi fi diff --git a/cime_config/usermods_dirs/NEON/SJER/shell_commands b/cime_config/usermods_dirs/NEON/SJER/shell_commands index 4b95814c7b..e76242e8b5 100644 --- a/cime_config/usermods_dirs/NEON/SJER/shell_commands +++ b/cime_config/usermods_dirs/NEON/SJER/shell_commands @@ -3,13 +3,14 @@ ./xmlchange PTS_LON=240.267 ./xmlchange PTS_LAT=37.107117 ./xmlchange DATM_YR_ALIGN=2019 -if [[$CLM_USRDAT_NAME = 'NEON']]; then +if [ $CLM_USRDAT_NAME=='NEON' ] +then + ./xmlchange DATM_YR_START=2019 # Different default start date and number of months to run for transient case - if [[ $compset =~ ^HIST ]]; then + if [[ $compset =~ ^HIST ]] + then ./xmlchange RUN_STARTDATE=2019-01-01 ./xmlchange STOP_N=39 - else - ./xmlchange DATM_YR_START=2019 fi fi diff --git a/cime_config/usermods_dirs/NEON/TEAK/shell_commands b/cime_config/usermods_dirs/NEON/TEAK/shell_commands index 064354edb5..3775581719 100644 --- a/cime_config/usermods_dirs/NEON/TEAK/shell_commands +++ b/cime_config/usermods_dirs/NEON/TEAK/shell_commands @@ -3,12 +3,14 @@ ./xmlchange PTS_LON=240.99424199999999 ./xmlchange PTS_LAT=37.006472 ./xmlchange DATM_YR_ALIGN=2019 -if [[$CLM_USRDAT_NAME = 'NEON']]; then - # Different default start date and number of months to run for transient case - if [[ $compset =~ ^HIST ]]; then - ./xmlchange RUN_STARTDATE=2019-01-01 - ./xmlchange STOP_N=39 - else - ./xmlchange DATM_YR_START=2019 - fi +./xmlchange DATM_YR_START=2019 +#if [ $CLM_USRDAT_NAME=='NEON'] +#then +# Different default start date and number of months to run for transient case +#./xmlchange DATM_YR_START=2019 +if [[ $compset =~ ^HIST ]] +then + ./xmlchange RUN_STARTDATE=2019-01-01 + ./xmlchange STOP_N=39 fi +#fi diff --git a/cime_config/usermods_dirs/NEON/WREF/shell_commands b/cime_config/usermods_dirs/NEON/WREF/shell_commands index 9be4d1719a..c8cb110cc4 100644 --- a/cime_config/usermods_dirs/NEON/WREF/shell_commands +++ b/cime_config/usermods_dirs/NEON/WREF/shell_commands @@ -3,12 +3,15 @@ ./xmlchange PTS_LON=238.04162 ./xmlchange PTS_LAT=45.81637 ./xmlchange DATM_YR_ALIGN=2019 -if [[$CLM_USRDAT_NAME = 'NEON']]; then +if [ $CLM_USRDAT_NAME=='NEON' ] +then + echo "IN CLM_USRDAT_NAME LOOP!" # Different default start date and number of months to run for transient case - if [[ $compset =~ ^HIST ]]; then + ./xmlchange DATM_YR_START=2019 + if [[ $compset =~ ^HIST ]] + then + echo "IN HIST COMPSET LOOP!" ./xmlchange RUN_STARTDATE=2019-01-01 ./xmlchange STOP_N=39 - else - ./xmlchange DATM_YR_START=2019 fi fi diff --git a/cime_config/usermods_dirs/NEON/YELL/shell_commands b/cime_config/usermods_dirs/NEON/YELL/shell_commands index bb76a7cc34..86eab8ca20 100644 --- a/cime_config/usermods_dirs/NEON/YELL/shell_commands +++ b/cime_config/usermods_dirs/NEON/YELL/shell_commands @@ -3,12 +3,13 @@ ./xmlchange PTS_LON=249.45803999999998 ./xmlchange PTS_LAT=44.95597 ./xmlchange DATM_YR_ALIGN=2019 -if [[$CLM_USRDAT_NAME = 'NEON']]; then +if [ $CLM_USRDAT_NAME=='NEON' ] +then # Different default start date and number of months to run for transient case - if [[ $compset =~ ^HIST ]]; then + ./xmlchange DATM_YR_START=2019 + if [[ $compset =~ ^HIST ]] + then ./xmlchange RUN_STARTDATE=2019-01-01 ./xmlchange STOP_N=39 - else - ./xmlchange DATM_YR_START=2019 fi fi From 44246738a18185d28e60ca807467e9dec30567f8 Mon Sep 17 00:00:00 2001 From: Teagan King Date: Mon, 10 Apr 2023 11:58:29 -0600 Subject: [PATCH 13/39] update tests --- cime_config/testdefs/testlist_clm.xml | 2 +- cime_config/testdefs/testmods_dirs/clm/PRISM/include_user_mods | 1 + cime_config/testdefs/testmods_dirs/clm/PRISM/shell_commands | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 cime_config/testdefs/testmods_dirs/clm/PRISM/include_user_mods create mode 100644 cime_config/testdefs/testmods_dirs/clm/PRISM/shell_commands diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 98d07eb75f..5b7b6dfce4 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -1552,7 +1552,7 @@ - + diff --git a/cime_config/testdefs/testmods_dirs/clm/PRISM/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/PRISM/include_user_mods new file mode 100644 index 0000000000..fe0e18cf88 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/PRISM/include_user_mods @@ -0,0 +1 @@ +../default diff --git a/cime_config/testdefs/testmods_dirs/clm/PRISM/shell_commands b/cime_config/testdefs/testmods_dirs/clm/PRISM/shell_commands new file mode 100644 index 0000000000..0b5ec8cff6 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/PRISM/shell_commands @@ -0,0 +1,2 @@ +#!/bin/bash +./xmlchange CLM_USRDAT_NAME=NEON From 3b35c9ca9343ba57abbfa0c8f088c75c9e1a721e Mon Sep 17 00:00:00 2001 From: Teagan King Date: Tue, 11 Apr 2023 07:42:34 -0600 Subject: [PATCH 14/39] shell command updates/cleanup --- .../usermods_dirs/NEON/MLBS/shell_commands | 2 +- .../usermods_dirs/NEON/ONAQ/shell_commands | 2 -- .../usermods_dirs/NEON/TEAK/shell_commands | 18 +++++++++--------- .../usermods_dirs/NEON/WREF/shell_commands | 2 -- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/cime_config/usermods_dirs/NEON/MLBS/shell_commands b/cime_config/usermods_dirs/NEON/MLBS/shell_commands index f21cbd680b..23e3a7014c 100644 --- a/cime_config/usermods_dirs/NEON/MLBS/shell_commands +++ b/cime_config/usermods_dirs/NEON/MLBS/shell_commands @@ -7,7 +7,7 @@ then ./xmlchange DATM_YR_END=2019 fi # Different default number of months to run for transient case -if [ $compset =~ ^HIST ] +if [[ $compset =~ ^HIST ]] then ./xmlchange DATM_YR_END=2020 ./xmlchange STOP_N=24 diff --git a/cime_config/usermods_dirs/NEON/ONAQ/shell_commands b/cime_config/usermods_dirs/NEON/ONAQ/shell_commands index ae6f6d4a19..0045025b15 100644 --- a/cime_config/usermods_dirs/NEON/ONAQ/shell_commands +++ b/cime_config/usermods_dirs/NEON/ONAQ/shell_commands @@ -4,12 +4,10 @@ ./xmlchange PTS_LAT=40.17760 if [ $CLM_USRDAT_NAME=='NEON' ] then - echo "IN CLM_USRDAT_NAME LOOP!" ./xmlchange DATM_YR_END=2019 # Different default number of months to run for transient case if [[ $compset =~ ^HIST ]] then - echo "IN HIST COMPSET LOOP!" ./xmlchange DATM_YR_END=2020 ./xmlchange STOP_N=24 fi diff --git a/cime_config/usermods_dirs/NEON/TEAK/shell_commands b/cime_config/usermods_dirs/NEON/TEAK/shell_commands index 3775581719..0850dd2189 100644 --- a/cime_config/usermods_dirs/NEON/TEAK/shell_commands +++ b/cime_config/usermods_dirs/NEON/TEAK/shell_commands @@ -3,14 +3,14 @@ ./xmlchange PTS_LON=240.99424199999999 ./xmlchange PTS_LAT=37.006472 ./xmlchange DATM_YR_ALIGN=2019 -./xmlchange DATM_YR_START=2019 -#if [ $CLM_USRDAT_NAME=='NEON'] -#then -# Different default start date and number of months to run for transient case -#./xmlchange DATM_YR_START=2019 -if [[ $compset =~ ^HIST ]] +if [ $CLM_USRDAT_NAME=='NEON'] then - ./xmlchange RUN_STARTDATE=2019-01-01 - ./xmlchange STOP_N=39 + ./xmlchange DATM_YR_START=2019 + # Different default start date and number of months to run for transient case + #./xmlchange DATM_YR_START=2019 + if [[ $compset =~ ^HIST ]] + then + ./xmlchange RUN_STARTDATE=2019-01-01 + ./xmlchange STOP_N=39 + fi fi -#fi diff --git a/cime_config/usermods_dirs/NEON/WREF/shell_commands b/cime_config/usermods_dirs/NEON/WREF/shell_commands index c8cb110cc4..497ffd73f3 100644 --- a/cime_config/usermods_dirs/NEON/WREF/shell_commands +++ b/cime_config/usermods_dirs/NEON/WREF/shell_commands @@ -5,12 +5,10 @@ ./xmlchange DATM_YR_ALIGN=2019 if [ $CLM_USRDAT_NAME=='NEON' ] then - echo "IN CLM_USRDAT_NAME LOOP!" # Different default start date and number of months to run for transient case ./xmlchange DATM_YR_START=2019 if [[ $compset =~ ^HIST ]] then - echo "IN HIST COMPSET LOOP!" ./xmlchange RUN_STARTDATE=2019-01-01 ./xmlchange STOP_N=39 fi From 1214de9fd5043571a76c228fc84949f102241403 Mon Sep 17 00:00:00 2001 From: Teagan King Date: Mon, 17 Apr 2023 11:00:09 -0600 Subject: [PATCH 15/39] include run_neon updates --- Externals.cfg | 2 +- tools/site_and_regional/run_neon.py | 32 ++++++++++++++++++++++++----- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index 7a4eeb4a6e..da0f7b293b 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -34,7 +34,7 @@ hash = 34723c2 required = True [ccs_config] -tag = ccs_config_cesm0.0.38 +tag = ccs_config_cesm0.0.60 protocol = git repo_url = https://github.com/ESMCI/ccs_config_cesm.git local_path = ccs_config diff --git a/tools/site_and_regional/run_neon.py b/tools/site_and_regional/run_neon.py index 50f0640d03..4f4e6cb968 100755 --- a/tools/site_and_regional/run_neon.py +++ b/tools/site_and_regional/run_neon.py @@ -193,6 +193,18 @@ def get_parser(args, description, valid_neon_sites): default="transient", ) + parser.add_argument( + "--experiment", + help=""" + Appends the case name with string for model experiment + """, + action="store", + dest="experiment", + type=str, + required=False, + default=None, + ) + parser.add_argument( "--run-length", help=""" @@ -251,7 +263,7 @@ def get_parser(args, description, valid_neon_sites): dest="user_version", required = False, type = str, - choices= ['v1','v2'], + choices= ['v1','v2','v3'], ) @@ -294,6 +306,7 @@ def get_parser(args, description, valid_neon_sites): neon_sites, args.output_root, args.run_type, + args.experiment, args.overwrite, run_length, base_case_root, @@ -457,6 +470,7 @@ def run_case( setup_only=False, no_batch=False, rerun=False, + experiment=False, ): user_mods_dirs = [ os.path.join( @@ -475,9 +489,15 @@ def run_case( print ("using this version:", version) - case_root = os.path.abspath( - os.path.join(base_case_root, "..", self.name + "." + run_type) - ) + if experiment == None: + case_root = os.path.abspath( + os.path.join(base_case_root, "..", self.name + "." + run_type) + ) + else: + case_root = os.path.abspath( + os.path.join(base_case_root, "..", self.name + "." + experiment + "." + run_type) + ) + rundir = None if os.path.isdir(case_root): if overwrite: @@ -760,6 +780,7 @@ def main(description): site_list, output_root, run_type, + experiment, overwrite, run_length, base_case_root, @@ -767,7 +788,7 @@ def main(description): setup_only, no_batch, rerun, - user_version + user_version, ) = get_parser(sys.argv, description, valid_neon_sites) if output_root: @@ -809,6 +830,7 @@ def main(description): setup_only, no_batch, rerun, + experiment, ) From 39de3a08b872958355756340517c42d2ba81ff40 Mon Sep 17 00:00:00 2001 From: Teagan King Date: Tue, 18 Apr 2023 13:28:04 -0600 Subject: [PATCH 16/39] correction to get postAD and transient from postAD working --- tools/site_and_regional/run_neon.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/tools/site_and_regional/run_neon.py b/tools/site_and_regional/run_neon.py index 4f4e6cb968..19976285af 100755 --- a/tools/site_and_regional/run_neon.py +++ b/tools/site_and_regional/run_neon.py @@ -489,14 +489,11 @@ def run_case( print ("using this version:", version) - if experiment == None: - case_root = os.path.abspath( + if experiment != None: + self.name = self.name + "." + experiment + case_root = os.path.abspath( os.path.join(base_case_root, "..", self.name + "." + run_type) ) - else: - case_root = os.path.abspath( - os.path.join(base_case_root, "..", self.name + "." + experiment + "." + run_type) - ) rundir = None if os.path.isdir(case_root): From acc32ee89613c96b1a6163e2bd0f4c6baef74ad4 Mon Sep 17 00:00:00 2001 From: Teagan King Date: Thu, 20 Apr 2023 16:58:09 -0600 Subject: [PATCH 17/39] documentation update --- cime_config/usermods_dirs/NEON/defaults/shell_commands | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/usermods_dirs/NEON/defaults/shell_commands b/cime_config/usermods_dirs/NEON/defaults/shell_commands index ad23164b73..d7173100be 100644 --- a/cime_config/usermods_dirs/NEON/defaults/shell_commands +++ b/cime_config/usermods_dirs/NEON/defaults/shell_commands @@ -1,6 +1,6 @@ #!/bin/bash ./xmlchange CLM_USRDAT_NAME=NEON -# This can be set to either NEON or NEON.PRISM +# CLM_USRDAT_NAME can be set to either NEON or NEON.PRISM ./xmlchange CCSM_CO2_PPMV=408.83 # Set data forcing data to future scenario so will have data from 2018 to present-day ./xmlchange DATM_PRESAERO=SSP3-7.0 From 686c64deeef48f947a149604b84003ab7759adad Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Thu, 20 Apr 2023 19:35:04 -0600 Subject: [PATCH 18/39] Add CDEPS branch to externals --- Externals.cfg | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index dfc4191642..9d7adf3a7c 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -55,9 +55,11 @@ local_path = components/cmeps required = True [cdeps] -tag = cdeps1.0.7 +#tag = cdeps1.0.7 +branch = main protocol = git -repo_url = https://github.com/ESCOMP/CDEPS.git +#repo_url = https://github.com/ESCOMP/CDEPS.git +repo_url = https://github.com/TeaganKing/CDEPS.git local_path = components/cdeps externals = Externals_CDEPS.cfg required = True From f92d389e518446f417328ea7e03aab1c812db3b6 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Fri, 21 Apr 2023 23:25:04 -0600 Subject: [PATCH 19/39] Set the testmod to PRISM --- cime_config/testdefs/testmods_dirs/clm/PRISM/shell_commands | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/testdefs/testmods_dirs/clm/PRISM/shell_commands b/cime_config/testdefs/testmods_dirs/clm/PRISM/shell_commands index 0b5ec8cff6..39812a8706 100644 --- a/cime_config/testdefs/testmods_dirs/clm/PRISM/shell_commands +++ b/cime_config/testdefs/testmods_dirs/clm/PRISM/shell_commands @@ -1,2 +1,2 @@ #!/bin/bash -./xmlchange CLM_USRDAT_NAME=NEON +./xmlchange CLM_USRDAT_NAME=NEON.PRISM From e3ee3140ee2339af15e8b68eab8c1c1d6a5cba34 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Sat, 22 Apr 2023 13:40:47 -0600 Subject: [PATCH 20/39] This change is not needed anymore --- .../usermods_dirs/NEON/defaults/user_nl_datm_streams | 9 --------- 1 file changed, 9 deletions(-) diff --git a/cime_config/usermods_dirs/NEON/defaults/user_nl_datm_streams b/cime_config/usermods_dirs/NEON/defaults/user_nl_datm_streams index 53c4e4e4a7..bae77db6b5 100644 --- a/cime_config/usermods_dirs/NEON/defaults/user_nl_datm_streams +++ b/cime_config/usermods_dirs/NEON/defaults/user_nl_datm_streams @@ -38,12 +38,3 @@ preso3.SSP3-7.0:year_last=2022 preso3.SSP3-7.0:year_align=2018 preso3.SSP3-7.0:dtlimit=30 -NEON.${NEONSITE}:datavars = \ - FSDS Faxa_swdn, \ - ZBOT Sa_z, \ - TBOT Sa_tbot, \ - WIND Sa_wind, \ - RH Sa_rh, \ - PSRF Sa_pbot, \ - FLDS Faxa_lwdn - From 2e5913a57a17c8f70cb07b50ec0efb3196276c67 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Sat, 22 Apr 2023 14:46:55 -0600 Subject: [PATCH 21/39] Update the description of CLM_USRDAT_NAME --- cime_config/config_component.xml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml index b0f77cb1c3..6f1933c858 100644 --- a/cime_config/config_component.xml +++ b/cime_config/config_component.xml @@ -241,12 +241,13 @@ UNSET run_component_ctsm env_run.xml - Dataset name for user-created datasets. This is used as the argument - in Buildconf/clm.buildnml to build-namelist -clm_usr_name. An example of - such a dataset would be 1x1pt_boulderCO_c090722. The default value is UNSET. - This is an advanced flag and should only be used by expert users. For NEON - cases, this can be set to either NEON or NEON.PRISM, the latter of which would - PRISM precipitation instead of the default NEON precipitation. + Resolution name for user-created resolutions. This is especially used + for single point and regional resolutions created via subset_data from + the global datasets. This should be set when you use CLM_USRDAT as the grid + to create_newcase. The default value is UNSET. + For NEON cases, this can be set to either NEON or NEON.PRISM, the latter of which would + use PRISM precipitation instead of the default NEON precipitation. NEON cases then also + use the variable NEONSITE to specify the exact site. From 90fcb22221658eb2c9571d618083f316a7fdaeff Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Tue, 25 Apr 2023 11:19:32 -0600 Subject: [PATCH 22/39] Change the PRISM test to one of the sites where the dates were different for PRISM, and add a FATES PRISM test for another such site --- cime_config/testdefs/testlist_clm.xml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml index 89cf33cfe1..049d505ef6 100644 --- a/cime_config/testdefs/testlist_clm.xml +++ b/cime_config/testdefs/testlist_clm.xml @@ -1561,7 +1561,7 @@ - + @@ -1582,6 +1582,17 @@ + + + + + + + + + + + From 0a89caeec35f2058497b256f245195b42bf81100 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Tue, 25 Apr 2023 13:22:30 -0600 Subject: [PATCH 23/39] Add a comment about why the year is earlier for some sites --- cime_config/usermods_dirs/NEON/MLBS/shell_commands | 2 ++ cime_config/usermods_dirs/NEON/MOAB/shell_commands | 2 ++ cime_config/usermods_dirs/NEON/NIWO/shell_commands | 2 ++ cime_config/usermods_dirs/NEON/ONAQ/shell_commands | 2 ++ cime_config/usermods_dirs/NEON/SJER/shell_commands | 2 ++ cime_config/usermods_dirs/NEON/TEAK/shell_commands | 3 ++- cime_config/usermods_dirs/NEON/WREF/shell_commands | 2 ++ cime_config/usermods_dirs/NEON/YELL/shell_commands | 2 ++ 8 files changed, 16 insertions(+), 1 deletion(-) diff --git a/cime_config/usermods_dirs/NEON/MLBS/shell_commands b/cime_config/usermods_dirs/NEON/MLBS/shell_commands index 23e3a7014c..c4c215772a 100644 --- a/cime_config/usermods_dirs/NEON/MLBS/shell_commands +++ b/cime_config/usermods_dirs/NEON/MLBS/shell_commands @@ -2,6 +2,8 @@ ./xmlchange NEONSITE=MLBS ./xmlchange PTS_LON=279.47575 ./xmlchange PTS_LAT=37.37783 +# NEON precipitation data for this siste is bad so end early +# If CLM_USRDAT_NAME is NEON.PRISM you can run to the end of the data if [ $CLM_USRDAT_NAME=='NEON'] then ./xmlchange DATM_YR_END=2019 diff --git a/cime_config/usermods_dirs/NEON/MOAB/shell_commands b/cime_config/usermods_dirs/NEON/MOAB/shell_commands index c82e8879bf..782863e9d0 100644 --- a/cime_config/usermods_dirs/NEON/MOAB/shell_commands +++ b/cime_config/usermods_dirs/NEON/MOAB/shell_commands @@ -2,6 +2,8 @@ ./xmlchange NEONSITE=MOAB ./xmlchange PTS_LON=250.61118 ./xmlchange PTS_LAT=38.25136 +# NEON precipitation data for this siste is bad so end early +# If CLM_USRDAT_NAME is NEON.PRISM you can run to the end of the data if [$CLM_USRDAT_NAME=='NEON']; then ./xmlchange DATM_YR_END=2020 # Different default number of months to run for transient case diff --git a/cime_config/usermods_dirs/NEON/NIWO/shell_commands b/cime_config/usermods_dirs/NEON/NIWO/shell_commands index 4848702826..f5e9d1bab3 100644 --- a/cime_config/usermods_dirs/NEON/NIWO/shell_commands +++ b/cime_config/usermods_dirs/NEON/NIWO/shell_commands @@ -2,6 +2,8 @@ ./xmlchange NEONSITE=NIWO ./xmlchange PTS_LON=254.41676 ./xmlchange PTS_LAT=40.05236 +# NEON precipitation data for this siste is bad so end early +# If CLM_USRDAT_NAME is NEON.PRISM you can run to the end of the data if [ $CLM_USRDAT_NAME=="NEON" ] then ./xmlchange DATM_YR_END=2018 diff --git a/cime_config/usermods_dirs/NEON/ONAQ/shell_commands b/cime_config/usermods_dirs/NEON/ONAQ/shell_commands index 0045025b15..07b9a43ccc 100644 --- a/cime_config/usermods_dirs/NEON/ONAQ/shell_commands +++ b/cime_config/usermods_dirs/NEON/ONAQ/shell_commands @@ -2,6 +2,8 @@ ./xmlchange NEONSITE=ONAQ ./xmlchange PTS_LON=247.54755 ./xmlchange PTS_LAT=40.17760 +# NEON precipitation data for this siste is bad so end early +# If CLM_USRDAT_NAME is NEON.PRISM you can run to the end of the data if [ $CLM_USRDAT_NAME=='NEON' ] then ./xmlchange DATM_YR_END=2019 diff --git a/cime_config/usermods_dirs/NEON/SJER/shell_commands b/cime_config/usermods_dirs/NEON/SJER/shell_commands index e76242e8b5..9eb170ecea 100644 --- a/cime_config/usermods_dirs/NEON/SJER/shell_commands +++ b/cime_config/usermods_dirs/NEON/SJER/shell_commands @@ -3,6 +3,8 @@ ./xmlchange PTS_LON=240.267 ./xmlchange PTS_LAT=37.107117 ./xmlchange DATM_YR_ALIGN=2019 +# NEON precipitation data for this siste is bad so end early +# If CLM_USRDAT_NAME is NEON.PRISM you can run to the end of the data if [ $CLM_USRDAT_NAME=='NEON' ] then ./xmlchange DATM_YR_START=2019 diff --git a/cime_config/usermods_dirs/NEON/TEAK/shell_commands b/cime_config/usermods_dirs/NEON/TEAK/shell_commands index 0850dd2189..5b067f56b1 100644 --- a/cime_config/usermods_dirs/NEON/TEAK/shell_commands +++ b/cime_config/usermods_dirs/NEON/TEAK/shell_commands @@ -3,11 +3,12 @@ ./xmlchange PTS_LON=240.99424199999999 ./xmlchange PTS_LAT=37.006472 ./xmlchange DATM_YR_ALIGN=2019 +# NEON precipitation data for this siste is bad so end early +# If CLM_USRDAT_NAME is NEON.PRISM you can run to the end of the data if [ $CLM_USRDAT_NAME=='NEON'] then ./xmlchange DATM_YR_START=2019 # Different default start date and number of months to run for transient case - #./xmlchange DATM_YR_START=2019 if [[ $compset =~ ^HIST ]] then ./xmlchange RUN_STARTDATE=2019-01-01 diff --git a/cime_config/usermods_dirs/NEON/WREF/shell_commands b/cime_config/usermods_dirs/NEON/WREF/shell_commands index 497ffd73f3..34e3bdc881 100644 --- a/cime_config/usermods_dirs/NEON/WREF/shell_commands +++ b/cime_config/usermods_dirs/NEON/WREF/shell_commands @@ -3,6 +3,8 @@ ./xmlchange PTS_LON=238.04162 ./xmlchange PTS_LAT=45.81637 ./xmlchange DATM_YR_ALIGN=2019 +# NEON precipitation data for this siste is bad so end early +# If CLM_USRDAT_NAME is NEON.PRISM you can run to the end of the data if [ $CLM_USRDAT_NAME=='NEON' ] then # Different default start date and number of months to run for transient case diff --git a/cime_config/usermods_dirs/NEON/YELL/shell_commands b/cime_config/usermods_dirs/NEON/YELL/shell_commands index 86eab8ca20..836f0ce5f1 100644 --- a/cime_config/usermods_dirs/NEON/YELL/shell_commands +++ b/cime_config/usermods_dirs/NEON/YELL/shell_commands @@ -3,6 +3,8 @@ ./xmlchange PTS_LON=249.45803999999998 ./xmlchange PTS_LAT=44.95597 ./xmlchange DATM_YR_ALIGN=2019 +# NEON precipitation data for this siste is bad so end early +# If CLM_USRDAT_NAME is NEON.PRISM you can run to the end of the data if [ $CLM_USRDAT_NAME=='NEON' ] then # Different default start date and number of months to run for transient case From d2e9296ca41415cc34fd91254ab6fd2dd782aa50 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Tue, 25 Apr 2023 13:25:26 -0600 Subject: [PATCH 24/39] Nest the transient year change inside the NEON if so won't apply for NEON.PRISM --- cime_config/usermods_dirs/NEON/MLBS/shell_commands | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cime_config/usermods_dirs/NEON/MLBS/shell_commands b/cime_config/usermods_dirs/NEON/MLBS/shell_commands index c4c215772a..8967701e92 100644 --- a/cime_config/usermods_dirs/NEON/MLBS/shell_commands +++ b/cime_config/usermods_dirs/NEON/MLBS/shell_commands @@ -7,10 +7,10 @@ if [ $CLM_USRDAT_NAME=='NEON'] then ./xmlchange DATM_YR_END=2019 -fi -# Different default number of months to run for transient case -if [[ $compset =~ ^HIST ]] -then - ./xmlchange DATM_YR_END=2020 - ./xmlchange STOP_N=24 + # Different default number of months to run for transient case + if [[ $compset =~ ^HIST ]] + then + ./xmlchange DATM_YR_END=2020 + ./xmlchange STOP_N=24 + fi fi From 0f262d41314143538f310d55b67e56573c0dc9d3 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Tue, 25 Apr 2023 13:34:18 -0600 Subject: [PATCH 25/39] Add a FATES PRISM testmod --- .../testdefs/testmods_dirs/clm/FatesPRISM/include_user_mods | 1 + .../testdefs/testmods_dirs/clm/FatesPRISM/shell_commands | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesPRISM/include_user_mods create mode 100644 cime_config/testdefs/testmods_dirs/clm/FatesPRISM/shell_commands diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesPRISM/include_user_mods b/cime_config/testdefs/testmods_dirs/clm/FatesPRISM/include_user_mods new file mode 100644 index 0000000000..4c7aa0f2b4 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/FatesPRISM/include_user_mods @@ -0,0 +1 @@ +../Fates diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesPRISM/shell_commands b/cime_config/testdefs/testmods_dirs/clm/FatesPRISM/shell_commands new file mode 100644 index 0000000000..39812a8706 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/clm/FatesPRISM/shell_commands @@ -0,0 +1,2 @@ +#!/bin/bash +./xmlchange CLM_USRDAT_NAME=NEON.PRISM From 64485caa4462a0683ea1df1a853599a185a1c2e1 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Tue, 25 Apr 2023 22:22:54 -0600 Subject: [PATCH 26/39] Add --prism option for run_neon --- tools/site_and_regional/run_neon.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tools/site_and_regional/run_neon.py b/tools/site_and_regional/run_neon.py index 19976285af..7ec5d7577d 100755 --- a/tools/site_and_regional/run_neon.py +++ b/tools/site_and_regional/run_neon.py @@ -193,6 +193,19 @@ def get_parser(args, description, valid_neon_sites): default="transient", ) + parser.add_argument( + "--prism", + help=""" + Uses the PRISM reanaylsis precipitation data for the site instead of the NEON data + (only available over Continental US) + """, + action="store_true", + dest="prism", + required=False, + default=False, + ) + + parser.add_argument( "--experiment", help=""" @@ -307,6 +320,7 @@ def get_parser(args, description, valid_neon_sites): args.output_root, args.run_type, args.experiment, + args.prism, args.overwrite, run_length, base_case_root, @@ -464,6 +478,7 @@ def run_case( self, base_case_root, run_type, + prism, run_length, user_version, overwrite=False, @@ -555,6 +570,9 @@ def run_case( case.set_value("REST_OPTION", "end") case.set_value("CONTINUE_RUN", False) case.set_value("NEONVERSION", version) + if prism: + case.set_value("CLM_USRDAT_NAME", "NEON.PRISM") + if run_type == "ad": case.set_value("CLM_FORCE_COLDSTART", "on") case.set_value("CLM_ACCELERATED_SPINUP", "on") @@ -778,6 +796,7 @@ def main(description): output_root, run_type, experiment, + prism, overwrite, run_length, base_case_root, @@ -821,6 +840,7 @@ def main(description): neon_site.run_case( base_case_root, run_type, + prism, run_length, user_version, overwrite, From d95ada651e9e7c4517cb99a65c1a2ecbe734bda5 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Wed, 26 Apr 2023 00:37:15 -0600 Subject: [PATCH 27/39] Add option for v3 NEONVERSION --- cime_config/config_component.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml index 6f1933c858..743e9229b9 100644 --- a/cime_config/config_component.xml +++ b/cime_config/config_component.xml @@ -327,7 +327,7 @@ char - v1,v2,latest + v1,v2,v3,latest latest run_component_ctsm env_run.xml From 830af35ae1cfebc05c0e088a2560bd28143b9857 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Wed, 26 Apr 2023 10:37:53 -0600 Subject: [PATCH 28/39] Add a test for run_neon with PRISM --- test/tools/README.testnames | 1 + test/tools/input_tests_master | 6 ++++-- test/tools/nl_files/run_neon_YELL_PRISM | 1 + test/tools/tests_pretag_nompi_neon | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 test/tools/nl_files/run_neon_YELL_PRISM diff --git a/test/tools/README.testnames b/test/tools/README.testnames index 11d9e23d4c..f42864facc 100644 --- a/test/tools/README.testnames +++ b/test/tools/README.testnames @@ -43,6 +43,7 @@ m is the resolution 9 -- 4x5 a -- NEON YELL b -- NEON KONA +c -- NEON OSBS d -- region1 c -- single point from the 0.9x1.25 grid g -- unused diff --git a/test/tools/input_tests_master b/test/tools/input_tests_master index 63e4e5173f..784df20ea5 100644 --- a/test/tools/input_tests_master +++ b/test/tools/input_tests_master @@ -24,8 +24,10 @@ bli58 TBLscript_tools.sh mksurfdata_map mksurfdata.pl mksrfdt_10x15_crp_1850-200 smi64 TSMscript_tools.sh mksurfdata_map mksurfdata.pl mksrfdt_5x5_amazon_hirespft_2005^tools__ds bli64 TBLscript_tools.sh mksurfdata_map mksurfdata.pl mksrfdt_5x5_amazon_hirespft_2005^tools__ds -sm0a1 TSMscript_tools.sh site_and_regional run_neon.py run_neon_OSBS -bl0a1 TBLscript_tools.sh site_and_regional run_neon.py run_neon_OSBS +sm0c1 TSMscript_tools.sh site_and_regional run_neon.py run_neon_OSBS +bl0c1 TBLscript_tools.sh site_and_regional run_neon.py run_neon_OSBS +sm0a1 TSMscript_tools.sh site_and_regional run_neon.py run_neon_YELL_PRISM +bl0a1 TBLscript_tools.sh site_and_regional run_neon.py run_neon_YELL_PRISM smba1 TSMscript_tools.sh site_and_regional subset_data subset_data_YELL blba1 TBLscript_tools.sh site_and_regional subset_data subset_data_YELL diff --git a/test/tools/nl_files/run_neon_YELL_PRISM b/test/tools/nl_files/run_neon_YELL_PRISM new file mode 100644 index 0000000000..f5ebdf9fdf --- /dev/null +++ b/test/tools/nl_files/run_neon_YELL_PRISM @@ -0,0 +1 @@ +--verbose --run-type transient --setup-only --neon-site YELL --prism --neon-version v2 --experiment toolstest diff --git a/test/tools/tests_pretag_nompi_neon b/test/tools/tests_pretag_nompi_neon index 43167e71c0..e5fa27e6c4 100644 --- a/test/tools/tests_pretag_nompi_neon +++ b/test/tools/tests_pretag_nompi_neon @@ -1,4 +1,5 @@ sm0a1 bl0a1 +sm0c1 bl0c1 smaa2 blaa2 smba1 blba1 smbb1 blbb1 From b3d782c0e8552b91e8c5aac23dfca0578fd74cba Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Wed, 26 Apr 2023 17:05:44 -0600 Subject: [PATCH 29/39] Add a warning if this is NEON and transient and the NEONSITE.transient casename is not being used (or if it's PRISM) for the user make sure the finidat file is appropriately spunup --- cime_config/buildnml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/cime_config/buildnml b/cime_config/buildnml index 4e04951474..25724def82 100755 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -3,7 +3,7 @@ """ CTSM namelist creator """ -import sys, os, shutil +import sys, os, shutil, re _CIMEROOT = os.environ.get("CIMEROOT") if _CIMEROOT is None: @@ -41,6 +41,7 @@ def buildnml(case, caseroot, compname): configuration = case.get_value("CLM_CONFIGURATION") structure = case.get_value("CLM_STRUCTURE") ccsm_co2_ppmv = case.get_value("CCSM_CO2_PPMV") + casename = case.get_value("CASE") clm_co2_type = case.get_value("CLM_CO2_TYPE") clm_namelist_opts = case.get_value("CLM_NAMELIST_OPTS") clm_bldnml_opts = case.get_value("CLM_BLDNML_OPTS") @@ -133,6 +134,13 @@ def buildnml(case, caseroot, compname): clm_usrdat_name = case.get_value("CLM_USRDAT_NAME") lnd_grid = clm_usrdat_name clmusr = " -clm_usr_name %s "%clm_usrdat_name + # Write warning about initial condition data + if "NEON" in clm_usrdat_name and clm_force_coldstart == "off": + if ("_transient" in clm_nml_use_case) \ + and (re.fullmatch(r"\w\w\w\w\.transient", casename) is None \ + or clm_usrdat_name is "NEON.PRISM"): + logger.warning( "WARNING: Do you have approriprate initial conditions for this simulation?" \ + + " Check that the finidat file used in the lnd_in namelist is apprporiately spunup for your case" ) if comp_atm != "datm": nomeg = "-no-megan" From 7f0c833bf12ba3bb9da4f0711e6b90a7b43b29f1 Mon Sep 17 00:00:00 2001 From: Teagan King <98482480+TeaganKing@users.noreply.github.com> Date: Thu, 27 Apr 2023 13:50:36 -0600 Subject: [PATCH 30/39] Update shell_commands --- cime_config/usermods_dirs/NEON/FATES/defaults/shell_commands | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/usermods_dirs/NEON/FATES/defaults/shell_commands b/cime_config/usermods_dirs/NEON/FATES/defaults/shell_commands index aacfad8e15..a41a15018e 100644 --- a/cime_config/usermods_dirs/NEON/FATES/defaults/shell_commands +++ b/cime_config/usermods_dirs/NEON/FATES/defaults/shell_commands @@ -1,6 +1,6 @@ #!/bin/bash ./xmlchange CLM_USRDAT_NAME=NEON -# we should also ensure that this can be set to NEON.PRISM +# CLM_USRDAT_NAME can also be set to NEON.PRISM ./xmlchange CCSM_CO2_PPMV=408.83 # Set data forcing data to future scenario so will have data from 2018 to present-day ./xmlchange DATM_PRESAERO=SSP3-7.0 From 8303e3fa92b47bbbc17a260890c6cd03561e7ded Mon Sep 17 00:00:00 2001 From: Teagan King <98482480+TeaganKing@users.noreply.github.com> Date: Thu, 27 Apr 2023 13:51:47 -0600 Subject: [PATCH 31/39] Update shell_commands --- cime_config/usermods_dirs/NEON/YELL/shell_commands | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/usermods_dirs/NEON/YELL/shell_commands b/cime_config/usermods_dirs/NEON/YELL/shell_commands index 836f0ce5f1..a490e044b9 100644 --- a/cime_config/usermods_dirs/NEON/YELL/shell_commands +++ b/cime_config/usermods_dirs/NEON/YELL/shell_commands @@ -3,7 +3,7 @@ ./xmlchange PTS_LON=249.45803999999998 ./xmlchange PTS_LAT=44.95597 ./xmlchange DATM_YR_ALIGN=2019 -# NEON precipitation data for this siste is bad so end early +# NEON precipitation data for this site is bad so end early # If CLM_USRDAT_NAME is NEON.PRISM you can run to the end of the data if [ $CLM_USRDAT_NAME=='NEON' ] then From 5b772a609a3f663d55cc2f7b034a906150775b38 Mon Sep 17 00:00:00 2001 From: Teagan King <98482480+TeaganKing@users.noreply.github.com> Date: Thu, 27 Apr 2023 13:52:30 -0600 Subject: [PATCH 32/39] Update shell_commands --- cime_config/usermods_dirs/NEON/WREF/shell_commands | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/usermods_dirs/NEON/WREF/shell_commands b/cime_config/usermods_dirs/NEON/WREF/shell_commands index 34e3bdc881..ace585a894 100644 --- a/cime_config/usermods_dirs/NEON/WREF/shell_commands +++ b/cime_config/usermods_dirs/NEON/WREF/shell_commands @@ -3,7 +3,7 @@ ./xmlchange PTS_LON=238.04162 ./xmlchange PTS_LAT=45.81637 ./xmlchange DATM_YR_ALIGN=2019 -# NEON precipitation data for this siste is bad so end early +# NEON precipitation data for this site is bad so end early # If CLM_USRDAT_NAME is NEON.PRISM you can run to the end of the data if [ $CLM_USRDAT_NAME=='NEON' ] then From 20ba10632ba05612c32f7c2c0f0e752ae9e4b155 Mon Sep 17 00:00:00 2001 From: Teagan King <98482480+TeaganKing@users.noreply.github.com> Date: Thu, 27 Apr 2023 13:52:46 -0600 Subject: [PATCH 33/39] Update shell_commands --- cime_config/usermods_dirs/NEON/MLBS/shell_commands | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/usermods_dirs/NEON/MLBS/shell_commands b/cime_config/usermods_dirs/NEON/MLBS/shell_commands index 8967701e92..54d854e1b0 100644 --- a/cime_config/usermods_dirs/NEON/MLBS/shell_commands +++ b/cime_config/usermods_dirs/NEON/MLBS/shell_commands @@ -2,7 +2,7 @@ ./xmlchange NEONSITE=MLBS ./xmlchange PTS_LON=279.47575 ./xmlchange PTS_LAT=37.37783 -# NEON precipitation data for this siste is bad so end early +# NEON precipitation data for this site is bad so end early # If CLM_USRDAT_NAME is NEON.PRISM you can run to the end of the data if [ $CLM_USRDAT_NAME=='NEON'] then From 36028793c9f5ec66f535910556683dc027703d24 Mon Sep 17 00:00:00 2001 From: Teagan King <98482480+TeaganKing@users.noreply.github.com> Date: Thu, 27 Apr 2023 13:53:01 -0600 Subject: [PATCH 34/39] Update shell_commands --- cime_config/usermods_dirs/NEON/MOAB/shell_commands | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/usermods_dirs/NEON/MOAB/shell_commands b/cime_config/usermods_dirs/NEON/MOAB/shell_commands index 782863e9d0..93ca5e2870 100644 --- a/cime_config/usermods_dirs/NEON/MOAB/shell_commands +++ b/cime_config/usermods_dirs/NEON/MOAB/shell_commands @@ -2,7 +2,7 @@ ./xmlchange NEONSITE=MOAB ./xmlchange PTS_LON=250.61118 ./xmlchange PTS_LAT=38.25136 -# NEON precipitation data for this siste is bad so end early +# NEON precipitation data for this site is bad so end early # If CLM_USRDAT_NAME is NEON.PRISM you can run to the end of the data if [$CLM_USRDAT_NAME=='NEON']; then ./xmlchange DATM_YR_END=2020 From 5b71760a34e737a20e2e0e6c2070574481be059f Mon Sep 17 00:00:00 2001 From: Teagan King <98482480+TeaganKing@users.noreply.github.com> Date: Thu, 27 Apr 2023 13:53:19 -0600 Subject: [PATCH 35/39] Update shell_commands --- cime_config/usermods_dirs/NEON/NIWO/shell_commands | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/usermods_dirs/NEON/NIWO/shell_commands b/cime_config/usermods_dirs/NEON/NIWO/shell_commands index f5e9d1bab3..a33719a0b4 100644 --- a/cime_config/usermods_dirs/NEON/NIWO/shell_commands +++ b/cime_config/usermods_dirs/NEON/NIWO/shell_commands @@ -2,7 +2,7 @@ ./xmlchange NEONSITE=NIWO ./xmlchange PTS_LON=254.41676 ./xmlchange PTS_LAT=40.05236 -# NEON precipitation data for this siste is bad so end early +# NEON precipitation data for this site is bad so end early # If CLM_USRDAT_NAME is NEON.PRISM you can run to the end of the data if [ $CLM_USRDAT_NAME=="NEON" ] then From 42868ba4fdab31d4e01127036a6a30939a80e442 Mon Sep 17 00:00:00 2001 From: Teagan King <98482480+TeaganKing@users.noreply.github.com> Date: Thu, 27 Apr 2023 13:53:36 -0600 Subject: [PATCH 36/39] Update shell_commands --- cime_config/usermods_dirs/NEON/ONAQ/shell_commands | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/usermods_dirs/NEON/ONAQ/shell_commands b/cime_config/usermods_dirs/NEON/ONAQ/shell_commands index 07b9a43ccc..6185167008 100644 --- a/cime_config/usermods_dirs/NEON/ONAQ/shell_commands +++ b/cime_config/usermods_dirs/NEON/ONAQ/shell_commands @@ -2,7 +2,7 @@ ./xmlchange NEONSITE=ONAQ ./xmlchange PTS_LON=247.54755 ./xmlchange PTS_LAT=40.17760 -# NEON precipitation data for this siste is bad so end early +# NEON precipitation data for this site is bad so end early # If CLM_USRDAT_NAME is NEON.PRISM you can run to the end of the data if [ $CLM_USRDAT_NAME=='NEON' ] then From 46d107af4a77441f9678dacdb606c1a3add6f40f Mon Sep 17 00:00:00 2001 From: Teagan King <98482480+TeaganKing@users.noreply.github.com> Date: Thu, 27 Apr 2023 13:53:50 -0600 Subject: [PATCH 37/39] Update shell_commands --- cime_config/usermods_dirs/NEON/SJER/shell_commands | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/usermods_dirs/NEON/SJER/shell_commands b/cime_config/usermods_dirs/NEON/SJER/shell_commands index 9eb170ecea..3525405e09 100644 --- a/cime_config/usermods_dirs/NEON/SJER/shell_commands +++ b/cime_config/usermods_dirs/NEON/SJER/shell_commands @@ -3,7 +3,7 @@ ./xmlchange PTS_LON=240.267 ./xmlchange PTS_LAT=37.107117 ./xmlchange DATM_YR_ALIGN=2019 -# NEON precipitation data for this siste is bad so end early +# NEON precipitation data for this site is bad so end early # If CLM_USRDAT_NAME is NEON.PRISM you can run to the end of the data if [ $CLM_USRDAT_NAME=='NEON' ] then From 95c5c87f546f75db85dada70be48659c9cbbf4c0 Mon Sep 17 00:00:00 2001 From: Teagan King <98482480+TeaganKing@users.noreply.github.com> Date: Thu, 27 Apr 2023 13:54:04 -0600 Subject: [PATCH 38/39] Update shell_commands --- cime_config/usermods_dirs/NEON/TEAK/shell_commands | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/usermods_dirs/NEON/TEAK/shell_commands b/cime_config/usermods_dirs/NEON/TEAK/shell_commands index 5b067f56b1..f584056ba6 100644 --- a/cime_config/usermods_dirs/NEON/TEAK/shell_commands +++ b/cime_config/usermods_dirs/NEON/TEAK/shell_commands @@ -3,7 +3,7 @@ ./xmlchange PTS_LON=240.99424199999999 ./xmlchange PTS_LAT=37.006472 ./xmlchange DATM_YR_ALIGN=2019 -# NEON precipitation data for this siste is bad so end early +# NEON precipitation data for this site is bad so end early # If CLM_USRDAT_NAME is NEON.PRISM you can run to the end of the data if [ $CLM_USRDAT_NAME=='NEON'] then From b369985bb10ad75f9ce1c37f6d9840d56ceb0160 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Wed, 3 May 2023 10:49:06 -0600 Subject: [PATCH 39/39] Update CDEPS to version with NEON.PRISM changes in it --- Externals.cfg | 2 -- 1 file changed, 2 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index 85696ec980..9f6b4596fb 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -55,8 +55,6 @@ local_path = components/cmeps required = True [cdeps] -#tag = cdeps1.0.7 -branch = main tag = cdeps1.0.11 protocol = git repo_url = https://github.com/ESCOMP/CDEPS.git