Skip to content

Commit 607c52a

Browse files
committed
Fixing codacy
1 parent 3d4ea1b commit 607c52a

3 files changed

Lines changed: 41 additions & 42 deletions

File tree

esmvaltool/cmorizers/data/downloaders/datasets/nsidc_g02202_nh.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# pylint: disable=too-many-arguments
22
# pylint: disable=too-many-function-args
3+
# pylint: disable=too-many-positional-arguments
4+
# pylint: disable=too-many-locals
35
"""Script to download NSIDC-G02202-nh."""
46
import logging
57
from datetime import datetime

esmvaltool/cmorizers/data/formatters/datasets/nsidc_g02202_nh.py

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -157,38 +157,32 @@ def cmorization(in_dir, out_dir, cfg, cfg_user, start_date, end_date):
157157
cmor_table = cfg["cmor_table"]
158158

159159
# get aux nc file
160-
cubesaux = iris.load(
161-
os.path.join(in_dir, "G02202-ancillary-psn25-v05r00.nc"))
162-
lat_coord = _create_coord(cubesaux, "lat", "latitude")
163-
lon_coord = _create_coord(cubesaux, "lon", "longitude")
164-
year = 1978
165-
# split by year..
160+
cubesaux = iris.load(os.path.join(in_dir, "G02202-ancillary-psn25-v05r00.nc"))
161+
coords = [_create_coord(cubesaux, "lat", "latitude"),
162+
_create_coord(cubesaux, "lon", "longitude")]
163+
166164
sample_cube = None
167-
for year in range(1979, 2025, 1):
165+
for year in range(1979, 2025):
168166
filepaths = _get_filepaths(in_dir, cfg["filename"], year)
169167

170-
if len(filepaths) > 0:
168+
if filepaths:
171169
logger.info("Found %d files in '%s'", len(filepaths), in_dir)
172170

173171
for var, var_info in cfg["variables"].items():
174172
logger.info("CMORizing variable '%s'", var)
175173
glob_attrs["mip"] = var_info["mip"]
176174
cmor_info = cmor_table.get_variable(var_info["mip"], var)
177-
raw_var = var_info.get("raw", var)
178175
sample_cube = _extract_variable(
179-
raw_var,
176+
var_info.get("raw", var),
180177
cmor_info,
181178
glob_attrs,
182179
filepaths,
183180
out_dir,
184-
[lat_coord, lon_coord],
181+
coords,
185182
)
186-
187183
else:
188184
logger.info("No files found ")
189185
logger.info("year: %d basename: %s", year, cfg["filename"])
190186

191-
year += 1
192-
193-
if sample_cube is not None:
194-
_create_areacello(cfg, in_dir, sample_cube, glob_attrs, out_dir)
187+
if sample_cube is not None:
188+
_create_areacello(cfg, in_dir, sample_cube, glob_attrs, out_dir)

esmvaltool/cmorizers/data/formatters/datasets/nsidc_g02202_sh.py

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# pylint: disable=unused-argument
2+
# pylint: disable=too-many-arguments
3+
# pylint: disable=too-many-function-args
4+
# pylint: disable=R0917
5+
# pylint: disable=E1121
6+
# flake8: noqa
17
"""ESMValTool CMORizer for Sea Ice Concentration CDR (Southern Hemisphere).
28

39
Tier
@@ -148,42 +154,39 @@ def _create_areacello(cfg, in_dir, sample_cube, glob_attrs, out_dir):
148154
utils.save_variable(cube, var_info.short_name, out_dir, glob_attrs,
149155
zlib=True)
150156

151-
152157
def cmorization(in_dir, out_dir, cfg, cfg_user, start_date, end_date):
153158
"""Cmorization func call."""
154-
glob_attrs = cfg['attributes']
155-
cmor_table = cfg['cmor_table']
159+
glob_attrs = cfg["attributes"]
160+
cmor_table = cfg["cmor_table"]
156161

157162
# get aux nc file
158-
cubesaux = iris.load(
159-
os.path.join(in_dir, 'G02202-ancillary-pss25-v05r00.nc'))
160-
lat_coord = _create_coord(cubesaux, 'lat', 'latitude')
161-
lon_coord = _create_coord(cubesaux, 'lon', 'longitude')
163+
cubesaux = iris.load(os.path.join(in_dir, "G02202-ancillary-pss25-v05r00.nc"))
164+
coords = [_create_coord(cubesaux, "lat", "latitude"),
165+
_create_coord(cubesaux, "lon", "longitude")]
162166

163-
year = 1978
164-
# split by year..
165167
sample_cube = None
166-
for year in range(1979, 2025, 1):
167-
168-
filepaths = _get_filepaths(in_dir, cfg['filename'], year)
168+
for year in range(1979, 2025):
169+
filepaths = _get_filepaths(in_dir, cfg["filename"], year)
169170

170-
if len(filepaths) > 0:
171-
logger.info("Year %d: Found %d files in '%s'",
172-
year, len(filepaths), in_dir)
171+
if filepaths:
172+
logger.info("Found %d files in '%s'", len(filepaths), in_dir)
173173

174-
for (var, var_info) in cfg['variables'].items():
174+
for var, var_info in cfg["variables"].items():
175175
logger.info("CMORizing variable '%s'", var)
176-
glob_attrs['mip'] = var_info['mip']
177-
cmor_info = cmor_table.get_variable(var_info['mip'], var)
178-
raw_var = var_info.get('raw', var)
179-
sample_cube = _extract_variable(raw_var, cmor_info,
180-
glob_attrs, filepaths,
181-
out_dir, [lat_coord,
182-
lon_coord])
183-
176+
glob_attrs["mip"] = var_info["mip"]
177+
cmor_info = cmor_table.get_variable(var_info["mip"], var)
178+
sample_cube = _extract_variable(
179+
var_info.get("raw", var),
180+
cmor_info,
181+
glob_attrs,
182+
filepaths,
183+
out_dir,
184+
coords,
185+
)
184186
else:
185-
logger.info("No files found year: %d basename: %s",
186-
year, cfg['filename'])
187+
logger.info("No files found ")
188+
logger.info("year: %d basename: %s", year, cfg["filename"])
187189

188190
if sample_cube is not None:
189191
_create_areacello(cfg, in_dir, sample_cube, glob_attrs, out_dir)
192+

0 commit comments

Comments
 (0)