From 69f8c388a313d5ff671dfe54e95f4e9c89961b35 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Sun, 9 Apr 2023 02:41:09 -0500 Subject: [PATCH 1/2] Support for zmin/zmax from by region mask creator --- mpas_analysis/ocean/regional_ts_diagrams.py | 4 ---- mpas_analysis/ocean/time_series_ocean_regions.py | 12 ++++++------ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/mpas_analysis/ocean/regional_ts_diagrams.py b/mpas_analysis/ocean/regional_ts_diagrams.py index 67cf6da93..e7bab4449 100644 --- a/mpas_analysis/ocean/regional_ts_diagrams.py +++ b/mpas_analysis/ocean/regional_ts_diagrams.py @@ -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( diff --git a/mpas_analysis/ocean/time_series_ocean_regions.py b/mpas_analysis/ocean/time_series_ocean_regions.py index d89c0daeb..be42e460f 100644 --- a/mpas_analysis/ocean/time_series_ocean_regions.py +++ b/mpas_analysis/ocean/time_series_ocean_regions.py @@ -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'] From c04871316d72237ef0409dd89a86c4a89526a68e Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Mon, 10 Apr 2023 04:11:06 -0500 Subject: [PATCH 2/2] Update geometric_features version --- ci/recipe/meta.yaml | 2 +- dev-spec.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/recipe/meta.yaml b/ci/recipe/meta.yaml index ba66b62a5..bcf4a22dd 100644 --- a/ci/recipe/meta.yaml +++ b/ci/recipe/meta.yaml @@ -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 diff --git a/dev-spec.txt b/dev-spec.txt index 870847aa0..18cb6956a 100644 --- a/dev-spec.txt +++ b/dev-spec.txt @@ -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