Skip to content

Removed requirement for mask file with MOM output #2

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

Open
aidanheerdegen wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Removed requirement for mask file with MOM output #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2868bd6
Removed requirement for mask file with MOM output
aidanheerdegen May 19, 2017
2bf1eb1
Updated regridder
aidanheerdegen Jul 26, 2017
3024a53
Changed regridder submodule to point to aidanheerdegen fork
aidanheerdegen Jul 26, 2017
aa9e056
Updated regridder submodule
aidanheerdegen Jul 28, 2017
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
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "regridder"]
path = regridder
url = https://github.com/nicjhan/ocean-regrid.git
url = git@github.com:aidanheerdegen/ocean-regrid.git
5 changes: 0 additions & 5 deletions makeic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion regridder
Open in desktop
Submodule regridder updated 3 files
+6 −3 mom_grid.py
+0 −7 regrid.py
+2 −2 util.py