Skip to content

Commit

Permalink
Merge branch 'dev95_fix_glitches' of github.com:ekluzek/CTSM into dev…
Browse files Browse the repository at this point in the history
…95_fix_glitches
  • Loading branch information
ekluzek committed May 16, 2022
2 parents e2ce638 + e365008 commit 76584a6
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
1 change: 1 addition & 0 deletions python/ctsm/path_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 10 additions & 3 deletions tools/mkmapdata/mkmapdata.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/site_and_regional/modify_singlept_site_neon.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down

0 comments on commit 76584a6

Please sign in to comment.