Skip to content

Commit

Permalink
Water temperature on-boarding (#203)
Browse files Browse the repository at this point in the history
Water temperature on-boarding

Add rcp6p0 in the scenario list of core_hazards::cmip6_scenario_to_rcp
Fix get_hazard_data when the response is a list instead of float

---------

Signed-off-by: EglantineGiraud <eglantine.giraud@gmail.com>
  • Loading branch information
EglantineGiraud authored Dec 13, 2023
1 parent 46d4bc7 commit a84e053
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/physrisk/hazard_models/core_hazards.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ def cmip6_scenario_to_rcp(scenario: str):
elif scenario == "ssp585":
return "rcp8p5"
else:
if scenario not in ["rcp2p6", "rcp4p5", "rcp8p5", "historical"]:
if scenario not in ["rcp2p6", "rcp4p5", "rcp6p0", "rcp8p5", "historical"]:
raise ValueError(f"unexpected scenario {scenario}")
return scenario

Expand Down
2 changes: 1 addition & 1 deletion src/physrisk/requests.py
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ def _get_hazard_data(request: HazardDataRequest, hazard_model: HazardModel):
intensity_curves = [
IntensityCurve(intensities=list(resp.intensities), return_periods=list(resp.return_periods))
if isinstance(resp, hmHazardEventDataResponse)
else IntensityCurve(intensities=[float(resp.parameter)], return_periods=[])
else IntensityCurve(intensities=list(resp.parameters), return_periods=list(resp.param_defns))
if isinstance(resp, HazardParameterDataResponse)
else IntensityCurve(intensities=[], return_periods=[])
for resp in resps
Expand Down

0 comments on commit a84e053

Please sign in to comment.