Skip to content

Commit 9e40e5b

Browse files
committed
refactor(com1DFA): modify peakfile export logic to respect dataSave configuration
- Added conditional check for `dataSave` to control the export of intermediate peak files. - Ensured `final` time step exports are unaffected by this change. - Updated configuration file to include the new `dataSave` parameter.
1 parent 4ab7dbc commit 9e40e5b

File tree

2 files changed

+15
-11
lines changed

2 files changed

+15
-11
lines changed

avaframe/com1DFA/com1DFA.py

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2764,12 +2764,19 @@ def exportFields(
27642764
# convert from J/cell to kJ/m²
27652765
# (by dividing the peak kinetic energy per cell by the real area of the cell)
27662766
resField = resField * 0.001 / dem["areaRaster"]
2767-
dataName = cuSimName + "_" + resType + "_" + "t%.2f" % (timeStep)
2768-
# create directory
2769-
outDirPeak = outDir / "peakFiles" / "timeSteps"
2770-
fU.makeADir(outDirPeak)
2771-
outFile = outDirPeak / dataName
2772-
# IOf.writeResultToRaster(dem["originalHeader"], resField, outFile, flip=True)
2767+
2768+
if not cfg["EXPORTS"].getboolean("dataSave"):
2769+
dataName = cuSimName + "_" + resType + "_" + "t%.2f" % (timeStep)
2770+
# create directory
2771+
outDirPeak = outDir / "peakFiles" / "timeSteps"
2772+
fU.makeADir(outDirPeak)
2773+
outFile = outDirPeak / dataName
2774+
IOf.writeResultToRaster(dem["originalHeader"], resField, outFile, flip=True)
2775+
log.debug(
2776+
"Results parameter: %s has been exported to Outputs/peakFiles for time step: %.2f "
2777+
% (resType, timeStep)
2778+
)
2779+
27732780
if TSave == "final":
27742781
log.debug(
27752782
"Results parameter: %s exported to Outputs/peakFiles for time step: %.2f - FINAL time step "
@@ -2781,11 +2788,6 @@ def exportFields(
27812788
fU.makeADir(outDirPeakAll)
27822789
outFile = outDirPeakAll / dataName
27832790
IOf.writeResultToRaster(dem["originalHeader"], resField, outFile, flip=True)
2784-
else:
2785-
log.debug(
2786-
"Results parameter: %s has been exported to Outputs/peakFiles for time step: %.2f "
2787-
% (resType, timeStep)
2788-
)
27892791

27902792

27912793
def prepareVarSimDict(standardCfg, inputSimFiles, variationDict, simNameExisting="", module=com1DFA):

avaframe/com1DFA/com1DFACfg.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -487,6 +487,8 @@ unitpfv = ms-1
487487
# peak files and plots are exported, option to turn off exports when exportData is set to False
488488
# this affects export of peak files and also generation of peak file plots
489489
exportData = True
490+
# If dataSave is true, only the final peakfields will be exported
491+
dataSave = True
490492
# export release and optional entrainment raster files derived from shp files saved to Outputs/com1DFA/internalRasters
491493
exportRasters = False
492494

0 commit comments

Comments
 (0)