Skip to content

Merge pull request #1 from martalmeida/master #5

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
moghimis wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Merge pull request #1 from martalmeida/master #5

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a35f77b
Merge pull request #1 from martalmeida/master
moghimis Apr 11, 2017
1d7ae33
wave-plume paper
moghimis Jul 8, 2017
20e707c
Works ok on app01
Sep 21, 2018
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
46 changes: 23 additions & 23 deletions okean/roms/roms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,7 +756,7 @@ def _default_coords(slc):

def slicei(self,varname,ind,time=0,**opts):
coords=opts.get('coords',self._default_coords('slicei')).split(',')

coords=['x','y','z','d']
out=Data()
out.msg=self.check_slice(varname,t=time,i=ind)
if out.msg: return out
Expand Down Expand Up @@ -787,8 +787,8 @@ def slicei(self,varname,ind,time=0,**opts):
if 'd' in coords:
d=calc.distance(x,y)
if d[-1]-d[0]>1e4:
d=d/1000.
dunits='km'
d=d #d/1000.
dunits'm' #='km'
else: dunits='m'

if v.ndim==2: d=np.tile(d,(v.shape[0],1))
Expand Down Expand Up @@ -823,7 +823,7 @@ def slicei(self,varname,ind,time=0,**opts):

def slicej(self,varname,ind,time=0,**opts):
coords=opts.get('coords',self._default_coords('slicej')).split(',')

coords=['x','y','z','d']
out=Data()
out.msg=self.check_slice(varname,t=time,j=ind)
if out.msg: return out
Expand Down Expand Up @@ -854,8 +854,8 @@ def slicej(self,varname,ind,time=0,**opts):
if 'd' in coords:
d=calc.distance(x,y)
if d[-1]-d[0]>1e4:
d=d/1000.
dunits='km'
d=d #d/1000.
dunits'm' #='km'
else: dunits='m'

if v.ndim==2: d=np.tile(d,(v.shape[0],1))
Expand Down Expand Up @@ -890,7 +890,7 @@ def slicej(self,varname,ind,time=0,**opts):

def slicek(self,varname,ind,time=0,**opts):
coords=opts.get('coords',self._default_coords('slicek')).split(',')

coords=['x','y','z','d']
out=Data()
out.msg=self.check_slice(varname,t=time,k=ind)
if out.msg: out
Expand Down Expand Up @@ -924,16 +924,16 @@ def slicek(self,varname,ind,time=0,**opts):
out.x=x
out.info['x']=dict(name='Longitude',units=r'$\^o$E')
else:
out.x=x/1000.
out.info['x']=dict(name='Distance',units='km')
out.x=x #/1000.
out.info['x']=dict(name='Distance',units='m')

if 'y' in coords:
if self.grid.is_spherical:
out.y=y
out.info['y']=dict(name='Latitude',units=r'$\^o$N')
else:
out.y=y/1000.
out.info['y']=dict(name='Distance',units='km')
out.y=y#/1000.
out.info['y']=dict(name='Distance',units='m')

if 't' in coords and self.hast(varname): out.t=self.time[time]

Expand Down Expand Up @@ -989,16 +989,16 @@ def slicez(self,varname,ind,time=0,**opts):
out.x=x
out.info['x']=dict(name='Longitude',units=r'$\^o$E')
else:
out.x=x/1000.
out.info['x']=dict(name='Distance',units='km')
out.x=x#/1000.
out.info['x']=dict(name='Distance',units='m')

if 'y' in coords:
if self.grid.is_spherical:
out.y=y
out.info['y']=dict(name='Latitude',units=r'$\^o$N')
else:
out.y=y/1000.
out.info['y']=dict(name='Distance',units='km')
out.y=y#/1000.
out.info['y']=dict(name='Distance',units='m')

if 'z' in coords:
out.z=ind+np.zeros(out.v.shape)
Expand Down Expand Up @@ -1250,16 +1250,16 @@ def sliceiso(self,varname,iso,time,**opts):
out.x=x
out.info['x']=dict(name='Longitude',units=r'$\^o$E')
else:
out.x=x/1000.
out.info['x']=dict(name='Distance',units='km')
out.x=x#/1000.
out.info['x']=dict(name='Distance',units='m')

if 'y' in coords:
if self.grid.is_spherical:
out.y=y
out.info['y']=dict(name='Latitude',units=r'$\^o$N')
else:
out.y=y/1000.
out.info['y']=dict(name='Distance',units='km')
out.y=y#/1000.
out.info['y']=dict(name='Distance',units='m')

if 'z' in coords:
# makes no sense... v is the depth!
Expand Down Expand Up @@ -1381,16 +1381,16 @@ def time_series(self,varname,x,y,times=None,depth=None,**opts):
if self.grid.is_spherical:
out.info['x']=dict(name='Longitude',units=r'$\^o$E')
else:
out.x=x/1000.
out.info['x']=dict(name='X-position',units='km')
out.x=x#/1000.
out.info['x']=dict(name='X-position',units='m')

if 'y' in coords:
out.y=lat[i,j]
if self.grid.is_spherical:
out.info['y']=dict(name='Latitude',units=r'$\^o$N')
else:
out.y=y/1000.
out.info['y']=dict(name='Y-position',units='km')
out.y=y#/1000.
out.info['y']=dict(name='Y-position',units='m')


out.coordsReq=','.join(sorted(coords))
Expand Down