Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 pydda/retrieval/wind_retrieve.py
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@ def _get_dd_wind_field_scipy(
~parameters.els[j][k].mask,
)
)
cur_array = parameters.bg_weights[k]
cur_array = parameters.bg_weights[k].copy()
cur_array[
np.logical_or.reduce(
(
Expand All @@ -574,9 +574,9 @@ def _get_dd_wind_field_scipy(
)
] = 1
cur_array[~valid] = 1
parameters.bg_weights[i] += cur_array
parameters.bg_weights[k] += cur_array
else:
parameters.bg_weights[i] = weights_bg[i]
parameters.bg_weights[k] = weights_bg[k]

print("Calculating weights for models...")
coverage_grade = parameters.weights.sum(axis=0)
Expand Down Expand Up @@ -1197,7 +1197,7 @@ def _get_dd_wind_field_tensorflow(
parameters.weights[i, k] = weights_obs[i][k, :, :]

if weights_bg is None:
cur_array = parameters.bg_weights[k]
cur_array = parameters.bg_weights[k].copy()
valid = np.logical_and.reduce(
(
~parameters.vrs[i][k].mask,
Expand Down Expand Up @@ -1243,9 +1243,9 @@ def _get_dd_wind_field_tensorflow(
)
] = 1
cur_array[~valid] = 1
parameters.bg_weights[i] += cur_array
parameters.bg_weights[k] += cur_array
else:
parameters.bg_weights[i] = weights_bg[i]
parameters.bg_weights[k] = weights_bg[k]

print("Calculating weights for models...")
coverage_grade = parameters.weights.sum(axis=0)
Expand Down
16 changes: 16 additions & 0 deletions pydda/tests/test_retrieval.py
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,22 @@ def test_twpice_case():
assert w_max > 5


def test_twpice_case_bg_weights():
"""Each level's background weights follow that level's coverage."""
kwargs = dict(
max_iterations=1, vel_name="corrected_velocity", refl_field="reflectivity"
)
_, parameters = pydda.retrieval.get_dd_wind_field(list(_twpice_grids()), **kwargs)
covered = parameters.weights.sum(axis=0) > 0
np.testing.assert_array_equal(parameters.bg_weights, np.where(covered, 0, 1))

weights_bg = np.random.default_rng(0).integers(0, 2, covered.shape)
_, parameters = pydda.retrieval.get_dd_wind_field(
list(_twpice_grids()), weights_bg=weights_bg, **kwargs
)
np.testing.assert_array_equal(parameters.bg_weights, weights_bg)


def test_twpice_case_parallel():
"""TWP-ICE case with parallel=True should produce physically consistent results
and match the serial retrieval."""
Expand Down
Loading