From 7088012030392011c6a6df44db7fd01c6f40ea24 Mon Sep 17 00:00:00 2001 From: Daniel Wolfensberger Date: Mon, 22 Jan 2024 15:11:38 +0100 Subject: [PATCH] pointer to pyart --- src/pyart | 2 +- src/pyrad_proc/pyrad/__init__.py | 3 +-- src/pyrad_proc/pyrad/graph/plots_aux.py | 2 +- src/pyrad_proc/pyrad/proc/process_monitoring.py | 5 +++++ src/pyrad_proc/pyrad/proc/process_phase.py | 9 +++++++++ 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/pyart b/src/pyart index c22412a1d..87c347793 160000 --- a/src/pyart +++ b/src/pyart @@ -1 +1 @@ -Subproject commit c22412a1d2b2bb2615b68bc2635966a35713d5ca +Subproject commit 87c34779348212528577e24e3221d9b45536eedb diff --git a/src/pyrad_proc/pyrad/__init__.py b/src/pyrad_proc/pyrad/__init__.py index 2deadbda1..ce67f88d6 100755 --- a/src/pyrad_proc/pyrad/__init__.py +++ b/src/pyrad_proc/pyrad/__init__.py @@ -3,7 +3,6 @@ ===================================== """ - # Detect if we're being called as part of Pyrad's setup procedure try: __PYRAD_SETUP__ @@ -19,7 +18,7 @@ # Make sure that deprecation warnings get printed by default import warnings as _warnings _warnings.simplefilter("always", DeprecationWarning) - + # print out helpful message if build fails or importing from source tree # fvj built not checked for the moment # from . import __check_build diff --git a/src/pyrad_proc/pyrad/graph/plots_aux.py b/src/pyrad_proc/pyrad/graph/plots_aux.py index 2be92f7fe..6ad6bba77 100755 --- a/src/pyrad_proc/pyrad/graph/plots_aux.py +++ b/src/pyrad_proc/pyrad/graph/plots_aux.py @@ -449,7 +449,7 @@ def get_norm(field_name, field_dict={}, isxarray=False): ticklabs = None ref_dict = pyart.config.get_metadata(field_name) - cmap = mpl.cm.get_cmap(pyart.config.get_field_colormap(field_name)) + cmap = mpl.colormaps.get_cmap(pyart.config.get_field_colormap(field_name)) if field_dict is not None and 'boundaries' in field_dict: if isxarray: diff --git a/src/pyrad_proc/pyrad/proc/process_monitoring.py b/src/pyrad_proc/pyrad/proc/process_monitoring.py index 4fd4209c2..423432d9d 100755 --- a/src/pyrad_proc/pyrad/proc/process_monitoring.py +++ b/src/pyrad_proc/pyrad/proc/process_monitoring.py @@ -138,6 +138,7 @@ def process_selfconsistency_kdp_phidp(procstatus, dscfg, radar_list=None): return None, None fzl = None + temp_ref ='fixed_fzl' # determine which freezing level reference if temp is not None: if temp in radar.fields: @@ -399,6 +400,7 @@ def process_selfconsistency_bias(procstatus, dscfg, radar_list=None): return None, None fzl = None + temp_ref ='fixed_fzl' # determine which freezing level reference if temp is not None: if temp in radar.fields: @@ -719,6 +721,7 @@ def process_selfconsistency_bias2(procstatus, dscfg, radar_list=None): return None, None fzl = None + temp_ref ='fixed_fzl' # determine which freezing level reference if temp is not None: if temp in radar.fields: @@ -1068,6 +1071,7 @@ def process_rhohv_rain(procstatus, dscfg, radar_list=None): return None, None fzl = None + temp_ref ='fixed_fzl' # determine which freezing level reference if temp_field is not None: if temp_field in radar.fields: @@ -1238,6 +1242,7 @@ def process_zdr_precip(procstatus, dscfg, radar_list=None): # if data in and above the melting layer has to be filtered determine the # field to use fzl = None + temp_ref = 'fixed_fzl' ml_filter = True if 'ml_filter' in dscfg: ml_filter = dscfg['ml_filter'] diff --git a/src/pyrad_proc/pyrad/proc/process_phase.py b/src/pyrad_proc/pyrad/proc/process_phase.py index 6f85d26c8..7480b2214 100755 --- a/src/pyrad_proc/pyrad/proc/process_phase.py +++ b/src/pyrad_proc/pyrad/proc/process_phase.py @@ -21,6 +21,7 @@ process_attenuation """ +import warnings from copy import deepcopy from warnings import warn @@ -32,6 +33,11 @@ from ..io.io_aux import get_datatype_fields from ..io.read_data_sensor import read_fzl_igra +# Ignore warning in process_phidp_kdp_Maesaka +warnings.filterwarnings("ignore", + message=".*'partition' will ignore the 'mask' of the MaskedArray.*", + category=UserWarning) + def process_correct_phidp0(procstatus, dscfg, radar_list=None): """ corrects phidp of the system phase @@ -438,6 +444,7 @@ def process_phidp_kdp_Maesaka(procstatus, dscfg, radar_list=None): thickness = dscfg.get('ml_thickness', 700.) fzl = None + temp_ref = 'fixed_fzl' # determine which freezing level reference if temp_field is not None: if temp_field in radar.fields: @@ -624,6 +631,7 @@ def process_phidp_kdp_lp(procstatus, dscfg, radar_list=None): return None, None fzl = None + temp_ref = 'fixed_fzl' # determine which freezing level reference if temp_field is not None: if temp_field in radar.fields: @@ -1169,6 +1177,7 @@ def process_attenuation(procstatus, dscfg, radar_list=None): # determine which freezing level reference fzl = None + temp_ref = 'fixed_fzl' if temp is not None: if temp in radar.fields: temp_ref = 'temperature'