Skip to content

Commit 09f8de4

Browse files
samblessambles
authored
Revert "Feature/multiple footprint file options (#152)" (#155)
This reverts commit 4906988.
1 parent 4906988 commit 09f8de4

18 files changed

+152
-58
lines changed

‎.github/workflows/integration.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -190,13 +190,13 @@ jobs:
190190
--build-arg oasislmf_package=${{ inputs.oasislmf_package }} \
191191
--build-arg oasislmf_branch=${{ inputs.oasislmf_branch }} \
192192
--build-arg ods_package=${{ inputs.ods_package }} \
193-
--build-arg ods_tools_branch=${{ inputs.ods_branch }} \
193+
--build-arg ods_branch=${{ inputs.ods_branch }} \
194194
-t ${{ env.WORKER_IMG }}:piwind-test-${{ github.sha }} .
195195
196196
docker build -f ${{ env.DOCKERFILE_SERVER }} \
197197
--pull \
198198
--build-arg ods_package=${{ inputs.ods_package }} \
199-
--build-arg ods_tools_branch=${{ inputs.ods_branch }} \
199+
--build-arg ods_branch=${{ inputs.ods_branch }} \
200200
-t ${{ env.SERVER_IMG }}:piwind-test-${{ github.sha }} .
201201
202202
- name: Override Image Env

‎.github/workflows/run_mdk.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ env:
6565

6666
jobs:
6767
ods_tools:
68-
if: ${{ inputs.ods_branch != '' || github.event_name != 'workflow_dispatch' }}
68+
if: inputs.ods_branch != ''
6969
uses: OasisLMF/ODS_Tools/.github/workflows/build.yml@main
7070
secrets: inherit
7171
with:
72-
ods_branch: ${{ github.event_name != 'workflow_dispatch' && 'main' || inputs.ods_branch }}
72+
ods_branch: ${{ inputs.ods_branch }}
7373

7474
run_mdk:
7575
if: ${{ ! failure() || ! cancelled() }}

‎.github/workflows/test.yml

+1-24
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@ on:
2525
description: "Branch from oasislmf to test piwind with [git ref]"
2626
required: True
2727
type: string
28-
ods_branch:
29-
description: 'Build ods_tools package before test [git ref]'
30-
required: false
31-
type: string
32-
3328

3429
workflow_call:
3530
inputs:
@@ -43,11 +38,6 @@ on:
4338
required: false
4439
type: string
4540

46-
ods_branch:
47-
description: 'Build ods_tools package before test [git ref]'
48-
required: false
49-
type: string
50-
5141
oasislmf_package:
5242
description: "Oasislmf package build to test [pkg_filename]"
5343
required: false
@@ -76,8 +66,6 @@ on:
7666
env:
7767
oasislmf_branch: 'main'
7868
oasislmf_package: ''
79-
ods_branch: 'main'
80-
ods_package: ''
8169
piwind_branch: ${{ github.ref }}
8270
platform_tag: 'latest'
8371

@@ -89,7 +77,6 @@ jobs:
8977
piwind_branch: ${{ steps.export_param.outputs.piwind_branch }}
9078
oasislmf_branch: ${{ steps.export_param.outputs.oasislmf_branch }}
9179
oasislmf_package: ${{ steps.export_param.outputs.oasislmf_package }}
92-
ods_branch: ${{ steps.export_param.outputs.ods_branch }}
9380
ods_package: ${{ steps.export_param.outputs.ods_package }}
9481
platform_version: ${{ steps.export_param.outputs.platform_version }}
9582

@@ -100,7 +87,6 @@ jobs:
10087
[[ -z "${{ inputs.platform_version }}" ]] || echo "platform_tag=${{ inputs.platform_version }}" >> $GITHUB_ENV
10188
echo "oasislmf_branch=${{ inputs.oasislmf_branch }}" >> $GITHUB_ENV
10289
echo "oasislmf_package=${{ inputs.oasislmf_package }}" >> $GITHUB_ENV
103-
echo "ods_branch=${{ inputs.ods_branch }}" >> $GITHUB_ENV
10490
echo "ods_package=${{ inputs.ods_package }}" >> $GITHUB_ENV
10591
10692
- name: Update params (Push)
@@ -116,7 +102,6 @@ jobs:
116102
if [[ -z "${{ inputs.piwind_branch }}" ]]; then
117103
# Pull Request from PiWind (Set MDK)
118104
echo "oasislmf_branch=${{ github.base_ref }}" >> $GITHUB_ENV
119-
echo "ods_branch=main" >> $GITHUB_ENV
120105
else
121106
# Pull Request from OasisLMF (Set piwind)
122107
echo "piwind_branch=${{ github.base_ref }}" >> $GITHUB_ENV
@@ -125,20 +110,13 @@ jobs:
125110
- id: export_param
126111
name: Output params
127112
run: |
128-
# If oasislmf package is given remove branch install option
129113
if [[ -n "${{ inputs.oasislmf_package }}" ]]; then
114+
# If oasislmf package is given remove branch install option
130115
echo "oasislmf_branch=" >> $GITHUB_ENV
131116
else
132117
echo "oasislmf_branch=${{ env.oasislmf_branch }}" >> $GITHUB_OUTPUT
133118
fi
134119
135-
# If ods_tools package is given remove branch install option
136-
if [[ -n "${{ inputs.ods_package }}" ]]; then
137-
echo "ods_branch=" >> $GITHUB_ENV
138-
else
139-
echo "ods_branch=${{ env.ods_branch }}" >> $GITHUB_OUTPUT
140-
fi
141-
142120
echo "piwind_branch=${{ env.piwind_branch }}" >> $GITHUB_OUTPUT
143121
echo "oasislmf_package=${{ env.oasislmf_package }}" >> $GITHUB_OUTPUT
144122
echo "ods_package=${{ env.ods_package }}" >> $GITHUB_OUTPUT
@@ -152,7 +130,6 @@ jobs:
152130
with:
153131
piwind_branch: ${{ needs.params.outputs.piwind_branch }}
154132
ods_package: ${{ needs.params.outputs.ods_package }}
155-
ods_branch: ${{ needs.params.outputs.ods_branch }}
156133
oasislmf_package: ${{ needs.params.outputs.oasislmf_package }}
157134
oasislmf_branch: ${{ needs.params.outputs.oasislmf_branch }}
158135
worker_tag: ${{ needs.params.outputs.platform_version }}

‎analysis_settings.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
"gul_output": true,
99
"model_settings": {
1010
"event_set": "p",
11-
"event_occurrence_id": "lt",
12-
"footprint_set": "b"
11+
"event_occurrence_id": "lt"
1312
},
1413
"gul_summaries": [
1514
{

‎analysis_settings_ord.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
"gul_output": true,
99
"model_settings": {
1010
"event_set": "p",
11-
"event_occurrence_id": "lt",
12-
"footprint_set": "b"
11+
"event_occurrence_id": "lt"
1312
},
1413
"gul_summaries": [
1514
{

‎docker/Dockerfile.piwind_server

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
FROM coreoasis/api_server:latest
22

3-
USER root
4-
RUN apt update && apt install -y git
5-
6-
USER server
73
COPY --chown=server:server $ods_package ./
4+
USER server
85

96
# Install ods_tools from package file (Optional) 'docker build --build-arg ods_package=<whl>'
107
ARG ods_package

‎meta-data/model_settings.json

+1-9
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,7 @@
1616
"options":[
1717
{"id":"lt", "desc": "Long Term"}
1818
]
19-
},
20-
"footprint_set":{
21-
"name": "Footprint Set",
22-
"desc": "PiWind Footprint Set selection",
23-
"default": "b",
24-
"options":[
25-
{"id":"b", "desc": "Balanced"}
26-
]
27-
}
19+
}
2820
},
2921
"lookup_settings":{
3022
"supported_perils":[

‎model_data/PiWind/footprint_b.bin ‎model_data/PiWind/footprint.bin

File renamed without changes.

‎model_data/PiWind/footprint_b.csv ‎model_data/PiWind/footprint.csv

File renamed without changes.

‎model_data/PiWind/footprint_b.idx ‎model_data/PiWind/footprint.idx

File renamed without changes.

‎tests/ci/ALL_output_analysis_settings.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
"gul_output": true,
1010
"model_settings": {
1111
"event_set": "p",
12-
"event_occurrence_id": "lt",
13-
"footprint_set": "b"
12+
"event_occurrence_id": "lt"
1413
},
1514
"gul_summaries": [
1615
{

‎tests/ci/FM_analysis_settings.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@
3434
],
3535
"model_settings": {
3636
"event_set": "p",
37-
"event_occurrence_id": "lt",
38-
"footprint_set": "b"
37+
"event_occurrence_id": "lt"
3938
},
4039
"model_name_id": "PiWind",
4140
"model_supplier_id": "OasisLMF",

‎tests/ci/GUL_analysis_settings.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
],
1414
"gul_threshold": 0,
1515
"model_settings": {
16-
"event_set": "p",
17-
"footprint_set": "b"
16+
"event_set": "p"
1817
},
1918
"model_name_id": "PiWind",
2019
"model_supplier_id": "OasisLMF",

‎tests/ci/ORD_csv_analysis_settings.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
"gul_output": true,
1010
"model_settings": {
1111
"event_set": "p",
12-
"event_occurrence_id": "lt",
13-
"footprint_set": "b"
12+
"event_occurrence_id": "lt"
1413
},
1514
"gul_summaries": [
1615
{

‎tests/ci/ORD_parquet_analysis_settings.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
"gul_output": true,
1010
"model_settings": {
1111
"event_set": "p",
12-
"event_occurrence_id": "lt",
13-
"footprint_set": "b"
12+
"event_occurrence_id": "lt"
1413
},
1514
"gul_summaries": [
1615
{

‎tests/ci/RI_analysis_settings.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@
4848
],
4949
"model_settings": {
5050
"event_set": "p",
51-
"event_occurrence_id": "lt",
52-
"footprint_set": "b"
51+
"event_occurrence_id": "lt"
5352
},
5453
"model_name_id": "PiWind",
5554
"model_supplier_id": "OasisLMF",

‎tests/ci/expected/all_outputs/input/analysis_settings.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"version": "3", "analysis_tag": "ALL_outputs_tests", "source_tag": "MDK", "model_name_id": "PiWind", "model_supplier_id": "OasisLMF", "number_of_samples": 1, "gul_threshold": 0, "gul_output": true, "model_settings": {"event_set": "p", "event_occurrence_id": "lt", "footprint_set": "b"}, "gul_summaries": [{"id": 1, "ord_output": {"plt_sample": true, "plt_quantile": true, "plt_moment": true, "elt_sample": true, "elt_quantile": true, "elt_moment": true, "alt_period": true, "ept_full_uncertainty_aep": true, "ept_full_uncertainty_oep": true, "ept_mean_sample_aep": true, "ept_mean_sample_oep": true, "ept_per_sample_mean_aep": true, "ept_per_sample_mean_oep": true, "psept_aep": true, "psept_oep": true, "parquet_format": true, "return_period_file": true}, "summarycalc": true, "eltcalc": true, "aalcalc": true, "pltcalc": true, "lec_output": true, "leccalc": {"return_period_file": true, "full_uncertainty_aep": true, "full_uncertainty_oep": true, "wheatsheaf_aep": true, "wheatsheaf_oep": true, "wheatsheaf_mean_aep": true, "wheatsheaf_mean_oep": true, "sample_mean_aep": true, "sample_mean_oep": true}}], "il_output": true, "il_summaries": [{"id": 1, "ord_output": {"plt_sample": true, "plt_quantile": true, "plt_moment": true, "elt_sample": true, "elt_quantile": true, "elt_moment": true, "alt_period": true, "ept_full_uncertainty_aep": true, "ept_full_uncertainty_oep": true, "ept_mean_sample_aep": true, "ept_mean_sample_oep": true, "ept_per_sample_mean_aep": true, "ept_per_sample_mean_oep": true, "psept_aep": true, "psept_oep": true, "parquet_format": true, "return_period_file": true}, "summarycalc": true, "eltcalc": true, "aalcalc": true, "pltcalc": true, "lec_output": true, "leccalc": {"return_period_file": true, "full_uncertainty_aep": true, "full_uncertainty_oep": true, "wheatsheaf_aep": true, "wheatsheaf_oep": true, "wheatsheaf_mean_aep": true, "wheatsheaf_mean_oep": true, "sample_mean_aep": true, "sample_mean_oep": true}}], "ri_output": true, "ri_summaries": [{"id": 1, "ord_output": {"plt_sample": true, "plt_quantile": true, "plt_moment": true, "elt_sample": true, "elt_quantile": true, "elt_moment": true, "alt_period": true, "ept_full_uncertainty_aep": true, "ept_full_uncertainty_oep": true, "ept_mean_sample_aep": true, "ept_mean_sample_oep": true, "ept_per_sample_mean_aep": true, "ept_per_sample_mean_oep": true, "psept_aep": true, "psept_oep": true, "parquet_format": true, "return_period_file": true}, "summarycalc": true, "eltcalc": true, "aalcalc": true, "pltcalc": true, "lec_output": true, "leccalc": {"return_period_file": true, "full_uncertainty_aep": true, "full_uncertainty_oep": true, "wheatsheaf_aep": true, "wheatsheaf_oep": true, "wheatsheaf_mean_aep": true, "wheatsheaf_mean_oep": true, "sample_mean_aep": true, "sample_mean_oep": true}}]}
1+
{"version": "3", "analysis_tag": "ALL_outputs_tests", "source_tag": "MDK", "model_name_id": "PiWind", "model_supplier_id": "OasisLMF", "number_of_samples": 1, "gul_threshold": 0, "gul_output": true, "model_settings": {"event_set": "p", "event_occurrence_id": "lt"}, "gul_summaries": [{"id": 1, "ord_output": {"plt_sample": true, "plt_quantile": true, "plt_moment": true, "elt_sample": true, "elt_quantile": true, "elt_moment": true, "alt_period": true, "ept_full_uncertainty_aep": true, "ept_full_uncertainty_oep": true, "ept_mean_sample_aep": true, "ept_mean_sample_oep": true, "ept_per_sample_mean_aep": true, "ept_per_sample_mean_oep": true, "psept_aep": true, "psept_oep": true, "parquet_format": true, "return_period_file": true}, "summarycalc": true, "eltcalc": true, "aalcalc": true, "pltcalc": true, "lec_output": true, "leccalc": {"return_period_file": true, "full_uncertainty_aep": true, "full_uncertainty_oep": true, "wheatsheaf_aep": true, "wheatsheaf_oep": true, "wheatsheaf_mean_aep": true, "wheatsheaf_mean_oep": true, "sample_mean_aep": true, "sample_mean_oep": true}}], "il_output": true, "il_summaries": [{"id": 1, "ord_output": {"plt_sample": true, "plt_quantile": true, "plt_moment": true, "elt_sample": true, "elt_quantile": true, "elt_moment": true, "alt_period": true, "ept_full_uncertainty_aep": true, "ept_full_uncertainty_oep": true, "ept_mean_sample_aep": true, "ept_mean_sample_oep": true, "ept_per_sample_mean_aep": true, "ept_per_sample_mean_oep": true, "psept_aep": true, "psept_oep": true, "parquet_format": true, "return_period_file": true}, "summarycalc": true, "eltcalc": true, "aalcalc": true, "pltcalc": true, "lec_output": true, "leccalc": {"return_period_file": true, "full_uncertainty_aep": true, "full_uncertainty_oep": true, "wheatsheaf_aep": true, "wheatsheaf_oep": true, "wheatsheaf_mean_aep": true, "wheatsheaf_mean_oep": true, "sample_mean_aep": true, "sample_mean_oep": true}}], "ri_output": true, "ri_summaries": [{"id": 1, "ord_output": {"plt_sample": true, "plt_quantile": true, "plt_moment": true, "elt_sample": true, "elt_quantile": true, "elt_moment": true, "alt_period": true, "ept_full_uncertainty_aep": true, "ept_full_uncertainty_oep": true, "ept_mean_sample_aep": true, "ept_mean_sample_oep": true, "ept_per_sample_mean_aep": true, "ept_per_sample_mean_oep": true, "psept_aep": true, "psept_oep": true, "parquet_format": true, "return_period_file": true}, "summarycalc": true, "eltcalc": true, "aalcalc": true, "pltcalc": true, "lec_output": true, "leccalc": {"return_period_file": true, "full_uncertainty_aep": true, "full_uncertainty_oep": true, "wheatsheaf_aep": true, "wheatsheaf_oep": true, "wheatsheaf_mean_aep": true, "wheatsheaf_mean_oep": true, "sample_mean_aep": true, "sample_mean_oep": true}}]}

‎tests/ci/expected/all_outputs/output/analysis_settings.json

+136
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
1+
{
2+
"version": "3",
3+
"analysis_tag": "ALL_outputs_tests",
4+
"source_tag": "MDK",
5+
"model_name_id": "PiWind",
6+
"model_supplier_id": "OasisLMF",
7+
"number_of_samples": 1,
8+
"gul_threshold": 0,
9+
"gul_output": true,
10+
"model_settings": {
11+
"event_set": "p",
12+
"event_occurrence_id": "lt"
13+
},
14+
"gul_summaries": [
15+
{
16+
"id": 1,
17+
"ord_output": {
18+
"plt_sample": true,
19+
"plt_quantile": true,
20+
"plt_moment": true,
21+
"elt_sample": true,
22+
"elt_quantile": true,
23+
"elt_moment": true,
24+
"alt_period": true,
25+
"ept_full_uncertainty_aep": true,
26+
"ept_full_uncertainty_oep": true,
27+
"ept_mean_sample_aep": true,
28+
"ept_mean_sample_oep": true,
29+
"ept_per_sample_mean_aep": true,
30+
"ept_per_sample_mean_oep": true,
31+
"psept_aep": true,
32+
"psept_oep": true,
33+
"parquet_format": true,
34+
"return_period_file": true
35+
},
36+
"summarycalc": true,
37+
"eltcalc": true,
38+
"aalcalc": true,
39+
"pltcalc": true,
40+
"lec_output": true,
41+
"leccalc": {
42+
"return_period_file": true,
43+
"full_uncertainty_aep": true,
44+
"full_uncertainty_oep": true,
45+
"wheatsheaf_aep": true,
46+
"wheatsheaf_oep": true,
47+
"wheatsheaf_mean_aep": true,
48+
"wheatsheaf_mean_oep": true,
49+
"sample_mean_aep": true,
50+
"sample_mean_oep": true
51+
}
52+
}
53+
],
54+
"il_output": true,
55+
"il_summaries": [
56+
{
57+
"id": 1,
58+
"ord_output": {
59+
"plt_sample": true,
60+
"plt_quantile": true,
61+
"plt_moment": true,
62+
"elt_sample": true,
63+
"elt_quantile": true,
64+
"elt_moment": true,
65+
"alt_period": true,
66+
"ept_full_uncertainty_aep": true,
67+
"ept_full_uncertainty_oep": true,
68+
"ept_mean_sample_aep": true,
69+
"ept_mean_sample_oep": true,
70+
"ept_per_sample_mean_aep": true,
71+
"ept_per_sample_mean_oep": true,
72+
"psept_aep": true,
73+
"psept_oep": true,
74+
"parquet_format": true,
75+
"return_period_file": true
76+
},
77+
"summarycalc": true,
78+
"eltcalc": true,
79+
"aalcalc": true,
80+
"pltcalc": true,
81+
"lec_output": true,
82+
"leccalc": {
83+
"return_period_file": true,
84+
"full_uncertainty_aep": true,
85+
"full_uncertainty_oep": true,
86+
"wheatsheaf_aep": true,
87+
"wheatsheaf_oep": true,
88+
"wheatsheaf_mean_aep": true,
89+
"wheatsheaf_mean_oep": true,
90+
"sample_mean_aep": true,
91+
"sample_mean_oep": true
92+
}
93+
}
94+
],
95+
"ri_output": true,
96+
"ri_summaries": [
97+
{
98+
"id": 1,
99+
"ord_output": {
100+
"plt_sample": true,
101+
"plt_quantile": true,
102+
"plt_moment": true,
103+
"elt_sample": true,
104+
"elt_quantile": true,
105+
"elt_moment": true,
106+
"alt_period": true,
107+
"ept_full_uncertainty_aep": true,
108+
"ept_full_uncertainty_oep": true,
109+
"ept_mean_sample_aep": true,
110+
"ept_mean_sample_oep": true,
111+
"ept_per_sample_mean_aep": true,
112+
"ept_per_sample_mean_oep": true,
113+
"psept_aep": true,
114+
"psept_oep": true,
115+
"parquet_format": true,
116+
"return_period_file": true
117+
},
118+
"summarycalc": true,
119+
"eltcalc": true,
120+
"aalcalc": true,
121+
"pltcalc": true,
122+
"lec_output": true,
123+
"leccalc": {
124+
"return_period_file": true,
125+
"full_uncertainty_aep": true,
126+
"full_uncertainty_oep": true,
127+
"wheatsheaf_aep": true,
128+
"wheatsheaf_oep": true,
129+
"wheatsheaf_mean_aep": true,
130+
"wheatsheaf_mean_oep": true,
131+
"sample_mean_aep": true,
132+
"sample_mean_oep": true
133+
}
134+
}
135+
]
136+
}

0 commit comments

Comments
 (0)