From 5eeb381d29239387166d7092840b87de4594ff9c Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Thu, 12 May 2022 14:57:57 -0600 Subject: [PATCH 1/3] correct the path to cime python code --- python/ctsm/path_utils.py | 1 + 1 file changed, 1 insertion(+) diff --git a/python/ctsm/path_utils.py b/python/ctsm/path_utils.py index feb825fdff..7f669483b7 100644 --- a/python/ctsm/path_utils.py +++ b/python/ctsm/path_utils.py @@ -82,6 +82,7 @@ def add_cime_lib_to_path(standalone_only=False): cime_path = path_to_cime(standalone_only=standalone_only) prepend_to_python_path(cime_path) cime_lib_path = os.path.join(cime_path, + 'CIME', 'Tools') prepend_to_python_path(cime_lib_path) return cime_path From 55512baa524c5656ff9c0fa33198b5fe443c464a Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Fri, 13 May 2022 13:39:11 -0600 Subject: [PATCH 2/3] Changes to work on Casper --- tools/mkmapdata/mkmapdata.sh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/tools/mkmapdata/mkmapdata.sh b/tools/mkmapdata/mkmapdata.sh index 531ca5a60f..3cd2442d16 100755 --- a/tools/mkmapdata/mkmapdata.sh +++ b/tools/mkmapdata/mkmapdata.sh @@ -48,6 +48,13 @@ case $hostname in fi ;; + ##casper + casper* | crthc* ) + if [ -z "$CSMDATA" ]; then + CSMDATA=/glade/p/cesm/cseg/inputdata + fi + ;; + ##hobart/izumi/thorodin hobart* | izumi* | thorodin* ) if [ -z "$CSMDATA" ]; then @@ -395,9 +402,9 @@ case $hostname in fi ;; - ## DAV - pronghorn* | casper* ) - . /glade/u/apps/ch/opt/lmod/7.2.1/lmod/lmod/init/bash + ## Casper + casper* | crthc* ) + . /glade/u/apps/dav/opt/lmod/8.1.7/lmod/8.1.7/init/bash if [ -z "$REGRID_PROC" ]; then REGRID_PROC=8 fi From 8035af475c23f5e5b283878e56e8c7f07928a6df Mon Sep 17 00:00:00 2001 From: Negin Sobhani Date: Mon, 16 May 2022 13:41:19 -0600 Subject: [PATCH 3/3] PR to fix #1752 --- tools/site_and_regional/modify_singlept_site_neon.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/site_and_regional/modify_singlept_site_neon.py b/tools/site_and_regional/modify_singlept_site_neon.py index 1928653dcf..3610b0bb5c 100755 --- a/tools/site_and_regional/modify_singlept_site_neon.py +++ b/tools/site_and_regional/modify_singlept_site_neon.py @@ -436,7 +436,7 @@ def check_neon_time(): dictionary of *_surfaceData.csv files with the last modified """ listing_file = "listing.csv" - url = "https://neon-ncar.s3.data.neonscience.org/listing.csv" + url = "https://storage.neonscience.org/neon-ncar/listing.csv" download_file(url, listing_file)