Skip to content
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

Fix level bugs, part 2Ref #180 #181

Merged
merged 1 commit into from
Mar 8, 2024
Merged

Fix level bugs, part 2Ref #180 #181

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 18 additions & 16 deletions src/eva/data/mon_data_space.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,10 @@ def execute(self, dataset_config, data_collections, timing):

# Read station data file. Note that the variable dimensions
# will NOT be the same for different station data files.
# y_range is set here because it's the number of obs which is not in the control
# file and is only known once the ieee file is read.
darr, cycle_tm, dims, lat, lon = self.read_stn_ieee(filename, coords, dims,
ndims_used, dims_arr, vars)
x_range = np.arange(1, dims['xdef']+1)
y_range = np.arange(1, dims['ydef']+1)

else:
Expand Down Expand Up @@ -469,11 +470,10 @@ def get_ctl_dict(self, control_file):
# Ignore any coordinates in the control file that have a value of 1.
used = 0
mydef = ["xdef", "ydef", "zdef"]
for x in range(len(dim_list)):
if dim_list[x] > 2:
coords[mydef[used]] = coord_list[x]
dims[mydef[used]] = dim_list[x]
used += 1
for x in range(len(coord_list)):
coords[mydef[used]] = coord_list[x]
dims[mydef[used]] = dim_list[x]
used += 1

# If Scan is in the coords calculate the scan positions.
# scan_info[0] = num steps, [1] = start position, [2] = step size
Expand Down Expand Up @@ -861,20 +861,26 @@ def get_dim_ranges(self, coords, dims, channo, datatypes):
y_range = None
z_range = None

# - Return None for a coordinate that has value 0 or 1.
# - "Channel" can be either the x or y coordinate and can be
# - Return None for a dims['xdef'] or dims['ydef'] coordinate that has value 0.
# - Return None for a dims['zdef'] coordinate that has a value < 2. Some
# control files specify a non-existant zdef dimension which is interpreted
# by the control file parser as having a value of 1. That's the reasoning
# behind setting dims['zdef'] only if it's > 1.
#
# Additional special cases:
# - "Channel" can be either the x or y coordinate and can be
# numbered non-consecutively, which has been captured in channo.
# - The z coordinate is never used for channel.
# - DataType number has been captured in datatypes.

if dims['xdef'] > 1:
if dims['xdef'] > 0:
if coords['xdef'] == 'Channel':
x_range = channo
elif coords['xdef'] == 'DataType':
x_range = datatypes
else:
x_range = np.arange(1, dims['xdef']+1)

if dims['ydef'] > 1:
if dims['ydef'] > 0:
y_range = channo if coords['ydef'] == 'Channel' else np.arange(1, dims['ydef']+1)

if dims['zdef'] > 1:
Expand All @@ -899,14 +905,10 @@ def get_ndims_used(self, dims):

# Some ieee files (ozn) can be 1 or 2 dimensions depending on the
# number of levels used. Levels is the xdef, Regions is the ydef.
# All Ozn files use ydef, but many have xdef = 1. The dims_arr[]
# will return the name(s) of the dimensions actually used.

# Ignore dims with values of 0 or 1
ndims = len(dims)
dims_arr = []
for x in range(ndims):
if list(dims.values())[x] <= 1:
if list(dims.values())[x] <= 0:
ndims -= 1
else:
dims_arr.append(list(dims)[x])
Expand Down
Loading