Skip to content

[com1;benchmarks] Update RESISTANCE benchmarks to reflect changes in resistance treatment 1.13 #1174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fso42 merged 1 commit into from
Aug 26, 2025
Merged

[com1;benchmarks] Update RESISTANCE benchmarks to reflect changes in resistance treatment 1.13 #1174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion avaframe/runUpdateBenchmarkTestsCom1DFA.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
fU.makeADir(outDir)

# version = getVersion()
version = "1.11"
version = "1.13"

log.info("The following benchmark tests will be updated ")
for test in testList:
Expand Down
21 changes: 11 additions & 10 deletions benchmarks/avaHofSnowGlideTest/avaHofSnowGlideTest_desDict.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"TAGS": [
"res",
"resistance",
"standardTestSnowGlide",
"real"
],
Expand All @@ -9,15 +10,15 @@
"2DPeak"
],
"FILES": [
"relfHof_079d8abe39_C_L_res_ssl_ppr",
"relfHof_079d8abe39_C_L_res_ssl_pft",
"relfHof_079d8abe39_C_L_res_ssl_pfv",
"mass_relfHof_079d8abe39_C_L_res_ssl"
"relfHof_a28091dd19_C_L_res_ssl_ppr",
"relfHof_a28091dd19_C_L_res_ssl_pft",
"relfHof_a28091dd19_C_L_res_ssl_pfv",
"mass_relfHof_a28091dd19_C_L_res_ssl"
],
"TOPOTYPE": "real",
"AVANAME": "avaHof",
"AVADIR": "data/avaHof",
"simNameRef": "relfHof_079d8abe39_C_L_res_ssl",
"simNameRef": "relfHof_a28091dd19_C_L_res_ssl",
"NAME": "avaHofSnowGlideTest",
"Test Info": {
"type": "text",
Expand All @@ -26,11 +27,11 @@
"simType": "res",
"simName": {
"type": "simName",
"name": "relfHof_079d8abe39_C_L_res_ssl"
"name": "relfHof_a28091dd19_C_L_res_ssl"
},
"Simulation Parameters": {
"type": "list",
"Program version": "1.11",
"Program version": "1.13",
"Parameter set": "Changed",
"Release Area Scenario": "relfHof",
"Entrainment": "No",
Expand All @@ -39,11 +40,11 @@
"Density [kgm-3]": "300",
"Friction model": "Voellmy",
"Initial mass [kg]": "3855823.75",
"Final mass [kg]": "3855823.75",
"Final mass [kg]": "3791215.50",
"Entrained mass [kg]": "0.00",
"Entrained volume [m3]": "0.00",
"Stop criterion": "< 1.00 percent of PKE",
"Avalanche run time [s]": "40.34",
"Computation time [s]": "115.23"
"Avalanche run time [s]": "42.02",
"Computation time [s]": "181.75"
}
}
4,035 changes: 0 additions & 4,035 deletions benchmarks/avaHofSnowGlideTest/mass_relfHof_079d8abe39_C_L_res_ssl.txt
View file
Open in desktop

This file was deleted.

4,203 changes: 4,203 additions & 0 deletions benchmarks/avaHofSnowGlideTest/mass_relfHof_a28091dd19_C_L_res_ssl.txt
View file
Open in desktop

Large diffs are not rendered by default.

122 changes: 61 additions & 61 deletions ...st/relfHof_079d8abe39_C_L_res_ssl_pft.asc → ...st/relfHof_a28091dd19_C_L_res_ssl_pft.asc
View file
Open in desktop

Large diffs are not rendered by default.

122 changes: 61 additions & 61 deletions ...st/relfHof_079d8abe39_C_L_res_ssl_pfv.asc → ...st/relfHof_a28091dd19_C_L_res_ssl_pfv.asc
View file
Open in desktop

Large diffs are not rendered by default.

122 changes: 61 additions & 61 deletions ...st/relfHof_079d8abe39_C_L_res_ssl_ppr.asc → ...st/relfHof_a28091dd19_C_L_res_ssl_ppr.asc
View file
Open in desktop

Large diffs are not rendered by default.

23 changes: 12 additions & 11 deletions benchmarks/avaKotResTest/avaKotResTest_desDict.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,15 @@
"2DPeak"
],
"FILES": [
"relKot_5f7151e370_D_S_res_dfa_pft.asc",
"relKot_5f7151e370_D_S_res_dfa_pfv.asc",
"relKot_5f7151e370_D_S_res_dfa_ppr.asc"
"relKot_280985ebb1_C_S_res_dfa_ppr",
"relKot_280985ebb1_C_S_res_dfa_pft",
"relKot_280985ebb1_C_S_res_dfa_pfv",
"mass_relKot_280985ebb1_C_S_res_dfa"
],
"TOPOTYPE": "real",
"AVANAME": "avaKot",
"AVADIR": "data/avaKot",
"simNameRef": "relKot_5f7151e370_D_S_res_dfa",
"simNameRef": "relKot_280985ebb1_C_S_res_dfa",
"NAME": "avaKotResTest",
"Test Info": {
"type": "text",
Expand All @@ -26,24 +27,24 @@
"simType": "res",
"simName": {
"type": "simName",
"name": "relKot_5f7151e370_D_S_res_dfa"
"name": "relKot_280985ebb1_C_S_res_dfa"
},
"Simulation Parameters": {
"type": "list",
"Program version": "1.12+15.g5020492b.dirty",
"Parameter set": "Default",
"Program version": "1.13",
"Parameter set": "Changed",
"Release Area Scenario": "relKot",
"Entrainment": "No",
"Resistance": "Yes",
"Secondary release area": "No",
"Density [kgm-3]": "200",
"Friction model": "samosATSmall",
"Initial mass [kg]": "4328073.73",
"Final mass [kg]": "24949108.21",
"Final mass [kg]": "3417671.81",
"Entrained mass [kg]": "0.00",
"Entrained volume [m3]": "0.00",
"Stop criterion": "< 1.00 percent of PKE",
"Avalanche run time [s]": "103.70",
"Computation time [s]": "14.83"
"Avalanche run time [s]": "106.60",
"Computation time [s]": "21.94"
}
}
}
1,067 changes: 1,067 additions & 0 deletions benchmarks/avaKotResTest/mass_relKot_280985ebb1_C_S_res_dfa.txt
View file
Open in desktop

Large diffs are not rendered by default.

1,038 changes: 0 additions & 1,038 deletions benchmarks/avaKotResTest/mass_relKot_5f7151e370_D_S_res_dfa.txt
View file
Open in desktop

This file was deleted.

102 changes: 51 additions & 51 deletions ...est/relKot_5f7151e370_D_S_res_dfa_pft.asc → ...est/relKot_280985ebb1_C_S_res_dfa_pft.asc
View file
Open in desktop

Large diffs are not rendered by default.

98 changes: 49 additions & 49 deletions ...est/relKot_5f7151e370_D_S_res_dfa_pfv.asc → ...est/relKot_280985ebb1_C_S_res_dfa_pfv.asc
View file
Open in desktop

Large diffs are not rendered by default.

98 changes: 49 additions & 49 deletions ...est/relKot_5f7151e370_D_S_res_dfa_ppr.asc → ...est/relKot_280985ebb1_C_S_res_dfa_ppr.asc
View file
Open in desktop

Large diffs are not rendered by default.

21 changes: 11 additions & 10 deletions benchmarks/avaParabolaResTest/avaParabolaResTest_desDict.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"TAGS": [
"resistance",
"res",
"standardTest",
"idealized"
],
Expand All @@ -9,15 +10,15 @@
"2DPeak"
],
"FILES": [
"release1PF_39f1d08fa9_C_L_res_dfa_ppr",
"release1PF_39f1d08fa9_C_L_res_dfa_pft",
"release1PF_39f1d08fa9_C_L_res_dfa_pfv",
"mass_release1PF_39f1d08fa9_C_L_res_dfa"
"release1PF_0b9974d222_C_L_res_dfa_ppr",
"release1PF_0b9974d222_C_L_res_dfa_pft",
"release1PF_0b9974d222_C_L_res_dfa_pfv",
"mass_release1PF_0b9974d222_C_L_res_dfa"
],
"TOPOTYPE": "idealised",
"AVANAME": "avaParabola",
"AVADIR": "data/avaParabola",
"simNameRef": "release1PF_39f1d08fa9_C_L_res_dfa",
"simNameRef": "release1PF_0b9974d222_C_L_res_dfa",
"NAME": "avaParabolaResTest",
"Test Info": {
"type": "text",
Expand All @@ -26,11 +27,11 @@
"simType": "res",
"simName": {
"type": "simName",
"name": "release1PF_39f1d08fa9_C_L_res_dfa"
"name": "release1PF_0b9974d222_C_L_res_dfa"
},
"Simulation Parameters": {
"type": "list",
"Program version": "1.11",
"Program version": "1.13",
"Parameter set": "Changed",
"Release Area Scenario": "release1PF",
"Entrainment": "No",
Expand All @@ -39,11 +40,11 @@
"Density [kgm-3]": "200",
"Friction model": "samosAT",
"Initial mass [kg]": "20672345.82",
"Final mass [kg]": "20672345.82",
"Final mass [kg]": "12637804.38",
"Entrained mass [kg]": "0.00",
"Entrained volume [m3]": "0.00",
"Stop criterion": "< 1.00 percent of PKE",
"Avalanche run time [s]": "158.50",
"Computation time [s]": "45.59"
"Avalanche run time [s]": "115.90",
"Computation time [s]": "63.11"
}
}
Loading
Loading