From dd78da2ddf64105ab860adefaadedd2f8ebd3e95 Mon Sep 17 00:00:00 2001 From: Felix Oesterle <6945681+fso42@users.noreply.github.com> Date: Thu, 15 Jan 2026 14:37:58 +0100 Subject: [PATCH] add time dependent release settings into cfg; fix bug in docu default time dependent release in parabola --- debrisframe/c1Ti/c1TiCfg.ini | 10 ++++++++++ debrisframe/debrisframeCfg.ini | 2 +- docs/source/installation.rst | 2 +- pyproject.toml | 3 ++- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/debrisframe/c1Ti/c1TiCfg.ini b/debrisframe/c1Ti/c1TiCfg.ini index b5ca11a..cf7d3fc 100644 --- a/debrisframe/c1Ti/c1TiCfg.ini +++ b/debrisframe/c1Ti/c1TiCfg.ini @@ -35,6 +35,16 @@ rhoEnt = 2000 # mass per particle (if MPPDIR is used) [kg] massPerPart = 280000. +#+++++++++++++general start conditions: time dependent release +# if timeDependentRelease is True, provide the the timesteps, thickness and velocity +# for a releases in a csv-table in the REL folder +timeDependentRelease = True +# when checking if an already existing particle is within a release polygon +# (that would cause numerical instabilities and rise an error), one can decide to add a buffer +# around the polygon (0 means take strictly the points inside, a very small value +# will include the points located on the polygon line) +thresholdPointInRel = 0.01 + #++++++++++++Friction model # add the friction using an explicit formulation (1) # or use an implicit method (0) diff --git a/debrisframe/debrisframeCfg.ini b/debrisframe/debrisframeCfg.ini index 4d83ffa..9fd5b84 100644 --- a/debrisframe/debrisframeCfg.ini +++ b/debrisframe/debrisframeCfg.ini @@ -5,7 +5,7 @@ [MAIN] # Path to avalanche directory #TODO: change avalancheDir to debrisDir -avalancheDir = ../../AvaFrame/avaframe/data/avaParabola +avalancheDir = ../../AvaFrame/avaframe/data/avaParabolaTimeDep # number of CPU cores to use for the computation of com1DFA # possible values are: diff --git a/docs/source/installation.rst b/docs/source/installation.rst index 1638574..c8ec6fe 100644 --- a/docs/source/installation.rst +++ b/docs/source/installation.rst @@ -30,7 +30,7 @@ change into your ``debrisframe`` directory (replace [YOURDIR] with your path fro cd [YOURDIR]/DebrisFrame/debrisframe - python runComo1Debris.py + python runC1Ti.py diff --git a/pyproject.toml b/pyproject.toml index 27317c7..034df57 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,7 +25,7 @@ classifiers = [ "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.13", ] -requires-python = ">=3.9" +requires-python = ">=3.9,<3.14" dependencies = [ ] @@ -49,6 +49,7 @@ channels = ["conda-forge/label/qgis_ltr", "https://prefix.dev/conda-forge"] platforms = ["linux-64", "win-64", "osx-64"] [tool.pixi.dependencies] +python = ">=3.9,<3.14" pytest = "*" setuptools = "*"