Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix /g/data paths for gadi #189

Merged
merged 1 commit into from
Feb 25, 2020
Merged

fix /g/data paths for gadi #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions hashexe-public.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ if [[ -z "${ACCESS_OM_DIR}" ]]; then
fi

if [[ -z "${public}" ]]; then
public=/g/data4/ik11/inputs/access-om2/bin # if not called from update-commit-push.sh
public=/g/data/ik11/inputs/access-om2/bin # if not called from update-commit-push.sh
fi

if [ -w $public ]; then
bindir=$public
bindir=$public
else
echo "You don't have write access to $public. Exiting."
exit 1
Expand Down
2 changes: 1 addition & 1 deletion test/test_remapping_weights.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ def test_create_weights(self):
self.test_build_esmf()

cmd = os.path.join(os.getcwd(), 'tools', 'make_remap_weights.py')
jra55_dir = '/g/data1/ua8/JRA55-do/RYF/v1-3/'
jra55_dir = '/g/data/ua8/JRA55-do/RYF/v1-3/'
core_dir = os.path.join(helper.input_path, 'yatm_1deg')

# Change to contrib bin dir to use ESMF_RegridWeightGen
Expand Down
2 changes: 1 addition & 1 deletion tools/make_remap_weights.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
Run example:

./make_remap_weights.py /short/x77/nah599/access-om2/input/ \
/g/data1/ua8/JRA55-do/RYF/v1-3/
/g/data/ua8/JRA55-do/RYF/v1-3/
"""

def convert_to_scrip_output(weights):
Expand Down
8 changes: 4 additions & 4 deletions tools/make_remap_weights.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ module purge
module load openmpi
module load nco
module load esmf/7.1.0r-intel
module use /g/data3/hh5/public/modules
module use /g/data/hh5/public/modules
module load conda/analysis3

# Make all 1 deg weights.
time ./make_remap_weights.py /short/x77/nah599/access-om2/input/ /g/data1/ua8/JRA55-do/RYF/v1-3/ /short/x77/nah599/access-om2/input/yatm_1deg/ --ocean MOM1 --npes 256
time ./make_remap_weights.py /short/x77/nah599/access-om2/input/ /g/data/ua8/JRA55-do/RYF/v1-3/ /short/x77/nah599/access-om2/input/yatm_1deg/ --ocean MOM1 --npes 256

# Make all 0.25 deg weights.
time ./make_remap_weights.py /short/x77/nah599/access-om2/input/ /g/data1/ua8/JRA55-do/RYF/v1-3/ /short/x77/nah599/access-om2/input/yatm_1deg/ --ocean MOM025 --npes 256
time ./make_remap_weights.py /short/x77/nah599/access-om2/input/ /g/data/ua8/JRA55-do/RYF/v1-3/ /short/x77/nah599/access-om2/input/yatm_1deg/ --ocean MOM025 --npes 256

# Make all 0.1 deg weights.
time ./make_remap_weights.py /short/x77/nah599/access-om2/input/ /g/data1/ua8/JRA55-do/RYF/v1-3/ /short/x77/nah599/access-om2/input/yatm_1deg/ --ocean MOM01 --npes 256
time ./make_remap_weights.py /short/x77/nah599/access-om2/input/ /g/data/ua8/JRA55-do/RYF/v1-3/ /short/x77/nah599/access-om2/input/yatm_1deg/ --ocean MOM01 --npes 256
4 changes: 2 additions & 2 deletions tools/release.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def set_input_perms_recursively(path):

def update_input_data():

input_template = '/g/data4/ik11/inputs/access-om2/input_{}'
input_template = '/g/data/ik11/inputs/access-om2/input_{}'
input_rc = input_template.format('rc')

checksum = calc_checksum(input_rc)
Expand All @@ -125,7 +125,7 @@ def do_release(update_input_data=False):
for exp_name in EXP_NAMES:

# Build new exes.
exp = ExpTestHelper(exp_name, bin_path='/g/data4/ik11/inputs/access-om2/bin/')
exp = ExpTestHelper(exp_name, bin_path='/g/data/ik11/inputs/access-om2/bin/')
(yatm_exe, cice_exe, mom_exe), ret = exp.build()
if ret != 0:
print('Build failed for exp {}'.format(exp_name), file=sys.stderr)
Expand Down
2 changes: 1 addition & 1 deletion update-commit-push.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

set -e

export public=/g/data4/ik11/inputs/access-om2/bin # also used in hashexe-public.sh
export public=/g/data/ik11/inputs/access-om2/bin # also used in hashexe-public.sh
if [ -w $public ]; then
bindir=$public
else
Expand Down