[ana5]: add general thalweg extension & resampling by PaulaSp3 · Pull Request #1323 · OpenNHM/AvaFrame

PaulaSp3 · 2026-07-31T10:27:08Z

The goal is to derive a thalweg profile from very general thalweg data (containing x and y coordinates).

This changed in each file:

ana5Utils/DFAPathGeneration.py:
- black formatter
- extendProfileTop : add extension option that extends the path to the top similar as the bottom extension that depends on the flow/ path direction
  (for option 2, the code is very similar as in extendProfileBottom, should we summarize both in one function with options/different handling for top nd bottom extension?)
- extendProfileBottom: add possibility to consider lower left center when reading z values from DEM
- resamplePath : add parameter in configfile that can change the degree of the spline
ana5Utils/DFAPathGenerationCfg.ini:
- add parameter in configfile that can change the degree of the spline (for resampling a path)
ana5Utils/preparePathGeneral.py
functions to prepare a path/thalweg that has only x and y coordinates:
- extend path to top and bottom
- resample path
- read z values along path (from DEM)
- compute s values along path
out3Plot/outCom3Plots.py
- black formatter
- generateCom1DFAPathPlot: put the avalanche thalweg location plot into a separate function avalancheThalwegPlot

PR Checklist

Please confirm before requesting review:

I ran pytest locally without fails
I added/updated tests where needed
I updated documentation where needed

Confirm before the final merge/rebase into master

Commits are sensibly squashed and rebased onto latest master
Standardtest run without difference (with recompiled cython code)

still in progress relVolMin and relVolMax as output correct position for relId delete print small change fix bug pathPolygons as output rename function tidy up try to keep RAM as small as possible print a warning if the output in cfg is not completly valid small corrections correct bugs and doc update docu adapt pytest delete unused package

…flux small modification for comparison tests benchmark tests for FP pep8speaks small bug update bug fix add statement that rasters are close Option to have an uMax_Limit Layer as input alpha and umax same for each startcell default fix comment small comment rename variables - camelCase; paths can beread in with customPaths rename variables - camelCase; paths can beread in with customPaths add flag if variable alpha is computed add dynamic exponent shorten part where calculation is executed (independend of forest True/False rename variables, option to provide variable zdeltaLim or umaxLim pep8speaks docu for variable parameter

Add relative comparison (when rasters are close) write message in report file add option/ FLAG to calculate with generations data for benchmark tests with generations docu for generations pep8speaks pep8speaks pep8spekas

store also center of zdelta and flux thalwegs save stoppig criteria save info about stopping thalweg format opportunity to choose output variables thalweg output minor adaptions to previous PRs output velocity add velocity as output begin to add alpahaEff to thalwegOutput save alpha eff of thalweg save sum of flux of every generation possible' delete personal test data get thalweg deposited flux save number of gnerations per thalweg add output sum of routing and deposition flux thalweg output fluxsums only compute pathArrays once

update benchmark data update benchmark data fix cell count computation format fix bug in computing cell counts minor change

comment do not consider first generation simplified computation ofaveraging If possible, use relID in thalweg name

extend thalweg to top of release area update travel length add dfa path extrapolation and comment out the other option update variables after extending the path to th etop do not overwrite x and y cooridnated extend to bottom adjust bottom extension use config simplify correction that projection on DEM works for FLowPy find bottom point within flow path resample path format consider com1DFAs upside down fliping of rasters consider com1DFAs upside down fliping of rasters consider com1DFAs upside down fliping of rasters add resampling thalweg cut the thalweg at bottom fix bug correct top extension try new top extension minor correction correction correction track the averaged path also remember indeizes correction correction correct

all plots work tidy up format and tidy up

qltysh · 2026-07-31T10:28:46Z

Analysis for project `AvaFrame`

❌ 12 blocking issues (14 total)

Tool	Category	Rule	Count
ripgrep	Lint	# TODO: for option 2, the code is very similar as in extendProfileBottom, should we summarize both in one function with options/different handling for top nd bottom extension?	4	❌
ruff	Style	Incorrect formatting, autoformat by running `qlty fmt`.	3	❌
ruff	Lint	Do not use bare `except`	2	❌
ruff	Lint	Ambiguous variable name: `l`	2	❌
ruff	Lint	f-string without any placeholders	1	❌
qlty	Structure	Function with high complexity (count = 34): extendProfileTop	1
qlty	Structure	Deeply nested control flow (level = 4)	1

@qltysh one-click actions:

Auto-fix formatting (qlty fmt && git push)

qltysh · 2026-07-31T10:28:48Z

+        profile["z"] = np.append(zExtTop, profile["z"])
+        profile["s"] = np.append(0, profile["s"] + ds)
    if debugPlot:
        debPlot.plotPathExtTop(profile, particlesIni, xFirst, yFirst, zFirst, dz1)


Function with high complexity (count = 34): extendProfileTop [qlty:function-complexity]

qltysh · 2026-07-31T10:28:48Z

+            log.warning("Skip top extension of thalweg since profile contains only one point.")
+            return profile
+
+        # TODO: for option 2, the code is very similar as in extendProfileBottom, should we summarize both in one function with options/different handling for top nd bottom extension?


# TODO: for option 2, the code is very similar as in extendProfileBottom, should we summarize both in one function with options/different handling for top nd bottom extension? [ripgrep:TODO]

qltysh · 2026-07-31T10:28:48Z

+            log.error(message)
+            raise ValueError(message)
+        if cfg is None:
+            message = f"If extTopOption = 2, the cfg needs to be provided"


f-string without any placeholders [ruff:F541]

Suggested change

message = f"If extTopOption = 2, the cfg needs to be provided"

message = "If extTopOption = 2, the cfg needs to be provided"

qltysh · 2026-07-31T10:28:49Z

+                else:
+                    # remember last point found inside
+                    factFirst = factExt
+                    factExt = factExt + stepSize


Deeply nested control flow (level = 4) [qlty:nested-control-flow]

qltysh · 2026-07-31T10:28:49Z

-    title = ('com3HybRasterPlot')
-    l = ax.legend(loc='lower left')
+    title = "com3HybRasterPlot"
+    l = ax.legend(loc="lower left")


Ambiguous variable name: l [ruff:E741]

qltysh · 2026-07-31T10:28:49Z

        else:
            extentPlot = extent

+        # TODO: restore changes and rebase master!


# TODO: restore changes and rebase master! [ripgrep:TODO]

qltysh · 2026-07-31T10:28:49Z

@@ -0,0 +1,205 @@
+"""Tests for module preparePathGeneral"""


Found 2 issues:

1. Incorrect formatting, autoformat by running qlty fmt. [ruff:fmt]

2. Incorrect formatting, autoformat by running qlty fmt. [black:fmt]

Co-authored-by: qltysh[bot] <168846912+qltysh[bot]@users.noreply.github.com>

qltysh · 2026-07-31T10:32:54Z

Coverage Impact

This PR will not change total coverage.

Modified Components (1)

Rating	Component	% Diff
	com1DFA	90.0%

Modified Files with Diff Coverage (3)

File	% Diff	Uncovered Line #s
avaframe/com1DFA/DFAtools.py	90.0%	183
avaframe/ana5Utils/DFAPathGeneration.py	72.6%	54-132, 180-198...
avaframe/ana5Utils/preparePathGeneral.py	83.0%	48-61
Total	74.8%

🤖 Increase coverage with AI coding...

In the `PS_FP_thalweg` branch, add test coverage for this new code:

- `avaframe/ana5Utils/DFAPathGeneration.py` -- Lines 54-132, 180-198, 534-536, 548-564, 568-573, 583-585, 734, 1046-1047, and 1089-1150
- `avaframe/ana5Utils/preparePathGeneral.py` -- Line 48-61
- `avaframe/com1DFA/DFAtools.py` -- Line 183

🚦 See full report on Qlty Cloud »

🛟 Help

Diff Coverage: Coverage for added or modified lines of code (excludes deleted files). Learn more.
Total Coverage: Coverage for the whole repository, calculated as the sum of all File Coverage. Learn more.
File Coverage: Covered Lines divided by Covered Lines plus Missed Lines. (Excludes non-executable lines including blank lines and comments.)
- Indirect Changes: Changes to File Coverage for files that were not modified in this PR. Learn more.

PaulaSp3 and others added 30 commits July 31, 2026 12:10

calculation with generations (MN)

022214b

Add relative comparison (when rasters are close) write message in report file add option/ FLAG to calculate with generations data for benchmark tests with generations docu for generations pep8speaks pep8speaks pep8spekas

rebase

e0fcef6

benchmark test

516b9d6

update benchmark data update benchmark data fix cell count computation format fix bug in computing cell counts minor change

enable thalweg computation for one PRA

4822e73

comment do not consider first generation simplified computation ofaveraging If possible, use relID in thalweg name

correct resampling

4114cd9

simplify functions

1d75003

correct resampling for zdelta and flux

cac8753

dont cut thalweg

2c51df1

also save total resampled path

7b20f96

top extension depending on flow direction

30609dc

new structure

0de93d0

only extend thalweg with flag

72ada7e

only compute thalweg extension when flag is switched on

d28d420

Add regional thalweg plot files; structure

a1eda3a

all plots work tidy up format and tidy up

tidy up

f789a8c

flag for using relID for thalweg computation

32f4849

minor

562db1b

add a tiling method for thalweg calculation with release IDs

87bb037

minor

1ce848b

gaaames

eacfec8

fix bug

2885b77

bug fiured out

9cd5119

correct tiling offset in x and y direction

08ab9e2

add statistic box plot

31abe93

fix maximum computation

f1b1313

minor

0a611e1

PaulaSp3 and others added 18 commits July 31, 2026 12:10

flag if extended or averaged thalweg si plotted

1291d19

fix bugs after rebasing

d6cc77a

fix error when only one release cell

55bcb63

delete print

3b3645b

review thalweg computation

5f5a121

review

c300954

fix typo

cd5b0e8

fix minor

14dfdce

fix bug

edcd850

little improvements

f89a4c4

add docu

22d4f93

move thalweg analysis scripts to ati REPO

bb57e36

delete test file

afbd354

move benchmark test to PS_benchmark

05101e9

add option to change color map for hillshade

495d9c4

fix bug

d653981

add function to save files for a gif

bc3d683

delete all changes of files that are moved to branch PS_thalweg_onlyFP

38d9473

PaulaSp3 requested review from awirb and fso42 July 31, 2026 10:27

PaulaSp3 self-assigned this Jul 31, 2026

PaulaSp3 added the enhancement New feature or request label Jul 31, 2026

PaulaSp3 linked an issue Jul 31, 2026 that may be closed by this pull request

[com4], [ana5]: Add Flowpy thalweg postprocessing #1232

Open

7 tasks

PaulaSp3 changed the title ~~[ana5]: add general thalweg generation~~ [ana5]: add general thalweg extension & resampling Jul 31, 2026

PaulaSp3 linked an issue Jul 31, 2026 that may be closed by this pull request

[com4]: thalweg identification #1235

Open

14 tasks

qltysh Bot reviewed Jul 31, 2026

View reviewed changes

Update avaframe/ana5Utils/DFAPathGeneration.py

79b907d

Co-authored-by: qltysh[bot] <168846912+qltysh[bot]@users.noreply.github.com>

qualty comments

77a30da

Navigation Menu

Uh oh!

[ana5]: add general thalweg extension & resampling - #1323

[ana5]: add general thalweg extension & resampling#1323
PaulaSp3 wants to merge 60 commits into
masterfrom
PS_FP_thalweg

PaulaSp3 commented Jul 31, 2026 •

edited

Loading

Uh oh!

qltysh Bot commented Jul 31, 2026 •

edited

Loading

Uh oh!

qltysh Bot Jul 31, 2026

Uh oh!

qltysh Bot Jul 31, 2026

Uh oh!

Uh oh!

qltysh Bot Jul 31, 2026

Uh oh!

qltysh Bot Jul 31, 2026

Uh oh!

qltysh Bot Jul 31, 2026

Uh oh!

Uh oh!

Uh oh!

qltysh Bot Jul 31, 2026

Uh oh!

qltysh Bot Jul 31, 2026

Uh oh!

qltysh Bot commented Jul 31, 2026 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

	message = f"If extTopOption = 2, the cfg needs to be provided"
	message = "If extTopOption = 2, the cfg needs to be provided"

Uh oh!

Conversation

PaulaSp3 commented Jul 31, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

PR Checklist

Uh oh!

qltysh Bot commented Jul 31, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Analysis for project AvaFrame

❌ 12 blocking issues (14 total)

Uh oh!

qltysh Bot Jul 31, 2026

Choose a reason for hiding this comment

Uh oh!

qltysh Bot Jul 31, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

qltysh Bot Jul 31, 2026

Choose a reason for hiding this comment

Uh oh!

qltysh Bot Jul 31, 2026

Choose a reason for hiding this comment

Uh oh!

qltysh Bot Jul 31, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

qltysh Bot Jul 31, 2026

Choose a reason for hiding this comment

Uh oh!

qltysh Bot Jul 31, 2026

Choose a reason for hiding this comment

Uh oh!

qltysh Bot commented Jul 31, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

PaulaSp3 commented Jul 31, 2026 •

edited

Loading

qltysh Bot commented Jul 31, 2026 •

edited

Loading

Analysis for project `AvaFrame`

qltysh Bot commented Jul 31, 2026 •

edited

Loading