Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Update geometric_features to 1.2.0 #957

Merged
merged 2 commits into from
Apr 11, 2023
Merged

Update geometric_features to 1.2.0 #957

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69f8c38
Support for zmin/zmax from by region mask creator
xylar Apr 9, 2023
c048713
Update geometric_features version
xylar Apr 10, 2023
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
2 changes: 1 addition & 1 deletion ci/recipe/meta.yaml
View file
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ requirements:
- esmf >=8.0.0,<8.3.0
- esmf=*=nompi_*
- f90nml
- geometric_features >=1.0.0
- geometric_features >=1.2.0
- gsw
- lxml
- mache >=1.11.0
2 changes: 1 addition & 1 deletion dev-spec.txt
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ dask
esmf >=8.0.0,<8.3.0
esmf=*=nompi_*
f90nml
geometric_features>=1.0.0
geometric_features>=1.2.0
gsw
lxml
mache >=1.11.0
4 changes: 0 additions & 4 deletions mpas_analysis/ocean/regional_ts_diagrams.py
View file
Original file line number Diff line number Diff line change
@@ -632,8 +632,6 @@ def _write_mpas_t_s(self, config):
if 'zminRegions' in dsMask:
zmin = dsMask.zminRegions.values
else:
# the old naming convention, used in some pre-generated
# mask files
zmin = dsMask.zmin.values

if config.has_option(sectionName, 'zmax'):
@@ -642,8 +640,6 @@ def _write_mpas_t_s(self, config):
if 'zmaxRegions' in dsMask:
zmax = dsMask.zmaxRegions.values
else:
# the old naming convention, used in some pre-generated
# mask files
zmax = dsMask.zmax.values

inFileName = get_unmasked_mpas_climatology_file_name(
12 changes: 6 additions & 6 deletions mpas_analysis/ocean/time_series_ocean_regions.py
View file
Original file line number Diff line number Diff line change
@@ -354,8 +354,6 @@ def run_task(self):
if 'zminRegions' in dsRegion:
zmin = dsRegion.zminRegions.values
else:
# the old naming convention, used in some pre-generated
# mask files
zmin = dsRegion.zmin.values
else:
zmin = config_zmin
@@ -364,8 +362,6 @@ def run_task(self):
if 'zmaxRegions' in dsRegion:
zmax = dsRegion.zmaxRegions.values
else:
# the old naming convention, used in some pre-generated
# mask files
zmax = dsRegion.zmax.values
else:
zmax = config_zmax
@@ -901,13 +897,17 @@ def run_task(self):

if config.has_option(sectionName, 'zmin'):
zmin = config.getfloat(sectionName, 'zmin')
else:
elif 'zminRegions' in dsMask:
zmin = dsMask.zminRegions.values
else:
zmin = dsMask.zmin.values

if config.has_option(sectionName, 'zmax'):
zmax = config.getfloat(sectionName, 'zmax')
else:
elif 'zmaxRegions' in dsMask:
zmax = dsMask.zmaxRegions.values
else:
zmax = dsMask.zmax.values

TVarName = obsDict['TVar']
SVarName = obsDict['SVar']