From 2868bd6e099ffbd829b0e27c9dc2b009f0ffe1d7 Mon Sep 17 00:00:00 2001 From: Aidan Heerdegen Date: Fri, 19 May 2017 17:01:31 +1000 Subject: [PATCH 1/4] Removed requirement for mask file with MOM output --- makeic.py | 5 ----- regridder | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/makeic.py b/makeic.py index 672b332..3ca180f 100755 --- a/makeic.py +++ b/makeic.py @@ -37,11 +37,6 @@ def main(): assert args.reanalysis_name == 'GODAS' or args.reanalysis_name == 'ORAS4' or \ args.reanalysis_name == 'WOA' - if 'MOM' in args.model_name and args.model_mask is None: - print("When using model MOM please provide a mask using --model_mask", - file=sys.stderr) - return 1 - if os.path.exists(args.output_file): print("Output file {} already exists, ".format(args.output_file) + \ "please move or delete.", file=sys.stderr) diff --git a/regridder b/regridder index be42675..abc2908 160000 --- a/regridder +++ b/regridder @@ -1 +1 @@ -Subproject commit be4267513329a6a62553812b7158ecb6d0c74f5a +Subproject commit abc29088b07b594211e6ea45e1c1879c6eca695f From 2bf1eb1f53595146e084ef736049c58924dc32d9 Mon Sep 17 00:00:00 2001 From: Aidan Heerdegen Date: Wed, 26 Jul 2017 15:44:20 +1000 Subject: [PATCH 2/4] Updated regridder --- regridder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/regridder b/regridder index abc2908..18b93d1 160000 --- a/regridder +++ b/regridder @@ -1 +1 @@ -Subproject commit abc29088b07b594211e6ea45e1c1879c6eca695f +Subproject commit 18b93d1e02e3bac922cdb0199d96c29dc2d9fc72 From 3024a5356ba50cf1fc98a82904b5a4b16b8444df Mon Sep 17 00:00:00 2001 From: Aidan Heerdegen Date: Wed, 26 Jul 2017 16:23:34 +1000 Subject: [PATCH 3/4] Changed regridder submodule to point to aidanheerdegen fork --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 4f25a16..56f1c88 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "regridder"] path = regridder - url = https://github.com/nicjhan/ocean-regrid.git + url = git@github.com:aidanheerdegen/ocean-regrid.git From aa9e0562c32361a98f57f38fbb36eefa779da3c9 Mon Sep 17 00:00:00 2001 From: Aidan Heerdegen Date: Fri, 28 Jul 2017 10:16:38 +1000 Subject: [PATCH 4/4] Updated regridder submodule --- regridder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/regridder b/regridder index 18b93d1..863229d 160000 --- a/regridder +++ b/regridder @@ -1 +1 @@ -Subproject commit 18b93d1e02e3bac922cdb0199d96c29dc2d9fc72 +Subproject commit 863229d2e340cbb1ce21aefd5fb78ef061853f95