From 49b8fb2f6ff4d6a4b12ec8ba41f2938f4252c8b5 Mon Sep 17 00:00:00 2001 From: Andrew Kiss <31054815+aekiss@users.noreply.github.com> Date: Mon, 4 Apr 2022 10:26:10 +1000 Subject: [PATCH 1/9] update esmgrids submodule --- tools/esmgrids | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/esmgrids b/tools/esmgrids index 130c8d0..514b560 160000 --- a/tools/esmgrids +++ b/tools/esmgrids @@ -1 +1 @@ -Subproject commit 130c8d00774c624c196fc2ca15f5cad78c4cdbc1 +Subproject commit 514b560adf7b9094081408da49ecb3e19ef0353b From 180b77d2a47486d223bbc9c5b72b9d6e0cc2ac7d Mon Sep 17 00:00:00 2001 From: Andrew Kiss <31054815+aekiss@users.noreply.github.com> Date: Mon, 11 Apr 2022 11:13:10 +1000 Subject: [PATCH 2/9] update to Nic's /g/data/v45/nah599/access-om2/tools/make_remap_weights.* to support ERA5; https://github.com/COSIMA/esmgrids/issues/4 ; https://github.com/COSIMA/access-om2/issues/242 --- tools/make_remap_weights.py | 90 +++++++++++++++++-------------------- tools/make_remap_weights.sh | 4 +- 2 files changed, 43 insertions(+), 51 deletions(-) diff --git a/tools/make_remap_weights.py b/tools/make_remap_weights.py index 18b5850..c84c327 100755 --- a/tools/make_remap_weights.py +++ b/tools/make_remap_weights.py @@ -19,6 +19,7 @@ from esmgrids.mom_grid import MomGrid # noqa from esmgrids.core2_grid import Core2Grid # noqa from esmgrids.jra55_grid import Jra55Grid # noqa +from esmgrids.era5_grid import Era5Grid # noqa from esmgrids.jra55_river_grid import Jra55RiverGrid # noqa from esmgrids.daitren_runoff_grid import DaitrenRunoffGrid # noqa @@ -121,9 +122,9 @@ def create_weights(src_grid, dest_grid, npes, method, return regrid_weights -def find_grid_defs(input_dir, jra55_input, core_input): +def find_ocean_grid_defs(input_dir): """ - Return a dictionary containing the grid definition files. + Return a dictionary containing ocean grid definition files. """ d = {} @@ -133,27 +134,19 @@ def find_grid_defs(input_dir, jra55_input, core_input): os.path.join(input_dir, 'mom_025deg', 'ocean_mask.nc')) d['MOM01'] = (os.path.join(input_dir, 'mom_01deg', 'ocean_hgrid.nc'), os.path.join(input_dir, 'mom_01deg', 'ocean_mask.nc')) - d['CORE2'] = os.path.join(core_input, 't_10.0001.nc') - d['JRA55'] = os.path.join(jra55_input, 'RYF.t_10.1990_1991.nc') - d['JRA55_runoff'] = os.path.join(jra55_input, - 'RYF.runoff_all.1990_1991.nc') - d['Daitren_runoff'] = os.path.join(core_input, 'runoff.daitren.clim.10FEB2011.nc') - return d def main(): parser = argparse.ArgumentParser() - parser.add_argument('input_dir', help=""" + parser.add_argument('--accessom2_input_dir', required=True, help=""" The ACCESS-OM2 input directory.""") - parser.add_argument('jra55_input', help=""" - The JRA55 input directory.""") - parser.add_argument('core_input', help=""" - The CORE input directory.""") - parser.add_argument('--atm', default=None, help=""" + parser.add_argument('--atm_forcing_file', required=True, help=""" + An atmospheric or runoff forcing field.""") + parser.add_argument('--atm', required=True, default=None, help=""" Atmosphere grid to regrid from, can be one of: - CORE2, JRA55, JRA55_runoff, Daitren_runoff""") + CORE2, JRA55, JRA55_runoff, Daitren_runoff, ERA5""") parser.add_argument('--ocean', default=None, help=""" Ocean grid to regrid to, can be one of: MOM1, MOM01, MOM025""") @@ -161,23 +154,19 @@ def main(): The interpolation method to use, can be patch, conserve or conserve2nd""") parser.add_argument('--npes', default=None, help=""" The number of PEs to use.""") - parser.add_argument('--unmask_dest', + parser.add_argument('--unmask_dest', action='store_true', help='Ignore destination grid mask') args = parser.parse_args() - atm_options = ['JRA55', 'JRA55_runoff', 'CORE2', 'Daitren_runoff'] + atm_options = ['JRA55', 'JRA55_runoff', 'CORE2', 'Daitren_runoff', 'ERA5'] ocean_options = ['MOM1', 'MOM025', 'MOM01'] method_options = ['patch', 'conserve', 'conserve2nd'] - if args.atm is None: - args.atm = atm_options - else: - if args.atm not in atm_options: - print("Error: bad atm grid.", file=sys.stderr) - parser.print_help() - return 1 - args.atm = [args.atm] + if args.atm not in atm_options: + print("Error: bad atm grid.", file=sys.stderr) + parser.print_help() + return 1 if args.ocean is None: args.ocean = ocean_options @@ -197,37 +186,38 @@ def main(): import multiprocessing as mp args.npes = mp.cpu_count() // 2 - grid_file_dict = find_grid_defs(args.input_dir, args.jra55_input, args.core_input) + ocean_grid_file_dict = find_ocean_grid_defs(args.accessom2_input_dir) for ocean in args.ocean: - umask_file = grid_file_dict[ocean][1] - dest_grid = MomGrid.fromfile(grid_file_dict[ocean][0], + umask_file = ocean_grid_file_dict[ocean][1] + dest_grid = MomGrid.fromfile(ocean_grid_file_dict[ocean][0], mask_file=umask_file) - for atm in args.atm: - - if atm == 'CORE2': - src_grid = Core2Grid(grid_file_dict[atm]) - elif atm == 'Daitren_runoff': - src_grid = DaitrenRunoffGrid(grid_file_dict[atm]) - elif atm == 'JRA55': - src_grid = Jra55Grid(grid_file_dict[atm]) - elif atm == 'JRA55_runoff': - src_grid = Jra55RiverGrid(grid_file_dict[atm], calc_areas=False) - else: - print('Unrecognised atmosphere grid: {}'.format(atm)) - return 1 - for method in args.method: + if args.atm == 'CORE2': + src_grid = Core2Grid(args.atm_forcing_file) + elif args.atm == 'Daitren_runoff': + src_grid = DaitrenRunoffGrid(args.atm_forcing_file) + elif args.atm == 'JRA55': + src_grid = Jra55Grid(args.atm_forcing_file) + elif args.atm == 'JRA55_runoff': + src_grid = Jra55RiverGrid(args.atm_forcing_file, calc_areas=False) + elif args.atm == 'ERA5': + src_grid = Era5Grid(args.atm_forcing_file) + else: + print('Unrecognised atmosphere grid: {}'.format(atm)) + return 1 + + for method in args.method: - weights = create_weights(src_grid, dest_grid, args.npes, - method, unmasked_dest=args.unmask_dest) - if not weights: - return 1 - weights = convert_to_scrip_output(weights) - if not weights: - return 1 + weights = create_weights(src_grid, dest_grid, args.npes, + method, unmasked_dest=args.unmask_dest) + if not weights: + return 1 + weights = convert_to_scrip_output(weights) + if not weights: + return 1 - shutil.move(weights, '{}_{}_{}.nc'.format(atm, ocean, method)) + shutil.move(weights, '{}_{}_{}.nc'.format(args.atm, ocean, method)) return 0 diff --git a/tools/make_remap_weights.sh b/tools/make_remap_weights.sh index 0496a9c..8d031a9 100644 --- a/tools/make_remap_weights.sh +++ b/tools/make_remap_weights.sh @@ -7,10 +7,12 @@ module purge module load openmpi module load nco -module load esmf/7.1.0r-intel +module load esmf module use /g/data/hh5/public/modules module load conda/analysis3 +ulimit -s unlimited + # Make all 1 deg weights. 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 From 0af85863e23e739d284bb8e6b86af2c0f12c0ba7 Mon Sep 17 00:00:00 2001 From: Andrew Kiss <31054815+aekiss@users.noreply.github.com> Date: Mon, 11 Apr 2022 11:36:32 +1000 Subject: [PATCH 3/9] bug fix in tools/make_remap_weights.py --- tools/make_remap_weights.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/make_remap_weights.py b/tools/make_remap_weights.py index c84c327..1c619ca 100755 --- a/tools/make_remap_weights.py +++ b/tools/make_remap_weights.py @@ -204,7 +204,7 @@ def main(): elif args.atm == 'ERA5': src_grid = Era5Grid(args.atm_forcing_file) else: - print('Unrecognised atmosphere grid: {}'.format(atm)) + print('Unrecognised atmosphere grid: {}'.format(args.atm)) return 1 for method in args.method: From 4f6c1de30dd2674c82ffab8f272d9cd2a6f55bc9 Mon Sep 17 00:00:00 2001 From: Andrew Kiss <31054815+aekiss@users.noreply.github.com> Date: Mon, 11 Apr 2022 12:00:46 +1000 Subject: [PATCH 4/9] improve help in tools/make_remap_weights.py --- tools/make_remap_weights.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/make_remap_weights.py b/tools/make_remap_weights.py index 1c619ca..074fd09 100755 --- a/tools/make_remap_weights.py +++ b/tools/make_remap_weights.py @@ -149,9 +149,9 @@ def main(): CORE2, JRA55, JRA55_runoff, Daitren_runoff, ERA5""") parser.add_argument('--ocean', default=None, help=""" Ocean grid to regrid to, can be one of: - MOM1, MOM01, MOM025""") + MOM1, MOM01, MOM025; default is all three""") parser.add_argument('--method', default=None, help=""" - The interpolation method to use, can be patch, conserve or conserve2nd""") + The interpolation method to use, can be patch, conserve or conserve2nd; default is all three""") parser.add_argument('--npes', default=None, help=""" The number of PEs to use.""") parser.add_argument('--unmask_dest', From eb2dcde1148b84ed7c8a2bc9a1539ec5a42270d1 Mon Sep 17 00:00:00 2001 From: Andrew Kiss <31054815+aekiss@users.noreply.github.com> Date: Mon, 11 Apr 2022 16:05:41 +1000 Subject: [PATCH 5/9] add updated ESMF build scripts --- tools/contrib/build_esmf_on_gadi.sh | 27 ++++++++++++++++++++ tools/contrib/build_fixed_esmf_on_gadi.sh | 30 +++++++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100755 tools/contrib/build_esmf_on_gadi.sh create mode 100755 tools/contrib/build_fixed_esmf_on_gadi.sh diff --git a/tools/contrib/build_esmf_on_gadi.sh b/tools/contrib/build_esmf_on_gadi.sh new file mode 100755 index 0000000..24bd55a --- /dev/null +++ b/tools/contrib/build_esmf_on_gadi.sh @@ -0,0 +1,27 @@ +#!/bin/bash +set -x +set -e + +git archive --remote=git://git.code.sf.net/p/esmf/esmf --format=tar --prefix=esmf/ ESMF_7_1_0r | tar xf - +#module load netcdf/4.7.4 +module load netcdf/4.6.3 +#module load intel-compiler/2020.2.254 +module load intel-compiler/2019.3.199 +#module load gcc +mkdir -p bin +cd esmf +export ESMF_DIR=$(pwd) +export ESMF_F90COMPILER=ifort +export ESMF_F90LINKER=ifort +export ESMF_NETCDF=nc-config +#export ESMF_NETCDF="split" +export ESMF_NETCDF_INCLUDE=$NETCDF_ROOT/include +export ESMF_NETCDF_LIBPATH=$NETCDF_ROOT/lib +export ESMF_NETCDF_LIBS="-lnetcdff -lnetcdf" +make clean +make +cd src/apps/ESMF_RegridWeightGen +make +cd ../../../../ +cp esmf/apps/appsO/*/ESMF_RegridWeightGen bin/ +export PATH=$(pwd)/bin:$PATH diff --git a/tools/contrib/build_fixed_esmf_on_gadi.sh b/tools/contrib/build_fixed_esmf_on_gadi.sh new file mode 100755 index 0000000..971cefa --- /dev/null +++ b/tools/contrib/build_fixed_esmf_on_gadi.sh @@ -0,0 +1,30 @@ +#!/bin/bash +set -x +set -e + +# use Russ' fixed code - see https://github.com/COSIMA/access-om2/issues/216 +git clone https://github.com/COSIMA/esmf.git || true +cd esmf +git checkout f536c3e12d501e2ee1d4caf95cb425f5be6e84d3 + +#module load netcdf/4.7.4 +module load netcdf/4.6.3 +#module load intel-compiler/2020.2.254 +module load intel-compiler/2019.3.199 +#module load gcc +export ESMF_DIR=$(pwd) +export ESMF_F90COMPILER=ifort +export ESMF_F90LINKER=ifort +export ESMF_NETCDF=nc-config +#export ESMF_NETCDF="split" +export ESMF_NETCDF_INCLUDE=$NETCDF_ROOT/include +export ESMF_NETCDF_LIBPATH=$NETCDF_ROOT/lib +export ESMF_NETCDF_LIBS="-lnetcdff -lnetcdf" +make clean +make +cd src/apps/ESMF_RegridWeightGen +make +cd ../../../../ +mkdir -p bin +cp esmf/apps/appsO/*/ESMF_RegridWeightGen bin/ESMF_RegridWeightGen_f536c3e12d +export PATH=$(pwd)/bin:$PATH From 1de68cdd4459733b82db7e051bcf6ed1bfad984b Mon Sep 17 00:00:00 2001 From: Andrew Kiss <31054815+aekiss@users.noreply.github.com> Date: Mon, 11 Apr 2022 16:34:17 +1000 Subject: [PATCH 6/9] update make_remap_weights.* --- tools/make_remap_weights.py | 15 ++++++++------- tools/make_remap_weights.sh | 19 +++++++++++-------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/tools/make_remap_weights.py b/tools/make_remap_weights.py index 074fd09..f55a6a8 100755 --- a/tools/make_remap_weights.py +++ b/tools/make_remap_weights.py @@ -26,10 +26,8 @@ """ This script makes all of the remapping weights for ACCESS-OM2. -Run example: +See make_remap_weights.sh for run examples -./make_remap_weights.py /short/x77/nah599/access-om2/input/ \ -/g/data/ua8/JRA55-do/RYF/v1-3/ """ def convert_to_scrip_output(weights): @@ -98,11 +96,14 @@ def create_weights(src_grid, dest_grid, npes, method, ignore_unmapped = [] try: - cmd = ['mpirun', '-np', str(npes), 'ESMF_RegridWeightGen'] + \ - ['--netcdf4', + cmd = ['mpirun', '-np', str(npes), + '/g/data/ik11/inputs/access-om2/bin/ESMF_RegridWeightGen_f536c3e12d', + '--netcdf4', '-s', src_grid_scrip, - '-d', dest_grid_scrip, '-m', method, - '-w', regrid_weights] + ignore_unmapped + '-d', dest_grid_scrip, + '-m', method, + '-w', regrid_weights] \ + + ignore_unmapped print(cmd) sp.check_output(cmd) except sp.CalledProcessError as e: diff --git a/tools/make_remap_weights.sh b/tools/make_remap_weights.sh index 8d031a9..6727df6 100644 --- a/tools/make_remap_weights.sh +++ b/tools/make_remap_weights.sh @@ -1,23 +1,26 @@ #!/bin/bash #PBS -P x77 #PBS -q normal -#PBS -l ncpus=256,mem=512GB,walltime=05:00:00,jobfs=100GB +#PBS -l ncpus=288,mem=512GB,walltime=05:00:00,jobfs=100GB #PBS -l wd +#PBS -lstorage=scratch/v45+gdata/hh5+gdata/ik11+gdata/ua8 module purge -module load openmpi +module load python3-as-python module load nco -module load esmf module use /g/data/hh5/public/modules module load conda/analysis3 - -ulimit -s unlimited +module unload openmpi +module load openmpi/4.0.2 # Make all 1 deg weights. -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 +time ./make_remap_weights.py /g/data/ik11/inputs/access-om2/input_20201102 /g/data/ua8/JRA55-do/RYF/v1-3/ /g/data/ik11/inputs/access-om2/input_20201102/yatm_1deg/ --ocean MOM1 --npes 288 --atm JRA55 +time ./make_remap_weights.py /g/data/ik11/inputs/access-om2/input_20201102 /g/data/ua8/JRA55-do/RYF/v1-3/ /g/data/ik11/inputs/access-om2/input_20201102/yatm_1deg/ --ocean MOM1 --npes 288 --atm ERA5 # Make all 0.25 deg weights. -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 +time ./make_remap_weights.py /g/data/ik11/inputs/access-om2/input_20201102 /g/data/ua8/JRA55-do/RYF/v1-3/ /g/data/ik11/inputs/access-om2/input_20201102/yatm_025deg/ --ocean MOM025 --npes 288 --atm JRA55 +time ./make_remap_weights.py /g/data/ik11/inputs/access-om2/input_20201102 /g/data/ua8/JRA55-do/RYF/v1-3/ /g/data/ik11/inputs/access-om2/input_20201102/yatm_025deg/ --ocean MOM025 --npes 288 --atm ERA5 # Make all 0.1 deg weights. -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 +time ./make_remap_weights.py /g/data/ik11/inputs/access-om2/input_20201102 /g/data/ua8/JRA55-do/RYF/v1-3/ /g/data/ik11/inputs/access-om2/input_20201102/yatm_01deg/ --ocean MOM01 --npes 288 --atm JRA55 +time ./make_remap_weights.py /g/data/ik11/inputs/access-om2/input_20201102 /g/data/ua8/JRA55-do/RYF/v1-3/ /g/data/ik11/inputs/access-om2/input_20201102/yatm_01deg/ --ocean MOM01 --npes 288 --atm ERA5 From 94e7e0191da89dc28c927e4da7f2ee7fcb70fbbd Mon Sep 17 00:00:00 2001 From: Ryan Holmes Date: Tue, 12 Apr 2022 08:50:00 +1000 Subject: [PATCH 7/9] Fix arguments to make_remap_weights.py in make_remap_weights.sh. --- tools/make_remap_weights.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/make_remap_weights.sh b/tools/make_remap_weights.sh index 6727df6..9266caf 100644 --- a/tools/make_remap_weights.sh +++ b/tools/make_remap_weights.sh @@ -14,13 +14,13 @@ module unload openmpi module load openmpi/4.0.2 # Make all 1 deg weights. -time ./make_remap_weights.py /g/data/ik11/inputs/access-om2/input_20201102 /g/data/ua8/JRA55-do/RYF/v1-3/ /g/data/ik11/inputs/access-om2/input_20201102/yatm_1deg/ --ocean MOM1 --npes 288 --atm JRA55 -time ./make_remap_weights.py /g/data/ik11/inputs/access-om2/input_20201102 /g/data/ua8/JRA55-do/RYF/v1-3/ /g/data/ik11/inputs/access-om2/input_20201102/yatm_1deg/ --ocean MOM1 --npes 288 --atm ERA5 +time ./make_remap_weights.py --accessom2_input_dir /g/data/ik11/inputs/access-om2/input_20201102 --atm_forcing_file /g/data/ua8/JRA55-do/RYF/v1-3/RYF.t_10.1990_1991.nc --ocean MOM1 --npes 288 --atm JRA55 +time ./make_remap_weights.py --accessom2_input_dir /g/data/ik11/inputs/access-om2/input_20201102 --atm_forcing_file /g/data/rt52/era5/single-levels/reanalysis/2t/1980/2t_era5_oper_sfc_19800101-19800131.nc --ocean MOM1 --npes 288 --atm ERA5 # Make all 0.25 deg weights. -time ./make_remap_weights.py /g/data/ik11/inputs/access-om2/input_20201102 /g/data/ua8/JRA55-do/RYF/v1-3/ /g/data/ik11/inputs/access-om2/input_20201102/yatm_025deg/ --ocean MOM025 --npes 288 --atm JRA55 -time ./make_remap_weights.py /g/data/ik11/inputs/access-om2/input_20201102 /g/data/ua8/JRA55-do/RYF/v1-3/ /g/data/ik11/inputs/access-om2/input_20201102/yatm_025deg/ --ocean MOM025 --npes 288 --atm ERA5 +time ./make_remap_weights.py --accessom2_input_dir /g/data/ik11/inputs/access-om2/input_20201102 --atm_forcing_file /g/data/ua8/JRA55-do/RYF/v1-3/RYF.t_10.1990_1991.nc --ocean MOM025 --npes 288 --atm JRA55 +time ./make_remap_weights.py --accessom2_input_dir /g/data/ik11/inputs/access-om2/input_20201102 --atm_forcing_file /g/data/rt52/era5/single-levels/reanalysis/2t/1980/2t_era5_oper_sfc_19800101-19800131.nc --ocean MOM025 --npes 288 --atm ERA5 # Make all 0.1 deg weights. -time ./make_remap_weights.py /g/data/ik11/inputs/access-om2/input_20201102 /g/data/ua8/JRA55-do/RYF/v1-3/ /g/data/ik11/inputs/access-om2/input_20201102/yatm_01deg/ --ocean MOM01 --npes 288 --atm JRA55 -time ./make_remap_weights.py /g/data/ik11/inputs/access-om2/input_20201102 /g/data/ua8/JRA55-do/RYF/v1-3/ /g/data/ik11/inputs/access-om2/input_20201102/yatm_01deg/ --ocean MOM01 --npes 288 --atm ERA5 +time ./make_remap_weights.py --accessom2_input_dir /g/data/ik11/inputs/access-om2/input_20201102 --atm_forcing_file /g/data/ua8/JRA55-do/RYF/v1-3/RYF.t_10.1990_1991.nc --ocean MOM01 --npes 288 --atm JRA55 +time ./make_remap_weights.py --accessom2_input_dir /g/data/ik11/inputs/access-om2/input_20201102 --atm_forcing_file /g/data/rt52/era5/single-levels/reanalysis/2t/1980/2t_era5_oper_sfc_19800101-19800131.nc --ocean MOM01 --npes 288 --atm ERA5 From 3b5e9b1c769bffe2ae16e94e0a23fe50abe11287 Mon Sep 17 00:00:00 2001 From: Andrew Kiss <31054815+aekiss@users.noreply.github.com> Date: Tue, 12 Apr 2022 14:03:57 +1000 Subject: [PATCH 8/9] remove option of conserve2nd in make_remap_weights.py --- tools/make_remap_weights.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/make_remap_weights.py b/tools/make_remap_weights.py index f55a6a8..fbd6058 100755 --- a/tools/make_remap_weights.py +++ b/tools/make_remap_weights.py @@ -152,7 +152,7 @@ def main(): Ocean grid to regrid to, can be one of: MOM1, MOM01, MOM025; default is all three""") parser.add_argument('--method', default=None, help=""" - The interpolation method to use, can be patch, conserve or conserve2nd; default is all three""") + The interpolation method to use, can be patch or conserve; default is both""") parser.add_argument('--npes', default=None, help=""" The number of PEs to use.""") parser.add_argument('--unmask_dest', @@ -162,7 +162,8 @@ def main(): args = parser.parse_args() atm_options = ['JRA55', 'JRA55_runoff', 'CORE2', 'Daitren_runoff', 'ERA5'] ocean_options = ['MOM1', 'MOM025', 'MOM01'] - method_options = ['patch', 'conserve', 'conserve2nd'] +# method_options = ['patch', 'conserve', 'conserve2nd'] + method_options = ['patch', 'conserve'] if args.atm not in atm_options: print("Error: bad atm grid.", file=sys.stderr) From 7b9f985478753ea5bc3bbf8851ca0bb5db760fe3 Mon Sep 17 00:00:00 2001 From: Andrew Kiss <31054815+aekiss@users.noreply.github.com> Date: Tue, 12 Apr 2022 16:11:45 +1000 Subject: [PATCH 9/9] fix storage flag in tools/make_remap_weights.sh --- tools/make_remap_weights.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/make_remap_weights.sh b/tools/make_remap_weights.sh index 9266caf..2ccabe2 100644 --- a/tools/make_remap_weights.sh +++ b/tools/make_remap_weights.sh @@ -3,7 +3,7 @@ #PBS -q normal #PBS -l ncpus=288,mem=512GB,walltime=05:00:00,jobfs=100GB #PBS -l wd -#PBS -lstorage=scratch/v45+gdata/hh5+gdata/ik11+gdata/ua8 +#PBS -lstorage=scratch/v45+gdata/hh5+gdata/ik11+gdata/ua8+gdata/rt52 module purge module load python3-as-python