From 34ea147a75012f1693bda712d213f91122e7356e Mon Sep 17 00:00:00 2001 From: sloosvel Date: Thu, 23 Jul 2020 13:08:38 +0200 Subject: [PATCH 1/2] Use masked array routines --- diagonals/regmean.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/diagonals/regmean.py b/diagonals/regmean.py index 8da71dc..7bc0d13 100644 --- a/diagonals/regmean.py +++ b/diagonals/regmean.py @@ -117,7 +117,7 @@ def _compute_regmean_2d_cpu(var, basins, area): weights = _compute_weights_2d(mask, area) regmean = np.empty(times) for t in range(times): - regmean[t] = np.average(var[t, :, :], axis=(0, 1), + regmean[t] = np.ma.average(var[t, :, :], axis=(0, 1), weights=np.squeeze(weights)) regmean_total[basin] = regmean return regmean_total @@ -148,7 +148,7 @@ def _compute_regmean_3d_cpu(var, basins, volume): weights = _compute_weights_3d(mask, volume) regmean = np.empty(times) for t in range(times): - regmean[t] = np.average(var[t, :, :, :], axis=(0, 1, 2), + regmean[t] = np.ma.average(var[t, :, :, :], axis=(0, 1, 2), weights=np.squeeze(weights)) regmean_total[basin] = regmean return regmean_total -- GitLab From d07c83d578517515e5c3018c6c17ea43624e043b Mon Sep 17 00:00:00 2001 From: Javier Vegas-Regidor Date: Thu, 23 Jul 2020 13:41:58 +0200 Subject: [PATCH 2/2] Fix flake8 --- diagonals/regmean.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/diagonals/regmean.py b/diagonals/regmean.py index 7bc0d13..efce77b 100644 --- a/diagonals/regmean.py +++ b/diagonals/regmean.py @@ -117,8 +117,8 @@ def _compute_regmean_2d_cpu(var, basins, area): weights = _compute_weights_2d(mask, area) regmean = np.empty(times) for t in range(times): - regmean[t] = np.ma.average(var[t, :, :], axis=(0, 1), - weights=np.squeeze(weights)) + regmean[t] = np.ma.average( + var[t, :, :], axis=(0, 1), weights=np.squeeze(weights)) regmean_total[basin] = regmean return regmean_total @@ -148,8 +148,8 @@ def _compute_regmean_3d_cpu(var, basins, volume): weights = _compute_weights_3d(mask, volume) regmean = np.empty(times) for t in range(times): - regmean[t] = np.ma.average(var[t, :, :, :], axis=(0, 1, 2), - weights=np.squeeze(weights)) + regmean[t] = np.ma.average( + var[t, :, :, :], axis=(0, 1, 2), weights=np.squeeze(weights)) regmean_total[basin] = regmean return regmean_total -- GitLab