Skip to content

feat(runCom6Scarp): add method override functionality for scarp analysis #1209

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 3 commits into from
Nov 18, 2025
Merged

feat(runCom6Scarp): add method override functionality for scarp analysis #1209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf529bf
feat(runCom6Scarp): add method override functionality for scarp analysis
fso42 Nov 18, 2025
74b5cbf
test(tests): add unit tests for `scarp` module default plane method
fso42 Nov 18, 2025
3ae5d3c
refactor(tests): reformat long assertions and improve readability
fso42 Nov 18, 2025
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
20 changes: 18 additions & 2 deletions avaframe/runCom6Scarp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,15 @@
from avaframe.in3Utils import initializeProject as initProj


def runScarpAnalysisWorkflow(inputDir=""):
def runScarpAnalysisWorkflow(inputDir="", method=""):
"""Run the scarp analysis workflow.

Parameters
----------
inputDir: str
Path to the input directory containing DEM, coordinates and perimeter files.
method: str
Method to use for scarp analysis: plane, ellipsoid, or ini (use config file default).

Returns
-------
Expand Down Expand Up @@ -49,6 +51,14 @@ def runScarpAnalysisWorkflow(inputDir=""):
# load scarp config
scarpCfg = cfgUtils.getModuleConfig(scarp)

# Set method according to cmd argument
if method.lower() == "plane":
scarpCfg["SETTINGS"]["method"] = "plane"
elif method.lower() == "ellipsoid":
scarpCfg["SETTINGS"]["method"] = "ellipsoid"
else:
log.info("no method override given - using ini")

# Run the scarp analysis
scarp.scarpAnalysisMain(scarpCfg, str(inputDir))

Expand All @@ -62,6 +72,12 @@ def runScarpAnalysisWorkflow(inputDir=""):
parser.add_argument(
"inputDir", metavar="inputDir", type=str, nargs="?", default="", help="the input directory"
)
parser.add_argument(
"-m", "--method", choices=["plane", "ellipsoid", "ini"],
type=str, default="ini",
help="method override, possible values are plane, ellipsoid and ini. " +
"Overrides default AND local configs"
)

args = parser.parse_args()
runScarpAnalysisWorkflow(str(args.inputDir))
runScarpAnalysisWorkflow(str(args.inputDir), str(args.method))
Loading
Loading