Skip to content

[com4]: Add result file: minimum of travel length and travel angle #1159

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 6, 2025
Merged

[com4]: Add result file: minimum of travel length and travel angle #1159

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
56 changes: 40 additions & 16 deletions avaframe/com4FlowPy/com4FlowPy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,13 +518,15 @@ def mergeAndWriteResults(modelPaths, modelOptions):
# Merge calculated tiles
zDelta = SPAM.mergeRaster(modelPaths["tempDir"], "res_z_delta")
flux = SPAM.mergeRaster(modelPaths["tempDir"], "res_flux")
cellCounts = SPAM.mergeRaster(modelPaths["tempDir"], "res_count", method='sum')
zDeltaSum = SPAM.mergeRaster(modelPaths["tempDir"], "res_z_delta_sum", method='sum')
routFluxSum = SPAM.mergeRaster(modelPaths["tempDir"], "res_rout_flux_sum", method='sum')
depFluxSum = SPAM.mergeRaster(modelPaths["tempDir"], "res_dep_flux_sum", method='sum')
fpTa = SPAM.mergeRaster(modelPaths["tempDir"], "res_fp")
cellCounts = SPAM.mergeRaster(modelPaths["tempDir"], "res_count", method="sum")
zDeltaSum = SPAM.mergeRaster(modelPaths["tempDir"], "res_z_delta_sum", method="sum")
routFluxSum = SPAM.mergeRaster(modelPaths["tempDir"], "res_rout_flux_sum", method="sum")
depFluxSum = SPAM.mergeRaster(modelPaths["tempDir"], "res_dep_flux_sum", method="sum")
fpTaMax = SPAM.mergeRaster(modelPaths["tempDir"], "res_fp_max")
fpTaMin = SPAM.mergeRaster(modelPaths["tempDir"], "res_fp_min", method="min")
slTa = SPAM.mergeRaster(modelPaths["tempDir"], "res_sl")
travelLength = SPAM.mergeRaster(modelPaths["tempDir"], "res_travel_length")
travelLengthMax = SPAM.mergeRaster(modelPaths["tempDir"], "res_travel_length_max")
travelLengthMin = SPAM.mergeRaster(modelPaths["tempDir"], "res_travel_length_min", method="min")

if modelOptions["infraBool"]:
backcalc = SPAM.mergeRaster(modelPaths["tempDir"], "res_backcalc")
Expand All @@ -542,7 +544,7 @@ def mergeAndWriteResults(modelPaths, modelOptions):
demHeader = IOf.readRasterHeader(modelPaths["demPath"])
outputHeader = demHeader.copy()
outputHeader["nodata_value"]=-9999

if _oF == ".asc":
outputHeader["driver"] = "AAIGrid"
elif _oF == ".tif":
Expand All @@ -566,20 +568,42 @@ def mergeAndWriteResults(modelPaths, modelOptions):
if 'depFluxSum' in _outputs:
output = IOf.writeResultToRaster(outputHeader, depFluxSum,
modelPaths["resDir"] / "com4_{}_{}_depFluxSum".format(_uid, _ts), flip=True)
if 'fpTravelAngle' in _outputs:
output = IOf.writeResultToRaster(outputHeader, fpTa,
modelPaths["resDir"] / "com4_{}_{}_fpTravelAngle".format(_uid, _ts), flip=True)
if "fpTravelAngle" in _outputs or "fpTravelAngleMax" in _outputs:
output = IOf.writeResultToRaster(
outputHeader,
fpTaMax,
modelPaths["resDir"] / "com4_{}_{}_fpTravelAngleMax".format(_uid, _ts),
flip=True,
)
if "fpTravelAngleMin" in _outputs:
output = IOf.writeResultToRaster(
outputHeader,
fpTaMin,
modelPaths["resDir"] / "com4_{}_{}_fpTravelAngleMin".format(_uid, _ts),
flip=True,
)
if 'slTravelAngle' in _outputs:
output = IOf.writeResultToRaster(outputHeader, slTa,
modelPaths["resDir"] / "com4_{}_{}_slTravelAngle".format(_uid, _ts), flip=True)
if 'travelLength' in _outputs:
output = IOf.writeResultToRaster(outputHeader, travelLength,
modelPaths["resDir"] / "com4_{}_{}_travelLength".format(_uid, _ts), flip=True)
if "travelLength" in _outputs or "travelLengthMax" in _outputs:
output = IOf.writeResultToRaster(
outputHeader,
travelLengthMax,
modelPaths["resDir"] / "com4_{}_{}_travelLengthMax".format(_uid, _ts),
flip=True,
)
if "travelLengthMin" in _outputs:
output = IOf.writeResultToRaster(
outputHeader,
travelLengthMin,
modelPaths["resDir"] / "com4_{}_{}_travelLengthMin".format(_uid, _ts),
flip=True,
)

# NOTE:
# if not modelOptions["infraBool"]: # if no infra
# io.output_raster(modelPaths["demPath"], modelPaths["resDir"] / ("cell_counts%s" %(output_format)),cell_counts)
# io.output_raster(modelPaths["demPath"], modelPaths["resDir"] / ("z_delta_sum%s" %(output_format)),z_delta_sum)
# io.output_raster(modelPaths["demPath"], modelPaths["resDir"] / ("cell_counts%s" %(output_format)),cell_counts)
# io.output_raster(modelPaths["demPath"], modelPaths["resDir"] / ("z_delta_sum%s" %(output_format)),z_delta_sum)
if modelOptions["infraBool"]: # if infra
output = IOf.writeResultToRaster(outputHeader, backcalc,
modelPaths["resDir"] / "com4_{}_{}_backcalculation".format(_uid, _ts), flip=True)
Expand Down Expand Up @@ -676,4 +700,4 @@ def deleteTempFolder(tempFolderPath):
log.info("deletion of temp folder {} failed".format(tempFolderPath))
log.info(" isDir:{} isTemp:{}}".format(isDir, validTemp))

log.info("+++++++++++++++++++++++")
log.info("+++++++++++++++++++++++")
6 changes: 4 additions & 2 deletions avaframe/com4FlowPy/com4FlowPyCfg.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,16 +205,18 @@ maxChunks = 500
outputFileFormat = .tif

# define the different output files that are written to disk
# default = 'zDelta|cellCounts|travelLength|fpTravelAngle'
# default = 'zDelta|cellCounts|travelLengthMax|fpTravelAngleMax'
# additional options:
# slTravelAngle
# flux
# zDeltaSum
# routFluxSum
# depFluxSum
# travelLengthMin
# fpTravelAngleMin
# if forestInteraction: forestInteraction is automatically added to outputs
# if infra: backCalculation is automatically added to output
outputFiles = zDelta|cellCounts|travelLength|fpTravelAngle
outputFiles = zDelta|cellCounts|travelLengthMax|fpTravelAngleMax

#++++++++++++ Custom paths True/False
# default: False
Expand Down
Loading
Loading