From 20d96bce5ec6037193434c75c57e53b7d0711098 Mon Sep 17 00:00:00 2001 From: Anna Wirbel Date: Wed, 8 Jul 2026 15:37:53 +0200 Subject: [PATCH] add raster-based info in com1DFA area report remove decimals from report of areas fix(tests): correct projected area assertion in `test_com1DFA.py` --- avaframe/com1DFA/com1DFA.py | 6 +++--- avaframe/tests/test_com1DFA.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/avaframe/com1DFA/com1DFA.py b/avaframe/com1DFA/com1DFA.py index 14a386372..5f5900ea2 100644 --- a/avaframe/com1DFA/com1DFA.py +++ b/avaframe/com1DFA/com1DFA.py @@ -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), } } @@ -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"): diff --git a/avaframe/tests/test_com1DFA.py b/avaframe/tests/test_com1DFA.py index ce13cdee3..9e136e9f4 100644 --- a/avaframe/tests/test_com1DFA.py +++ b/avaframe/tests/test_com1DFA.py @@ -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" @@ -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