Skip to content

Commit

Permalink
Merge branch 'develop' into feature/update_ibtracs_version
Browse files Browse the repository at this point in the history
  • Loading branch information
emanuel-schmid committed Dec 11, 2024
2 parents 9e529f2 + ec3ce59 commit 5f1759e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,6 @@ jobs:
needs: build-and-test
with:
core_branch: ${{ github.ref }}
petals_branch: feature/exposures_crs
petals_branch: develop
permissions:
checks: write
4 changes: 2 additions & 2 deletions climada/engine/impact.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ def __init__(
crs=DEF_CRS,
eai_exp=None,
at_event=None,
tot_value=0,
aai_agg=0,
tot_value=0.,
aai_agg=0.,
unit="",
imp_mat=None,
haz_type="",
Expand Down

0 comments on commit 5f1759e

Please sign in to comment.