Skip to content

Commit 7f01819

Browse files
AnthonyAnthony
authored andcommitted
Responding to suggestion from Ian on my pull request.
1 parent 44eb56c commit 7f01819

File tree

4 files changed

+17
-13
lines changed

4 files changed

+17
-13
lines changed

freanalysis_aerosol/freanalysis_aerosol/__init__.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
@dataclass
1212
class Metadata:
1313
"""Helper class that stores the metadata needed by the plugin."""
14-
frequency: str = "monthly"object
14+
frequency: str = "monthly"
1515
realm: str = "atmos"
1616

1717
@staticmethod
@@ -206,5 +206,4 @@ def run_analysis(self, catalog, png_dir, reference_catalog=None, config={}):
206206
)
207207
figure.save(Path(png_dir) / f"{name}.png")
208208
figure_paths.append(Path(png_dir)/ f"{name}.png")
209-
return figure_paths
210-
object
209+
return figure_paths

freanalysis_land/freanalysis_land/land.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212

1313
class LandAnalysisScript(AnalysisScript):
14-
"""Abstract base class for analysis scripts. User-defined analysis scripts
15-
should inhert from this class and override the requires and run_analysis methods.
14+
"""A class for performing various analysis tasks relating to GFDL land model output,
15+
inherits from the AnalysisScipt base class.
1616
1717
Attributes:
1818
description: Longer form description for the analysis.
@@ -78,7 +78,7 @@ def global_map(self,dataset,var,dates,plt_time=None,colormap='viridis',title='')
7878
lon = dataset.lon
7979
lat = dataset.lat
8080

81-
if plt_time == None: plt_time=len(dates)-1
81+
if plt_time is None: plt_time=len(dates)-1
8282

8383
data = dataset[var][plt_time].values
8484
projection = ccrs.PlateCarree()
@@ -157,7 +157,7 @@ def timeseries(self, dataset,var,dates_period,var_range=None,minlon = 0,maxlon =
157157
calculates the monthly and annual means of the specified variable and plots the seasonal and annual means.
158158
159159
'''
160-
if var_range != None:
160+
if var_range is not None:
161161
data_filtered = dataset.where((dataset[var] > var_range[0]) & (dataset[var] <= var_range[1]) &
162162
(dataset.lat >= minlat) & (dataset.lon >= minlon) &
163163
(dataset.lat <= maxlat) & (dataset.lon <= maxlon))
@@ -171,7 +171,7 @@ def timeseries(self, dataset,var,dates_period,var_range=None,minlon = 0,maxlon =
171171
data_df['monthly_mean'] = data_filtered.resample(time='YE').mean(dim=['lat','lon'],skipna=True)[var].values
172172
data_df['monthly_shift'] = data_df['monthly_mean'].shift(1)
173173

174-
if timerange != None:
174+
if timerange is not None:
175175
ys, ye = (str(timerange[0]),str(timerange[1]))
176176
plot_df = data_df.loc[f'{ys}-1-1':f'{ye}-1-1']
177177
else:

tests/my_land_analysis.py

Lines changed: 0 additions & 5 deletions
This file was deleted.

tests/test_freanalysis_land.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
2+
3+
from freanalysis_land.land import LandAnalysisScript
4+
5+
def test_land_analysis_script():
6+
land = LandAnalysisScript()
7+
land.run_analysis("/work/a2p/lm4p2sc_GSWP3_hist_irr_catalog.json","/work/a2p/")
8+
9+
10+
test_land_analysis_script()

0 commit comments

Comments
 (0)