diff --git a/okean/roms/roms.py b/okean/roms/roms.py index 6cfb444..de1eeb1 100644 --- a/okean/roms/roms.py +++ b/okean/roms/roms.py @@ -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 @@ -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)) @@ -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 @@ -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)) @@ -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 @@ -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] @@ -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) @@ -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! @@ -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))