Skip to content

[com1]: Update report com1 #1315

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
Jul 15, 2026
Merged

[com1]: Update report com1 #1315

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
6 changes: 3 additions & 3 deletions avaframe/com1DFA/com1DFA.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1219,8 +1219,8 @@ def initializeSimulation(cfg, outDir, demOri, inputSimLines, logName):
relAreaActual = np.sum(relAreaActualList)
reportAreaInfo = {
"Release area info": {
"Projected Area [m2]": "%.2f" % (relAreaProjected),
"Actual Area [m2]": "%.2f" % (relAreaActual),
"Projected Area [m2] (raster-based)": "%.0f" % (relAreaProjected),
"Actual Area [m2] (raster-based)": "%.0f" % (relAreaActual),
}
}

Expand Down Expand Up @@ -1259,7 +1259,7 @@ def initializeSimulation(cfg, outDir, demOri, inputSimLines, logName):
particles = DFAfunC.updateInitialVelocity(cfgGen, particles, dem, releaseLine["velocity"])
particles, fields = initializeFields(cfg, dem, particles, releaseLine)

reportAreaInfo["Release area info"]["Model release volume [m3]"] = "%.2f" % (
reportAreaInfo["Release area info"]["Model release volume [m3]"] = "%.0f" % (
particles["mTot"] / cfgGen.getfloat("rho")
)
if cfgGen.getboolean("timeDependentRelease"):
Expand Down
4 changes: 2 additions & 2 deletions avaframe/tests/test_com1DFA.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2641,7 +2641,7 @@ def test_initializeSimulation(tmp_path):
)
assert particles["mTot"] == 450.0
assert np.sum(particles["ux"]) == 0.0
assert reportAreaInfo["Release area info"]["Projected Area [m2]"] == "4.00"
assert reportAreaInfo["Release area info"]["Projected Area [m2] (raster-based)"] == "4"
assert reportAreaInfo["entrainment"] == "Yes"
assert reportAreaInfo["resistance"] == "No"

Expand Down Expand Up @@ -2695,7 +2695,7 @@ def test_initializeSimulation(tmp_path):
assert particles2["mTot"] == 400.0
assert particles2["massInitialized"] == 400.0
assert np.sum(particles["ux"]) == 0.0
assert reportAreaInfo["Release area info"]["Projected Area [m2]"] == "4.00"
assert reportAreaInfo["Release area info"]["Projected Area [m2] (raster-based)"] == "4"
assert reportAreaInfo["entrainment"] == "Yes"
assert reportAreaInfo["resistance"] == "No"
assert np.sum(particles2["secondaryReleaseInfo"]["rasterData"]) == 4.5
Expand Down
Loading