Skip to content

Commit e07cebf

Browse files
evanmasonevanmason
committed
Cleaning towards pep8
1 parent be97419 commit e07cebf

File tree

5 files changed

+371
-568
lines changed

5 files changed

+371
-568
lines changed

‎eddy_tracker_configuration.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ DOMAIN:
2222
# Specify the AVISO product
2323
AVISO:
2424
AVISO_DT14: Yes # Use new AVISO DT14 data (e.g., Capet et al, 2014)
25-
# AVISO_FILES: 'dt_global_twosat_msla_h_XXXXXXXX_20140106.nc'
2625
AVISO_FILES: 'dt_global_twosat_msla_h_????????_20140106.nc'
2726
AVISO_DT14_SUBSAMP: No # subsample the dqily AVISO DT14
2827
DAYS_BTWN_RECORDS: 3 # sampling rate (days)
@@ -38,12 +37,9 @@ PATHS:
3837
# Path for saving of outputs
3938
SAVE_DIR: '/homelocal/emason/outputs/'
4039

41-
4240
# Reference Julian day (Julian date at Jan 1, 1992)
4341
JDAY_REFERENCE: 2448623.
4442

45-
46-
4743
# Define contouring parameters
4844
CONTOUR_PARAMETER:
4945
# Set Q contour spacing

‎make_eddy_track_AVISO.py‎

Lines changed: 34 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -450,8 +450,7 @@ def getEKE(self):
450450
"""
451451
self.u[:] = self.upad[self.jup0:self.jup1, self.iup0:self.iup1]
452452
self.v[:] = self.vpad[self.jup0:self.jup1, self.iup0:self.iup1]
453-
u, v = self.u.view(), self.v.view()
454-
self.eke[:] = u**2 + v**2
453+
self.eke[:] = self.u**2 + self.v**2
455454
self.eke *= 0.5
456455
return self
457456

@@ -804,8 +803,8 @@ def brypath(self, imin=0, imax=-1, jmin=0, jmax=-1):
804803
SMOOTHING = config['SMOOTHING']
805804
if SMOOTHING:
806805
if 'SLA' in DIAGNOSTIC_TYPE:
807-
ZWL = config['SMOOTHING_SLA']['ZWL']
808-
MWL = config['SMOOTHING_SLA']['MWL']
806+
ZWL = np.atleast_1d(config['SMOOTHING_SLA']['ZWL'])
807+
MWL = np.atleast_1d(config['SMOOTHING_SLA']['MWL'])
809808
SMOOTHING_TYPE = config['SMOOTHING_SLA']['TYPE']
810809
elif 'Q' in DIAGNOSTIC_TYPE:
811810
SMOOTH_FAC = config['SMOOTHING_Q']['SMOOTH_FAC']
@@ -941,34 +940,34 @@ def brypath(self, imin=0, imax=-1, jmin=0, jmax=-1):
941940
C_eddy.points = np.array([sla_grd.lon().ravel(),
942941
sla_grd.lat().ravel()]).T
943942

944-
A_eddy.EVOLVE_AMP_MIN = np.float(EVOLVE_AMP_MIN)
945-
A_eddy.EVOLVE_AMP_MAX = np.float(EVOLVE_AMP_MAX)
946-
A_eddy.EVOLVE_AREA_MIN = np.float(EVOLVE_AREA_MIN)
947-
A_eddy.EVOLVE_AREA_MAX = np.float(EVOLVE_AREA_MAX)
943+
A_eddy.EVOLVE_AMP_MIN = np.float64(EVOLVE_AMP_MIN)
944+
A_eddy.EVOLVE_AMP_MAX = np.float64(EVOLVE_AMP_MAX)
945+
A_eddy.EVOLVE_AREA_MIN = np.float64(EVOLVE_AREA_MIN)
946+
A_eddy.EVOLVE_AREA_MAX = np.float64(EVOLVE_AREA_MAX)
948947

949-
C_eddy.EVOLVE_AMP_MIN = np.float(EVOLVE_AMP_MIN)
950-
C_eddy.EVOLVE_AMP_MAX = np.float(EVOLVE_AMP_MAX)
951-
C_eddy.EVOLVE_AREA_MIN = np.float(EVOLVE_AREA_MIN)
952-
C_eddy.EVOLVE_AREA_MAX = np.float(EVOLVE_AREA_MAX)
948+
C_eddy.EVOLVE_AMP_MIN = np.float64(EVOLVE_AMP_MIN)
949+
C_eddy.EVOLVE_AMP_MAX = np.float64(EVOLVE_AMP_MAX)
950+
C_eddy.EVOLVE_AREA_MIN = np.float64(EVOLVE_AREA_MIN)
951+
C_eddy.EVOLVE_AREA_MAX = np.float64(EVOLVE_AREA_MAX)
953952

954953
A_eddy.i0, A_eddy.i1 = sla_grd.i0, sla_grd.i1
955954
A_eddy.j0, A_eddy.j1 = sla_grd.j0, sla_grd.j1
956955
C_eddy.i0, C_eddy.i1 = sla_grd.i0, sla_grd.i1
957956
C_eddy.j0, C_eddy.j1 = sla_grd.j0, sla_grd.j1
958957

959-
A_eddy.LONMIN, A_eddy.LONMAX = np.float(LONMIN), np.float(LONMAX)
960-
A_eddy.LATMIN, A_eddy.LATMAX = np.float(LATMIN), np.float(LATMAX)
961-
C_eddy.LONMIN, C_eddy.LONMAX = np.float(LONMIN), np.float(LONMAX)
962-
C_eddy.LATMIN, C_eddy.LATMAX = np.float(LATMIN), np.float(LATMAX)
958+
A_eddy.LONMIN, A_eddy.LONMAX = np.float64(LONMIN), np.float64(LONMAX)
959+
A_eddy.LATMIN, A_eddy.LATMAX = np.float64(LATMIN), np.float64(LATMAX)
960+
C_eddy.LONMIN, C_eddy.LONMAX = np.float64(LONMIN), np.float64(LONMAX)
961+
C_eddy.LATMIN, C_eddy.LATMAX = np.float64(LATMIN), np.float64(LATMAX)
963962

964-
A_eddy.RADMIN = np.float(RADMIN)
965-
A_eddy.RADMAX = np.float(RADMAX)
966-
A_eddy.AMPMIN = np.float(AMPMIN)
967-
A_eddy.AMPMAX = np.float(AMPMAX)
968-
C_eddy.RADMIN = np.float(RADMIN)
969-
C_eddy.RADMAX = np.float(RADMAX)
970-
C_eddy.AMPMIN = np.float(AMPMIN)
971-
C_eddy.AMPMAX = np.float(AMPMAX)
963+
A_eddy.RADMIN = np.float64(RADMIN)
964+
A_eddy.RADMAX = np.float64(RADMAX)
965+
A_eddy.AMPMIN = np.float64(AMPMIN)
966+
A_eddy.AMPMAX = np.float64(AMPMAX)
967+
C_eddy.RADMIN = np.float64(RADMIN)
968+
C_eddy.RADMAX = np.float64(RADMAX)
969+
C_eddy.AMPMIN = np.float64(AMPMIN)
970+
C_eddy.AMPMAX = np.float64(AMPMAX)
972971

973972
A_eddy.fillval = sla_grd.fillval
974973
C_eddy.fillval = sla_grd.fillval
@@ -985,12 +984,12 @@ def brypath(self, imin=0, imax=-1, jmin=0, jmax=-1):
985984
A_eddy.PIXEL_THRESHOLD = [PIXMIN, PIXMAX]
986985
C_eddy.PIXEL_THRESHOLD = [PIXMIN, PIXMAX]
987986

988-
A_eddy.AREA0 = np.float(AREA0)
989-
C_eddy.AREA0 = np.float(AREA0)
990-
A_eddy.AMP0 = np.float(AMP0)
991-
C_eddy.AMP0 = np.float(AMP0)
992-
A_eddy.DIST0 = np.float(DIST0)
993-
C_eddy.DIST0 = np.float(DIST0)
987+
A_eddy.AREA0 = np.float64(AREA0)
988+
C_eddy.AREA0 = np.float64(AREA0)
989+
A_eddy.AMP0 = np.float64(AMP0)
990+
C_eddy.AMP0 = np.float64(AMP0)
991+
A_eddy.DIST0 = np.float64(DIST0)
992+
C_eddy.DIST0 = np.float64(DIST0)
994993

995994
A_eddy.DAYS_BTWN_RECORDS = DAYS_BTWN_RECORDS
996995
C_eddy.DAYS_BTWN_RECORDS = DAYS_BTWN_RECORDS
@@ -1061,9 +1060,9 @@ def brypath(self, imin=0, imax=-1, jmin=0, jmax=-1):
10611060
elif 'Hanning' in SMOOTHING_TYPE:
10621061

10631062
print '------ applying %s passes of Hanning filter' \
1064-
% smooth_fac
1065-
# Do smooth_fac passes of 2d Hanning filter
1066-
sla = func_hann2d_fast(sla, smooth_fac)
1063+
% SMOOTH_FAC
1064+
# Do SMOOTH_FAC passes of 2d Hanning filter
1065+
sla = func_hann2d_fast(sla, SMOOTH_FAC)
10671066

10681067
else: Exception
10691068

@@ -1119,11 +1118,10 @@ def brypath(self, imin=0, imax=-1, jmin=0, jmax=-1):
11191118
C_eddy.slacopy = sla.copy()
11201119

11211120
# Get scalar speed
1122-
Uspd = sla_grd.u**2 + sla_grd.v**2
1123-
Uspd *= 0.5
1121+
Uspd = np.sqrt(sla_grd.u**2 + sla_grd.v**2)
11241122
Uspd = np.ma.masked_where(
11251123
sla_grd.mask[sla_grd.jup0:sla_grd.jup1,
1126-
sla_grd.iup0:sla_grd.iup1] == False,
1124+
sla_grd.iup0:sla_grd.iup1] == False,
11271125
Uspd)
11281126
A_eddy.Uspd = Uspd.copy()
11291127
C_eddy.Uspd = Uspd.copy()

‎make_eddy_track_ROMS.py‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -310,10 +310,10 @@
310310
C_savefile = "".join([savedir, 'eddy_tracks_cyclonic.nc'])
311311
C_eddy.qparameter = qparameter
312312
C_eddy.shape_err = shape_err
313-
A_eddy.radmin = np.float(radmin)
314-
A_eddy.radmax = np.float(radmax)
315-
C_eddy.radmin = np.float(radmin)
316-
C_eddy.radmax = np.float(radmax)
313+
A_eddy.radmin = np.float64(radmin)
314+
A_eddy.radmax = np.float64(radmax)
315+
C_eddy.radmin = np.float64(radmin)
316+
C_eddy.radmax = np.float64(radmax)
317317

318318
elif 'sla' in diag_type:
319319
A_savefile = "".join([savedir, 'eddy_tracks_SLA_anticyclonic.nc'])
@@ -328,16 +328,16 @@
328328
print '--- Pixel range = %s-%s' %(np.int(pixmin), np.int(pixmax))
329329
A_eddy.pixel_threshold = [pixmin, pixmax]
330330
C_eddy.pixel_threshold = [pixmin, pixmax]
331-
A_eddy.radmin = np.float(grd.get_resolution(radmin))
332-
A_eddy.radmax = np.float(grd.get_resolution(radmax))
333-
C_eddy.radmin = np.float(grd.get_resolution(radmin))
334-
C_eddy.radmax = np.float(grd.get_resolution(radmax))
331+
A_eddy.radmin = np.float64(grd.get_resolution(radmin))
332+
A_eddy.radmax = np.float64(grd.get_resolution(radmax))
333+
C_eddy.radmin = np.float64(grd.get_resolution(radmin))
334+
C_eddy.radmax = np.float64(grd.get_resolution(radmax))
335335

336336

337-
A_eddy.ampmin = np.float(ampmin)
338-
A_eddy.ampmax = np.float(ampmax)
339-
C_eddy.ampmin = np.float(ampmin)
340-
C_eddy.ampmax = np.float(ampmax)
337+
A_eddy.ampmin = np.float64(ampmin)
338+
A_eddy.ampmax = np.float64(ampmax)
339+
C_eddy.ampmin = np.float64(ampmin)
340+
C_eddy.ampmax = np.float64(ampmax)
341341

342342
A_eddy.interannual = False
343343
C_eddy.interannual = False
@@ -368,38 +368,38 @@
368368
A_eddy.sep_dist_fac = sep_dist_fac
369369
C_eddy.sep_dist_fac = sep_dist_fac
370370

371-
A_eddy.evolve_ammin = np.float(evolve_ammin)
372-
A_eddy.evolve_ammax = np.float(evolve_ammax)
373-
A_eddy.evolve_armin = np.float(evolve_armin)
374-
A_eddy.evolve_armax = np.float(evolve_armax)
371+
A_eddy.evolve_ammin = np.float64(evolve_ammin)
372+
A_eddy.evolve_ammax = np.float64(evolve_ammax)
373+
A_eddy.evolve_armin = np.float64(evolve_armin)
374+
A_eddy.evolve_armax = np.float64(evolve_armax)
375375

376-
C_eddy.evolve_ammin = np.float(evolve_ammin)
377-
C_eddy.evolve_ammax = np.float(evolve_ammax)
378-
C_eddy.evolve_armin = np.float(evolve_armin)
379-
C_eddy.evolve_armax = np.float(evolve_armax)
376+
C_eddy.evolve_ammin = np.float64(evolve_ammin)
377+
C_eddy.evolve_ammax = np.float64(evolve_ammax)
378+
C_eddy.evolve_armin = np.float64(evolve_armin)
379+
C_eddy.evolve_armax = np.float64(evolve_armax)
380380

381381
A_eddy.i0, A_eddy.i1 = grd.i0, grd.i1
382382
A_eddy.j0, A_eddy.j1 = grd.j0, grd.j1
383383
C_eddy.i0, C_eddy.i1 = grd.i0, grd.i1
384384
C_eddy.j0, C_eddy.j1 = grd.j0, grd.j1
385385

386-
A_eddy.lonmin, A_eddy.lonmax = np.float(lonmin), np.float(lonmax)
387-
A_eddy.latmin, A_eddy.latmax = np.float(latmin), np.float(latmax)
388-
C_eddy.lonmin, C_eddy.lonmax = np.float(lonmin), np.float(lonmax)
389-
C_eddy.latmin, C_eddy.latmax = np.float(latmin), np.float(latmax)
386+
A_eddy.lonmin, A_eddy.lonmax = np.float64(lonmin), np.float64(lonmax)
387+
A_eddy.latmin, A_eddy.latmax = np.float64(latmin), np.float64(latmax)
388+
C_eddy.lonmin, C_eddy.lonmax = np.float64(lonmin), np.float64(lonmax)
389+
C_eddy.latmin, C_eddy.latmax = np.float64(latmin), np.float64(latmax)
390390

391391
A_eddy.fillval = fillval
392392
C_eddy.fillval = fillval
393393
A_eddy.verbose = verbose
394394
C_eddy.verbose = verbose
395395

396396

397-
A_eddy.area0 = np.float(area0)
398-
C_eddy.area0 = np.float(area0)
399-
A_eddy.amp0 = np.float(amp0)
400-
C_eddy.amp0 = np.float(amp0)
401-
A_eddy.dist0 = np.float(dist0)
402-
C_eddy.dist0 = np.float(dist0)
397+
A_eddy.area0 = np.float64(area0)
398+
C_eddy.area0 = np.float64(area0)
399+
A_eddy.amp0 = np.float64(amp0)
400+
C_eddy.amp0 = np.float64(amp0)
401+
A_eddy.dist0 = np.float64(dist0)
402+
C_eddy.dist0 = np.float64(dist0)
403403

404404
start = True
405405
start_time = time.time()

0 commit comments

Comments
 (0)