Skip to content

Commit

Permalink
fix reduction
Browse files Browse the repository at this point in the history
  • Loading branch information
sehnem committed Feb 12, 2025
1 parent 176fc88 commit 6644aff
Showing 1 changed file with 22 additions and 5 deletions.
27 changes: 22 additions & 5 deletions pyrte_rrtmgp/rrtmgp_gas_optics.py
Original file line number Diff line number Diff line change
Expand Up @@ -373,9 +373,19 @@ def tau_absorption(
lower_gases_mask = np.isin(minor_gases_lower, self._gas_names)
upper_gases_mask = np.isin(minor_gases_upper, self._gas_names)

# TODO: Hardcoded 16, but shouldn't it be nbnd?
upper_gases_mask_expanded = np.repeat(upper_gases_mask, 16)
lower_gases_mask_expanded = np.repeat(lower_gases_mask, 16)
lower_gpt_sizes = (
(self._dataset["minor_limits_gpt_lower"].diff(dim="pair") + 1)
.transpose()
.values[0]
)
upper_gpt_sizes = (
(self._dataset["minor_limits_gpt_upper"].diff(dim="pair") + 1)
.transpose()
.values[0]
)

upper_gases_mask_expanded = np.repeat(upper_gases_mask, upper_gpt_sizes)
lower_gases_mask_expanded = np.repeat(lower_gases_mask, lower_gpt_sizes)

reduced_dataset = self._dataset.isel(
contributors_lower=lower_gases_mask_expanded
Expand Down Expand Up @@ -412,6 +422,13 @@ def tau_absorption(
idx_minor_scaling_lower = self.get_idx_minor(scaling_gas_lower)
idx_minor_scaling_upper = self.get_idx_minor(scaling_gas_upper)

kminor_start_lower = self._dataset["kminor_start_lower"].isel(
minor_absorber_intervals_lower=slice(nminorlower)
)
kminor_start_upper = self._dataset["kminor_start_upper"].isel(
minor_absorber_intervals_upper=slice(nminorupper)
)

pres_layer_var = atmosphere.mapping.get_var("pres_layer")
temp_layer_var = atmosphere.mapping.get_var("temp_layer")

Expand Down Expand Up @@ -446,8 +463,8 @@ def tau_absorption(
idx_minor_upper,
idx_minor_scaling_lower,
idx_minor_scaling_upper,
reduced_dataset["kminor_start_lower"],
reduced_dataset["kminor_start_upper"],
kminor_start_lower,
kminor_start_upper,
gas_interpolation_data["tropopause_mask"],
gas_interpolation_data["column_mix"],
gas_interpolation_data["fmajor"],
Expand Down

0 comments on commit 6644aff

Please sign in to comment.