Commit 550a6bde authored by Cynthia Crowley's avatar Cynthia Crowley

Don't pass forcing vars as results_vars to compute_return_period in monthly,...

Don't pass forcing vars as results_vars to compute_return_period in monthly, pass forcing to integrated forecast, clean up comments
parent fc21d6d1
Pipeline #75418207 failed with stages
in 16 minutes and 41 seconds
......@@ -61,7 +61,7 @@ def monthly_observed(config: Config, yearmon: str, meta_steps: Dict[str, Step])
# Compute return periods
for window in [1] + config.integration_windows():
steps += compute_return_periods(config.workspace(),
result_vars=config.lsm_rp_vars() + config.forcing_rp_vars() if window == 1 else config.lsm_integrated_var_names(),
result_vars=config.lsm_rp_vars() if window == 1 else config.lsm_integrated_var_names(),
forcing_vars=config.forcing_rp_vars() if window==1 else config.forcing_integrated_var_names(),
yearmon=yearmon,
window=window)
......@@ -141,16 +141,13 @@ def monthly_forecast(config: Config,
for window in config.integration_windows():
# Time integrate the results
# steps += time_integrate(config.workspace(), config.lsm_integrated_stats(),
# window=window, yearmon=yearmon, target=target,
# member=member)
steps += time_integrate(config.workspace(), config.lsm_integrated_stats(), forcing = False, yearmon=yearmon, window=window, member=member, target=target)
steps += time_integrate(config.workspace(), config.forcing_integrated_stats(), forcing = True, yearmon=yearmon, window=window, member=member, target=target)
# Compute return periods
for window in [1] + config.integration_windows():
steps += compute_return_periods(config.workspace(),
forcing_vars=config.forcing_rp_vars() if window==1 else None,
forcing_vars=config.forcing_rp_vars() if window==1 else else config.forcing_integrated_var_names(),
result_vars=config.lsm_rp_vars() if window==1 else config.lsm_integrated_var_names(),
yearmon=yearmon,
window=window,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment