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: Fix warning errors for scipy and numpy #1519

Merged
merged 2 commits into from
Feb 29, 2024
Merged

FIX: Fix warning errors for scipy and numpy #1519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
024b3a6
FIX: Fix use of round in region dealias
mgrover1 Feb 29, 2024
be49b09
FIX: Fix use of cumulative trapezoid with scipy in attenuation
mgrover1 Feb 29, 2024
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
12 changes: 6 additions & 6 deletions pyart/correct/attenuation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from warnings import warn

import numpy as np
from scipy.integrate import cumtrapz
from scipy.integrate import cumulative_trapezoid

from ..config import get_field_name, get_fillvalue, get_metadata
from ..filters import GateFilter, iso0_based_gate_filter, temp_based_gate_filter
Expand Down Expand Up @@ -278,7 +278,7 @@ def calculate_attenuation_zphi(
if (len(last_six_good)) == 6:
phidp_max = np.median(ray_phase_shift[last_six_good])
self_cons_number = 10.0 ** (0.1 * beta * a_coef * phidp_max) - 1.0
I_indef = cumtrapz(0.46 * beta * dr * ray_refl_linear[::-1])
I_indef = cumulative_trapezoid(0.46 * beta * dr * ray_refl_linear[::-1])
I_indef = np.append(I_indef, I_indef[-1])[::-1]

# set the specific attenutation and attenuation
Expand All @@ -288,7 +288,7 @@ def calculate_attenuation_zphi(
/ (I_indef[0] + self_cons_number * I_indef)
)

pia[ray, :-1] = cumtrapz(ah[ray, :]) * dr * 2.0
pia[ray, :-1] = cumulative_trapezoid(ah[ray, :]) * dr * 2.0
pia[ray, -1] = pia[ray, -2]

# if ZDR exists, set the specific differential attenuation
Expand All @@ -298,7 +298,7 @@ def calculate_attenuation_zphi(
ah[ray, 0 : end_gate_arr[ray]], d
)

pida[ray, :-1] = cumtrapz(adiff[ray, :]) * dr * 2.0
pida[ray, :-1] = cumulative_trapezoid(adiff[ray, :]) * dr * 2.0
pida[ray, -1] = pida[ray, -2]

# prepare output field dictionaries
Expand Down Expand Up @@ -1035,7 +1035,7 @@ def calculate_attenuation(
sm_refl = smooth_and_trim(ray_init_refl, window_len=5)
reflectivity_linear = 10.0 ** (0.1 * beta * sm_refl)
self_cons_number = 10.0 ** (0.1 * beta * a_coef * phidp_max) - 1.0
I_indef = cumtrapz(0.46 * beta * dr * reflectivity_linear[::-1])
I_indef = cumulative_trapezoid(0.46 * beta * dr * reflectivity_linear[::-1])
I_indef = np.append(I_indef, I_indef[-1])[::-1]

# set the specific attenutation and attenuation
Expand All @@ -1045,7 +1045,7 @@ def calculate_attenuation(
/ (I_indef[0] + self_cons_number * I_indef)
)

atten[i, :-1] = cumtrapz(specific_atten[i, :]) * dr * 2.0
atten[i, :-1] = cumulative_trapezoid(specific_atten[i, :]) * dr * 2.0
atten[i, -1] = atten[i, -2]

# prepare output field dictionaries
Expand Down
2 changes: 1 addition & 1 deletion pyart/correct/region_dealias.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ def dealias_region_based(
if ref_vdata is not None:
sref = ref_vdata[sweep_slice]
gfold = (sref - scorr).mean() / nyquist_interval
gfold = np.ma.round(gfold)
gfold = round(gfold)

# Anchor specific regions against reference velocity
# Do this by constraining cost function due to difference
Expand Down
Loading