Skip to content

added grid direction wrt north #1

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

Merged
hoonhout merged 4 commits into from
Jul 4, 2017
Merged

added grid direction wrt north #1

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
0d6fa73
added grid direction wrt north
Sierd Jul 3, 2017
6ea065a
Implement option for cartesian and nautical axis definition for wind …
Sierd Jul 4, 2017
c74b9ac
Changed parameter name to "wind_convention"
hoonhout Jul 4, 2017
362087b
Moved convention transformation
hoonhout Jul 4, 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
3 changes: 2 additions & 1 deletion aeolis/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,8 @@
'max_error' : 1e-6, # [-] Maximum error at which to quit iterative solution in implicit numerical schemes
'max_iter' : 1000, # [-] Maximum number of iterations at which to quit iterative solution in implicit numerical schemes
'refdate' : '1970-01-01 00:00', # [-] Reference datetime in netCDF output
'callback' : None, # Reference to callback function (e.g. example/callback.py':callback)
'callback' : None, # Reference to callback function (e.g. example/callback.py':callback)
'wind_convention' : 'cartesian', # Convention used for the wind direction in the input files
}


Expand Down
10 changes: 9 additions & 1 deletion aeolis/inout.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ def read_configfile(configfile, parse_files=True, load_defaults=True):
p[key.strip()] = parse_value(val, parse_files=parse_files)
else:
raise IOError('File not found [%s]' % configfile)

# normalize grain size distribution
if 'grain_dist' in p:
p['grain_dist'] = normalize(p['grain_dist'])
Expand Down Expand Up @@ -194,6 +194,14 @@ def check_configuration(p):
if p['wind_file'].ndim != 2 or p['wind_file'].shape[1] < 3:
raise ValueError('Invalid wind definition file')

# rotate nautical wind direction to cartesian grid
if p['wind_convention'] == 'cartesian':
pass
elif p['wind_convention'] == 'nautical':
p['wind_file'][:,2] = 270.0 - p['wind_file'][:,2]
else:
raise ValueError('Unknown convention: %s' % p['wind_convention'])

if isarray(p['tide_file']):
if p['tide_file'].ndim != 2 or p['tide_file'].shape[1] < 2:
raise ValueError('Invalid tide definition file')
Expand Down