[com1]: option to delete stopped particles, and adapt surface according to deposition & erosion#1112
Merged
[com1]: option to delete stopped particles, and adapt surface according to deposition & erosion#1112
Conversation
Contributor
3 new issues
|
PaulaSp3
force-pushed
the
PS_adaptiveDEM
branch
from
ab72c3a to
c41653a
Compare
Contributor
|
Diff Coverage: The code coverage on the diff in this pull request is 68.6%. Total Coverage: This PR will increase coverage by 0.13%. File Coverage Changes
🛟 Help
|
![qlty-cloud-legacy[bot]](https://avatars.githubusercontent.com/in/9403?s=60&v=4){kind=small}
PaulaSp3
force-pushed
the
PS_adaptiveDEM
branch
2 times, most recently
from
95dd9f4 to
7eff7ae
Compare
![qltysh[bot]](https://avatars.githubusercontent.com/in/890766?s=60&v=4){kind=small}
PaulaSp3
force-pushed
the
PS_adaptiveDEM
branch
from
3fd99e2 to
a17f205
Compare
PaulaSp3
force-pushed
the
PS_adaptiveDEM
branch
from
a17f205 to
2d7550e
Compare
|
Code Climate has analyzed commit a6468d0 and detected 1 issue on this pull request. Here's the issue category breakdown:
The test coverage on the diff in this pull request is 89.8% (50% is the threshold). This pull request will bring the total coverage in the repository to 70.3% (0.2% change). View more on Code Climate. |
PaulaSp3
force-pushed
the
PS_adaptiveDEM
branch
2 times, most recently
from
829c7a3 to
4b9fe18
Compare
fso42
requested changes
May 28, 2025
PaulaSp3
force-pushed
the
PS_adaptiveDEM
branch
3 times, most recently
from
1b9da7f to
f462ffa
Compare
PaulaSp3
force-pushed
the
PS_adaptiveDEM
branch
4 times, most recently
from
3680819 to
a67bab8
Compare
awirb
approved these changes
Jul 4, 2025
fso42
requested changes
Jul 7, 2025
fso42
approved these changes
Jul 7, 2025
compute hDep and hEro per time step adapt DEM with Erosion and Deposition deposit partciles use function to delete particles minor minor consider deposited particles in demAdapted adapt DEM from deposition and detrainment fixed bugs write stopped mass in MB file§ move computation for erosion thickness to upateFields fix bug and to create report pngs for thenew outputs compute normalized vectors of every topography makes avalanche not flowing downwards minor now deposition and adaptive topo works! tidy up flags for adapt sfc and delete stopped particles; separate stopping + detrainment fix adapt dem separate in stopping, detrainment and entrainment minor changes flag to choose if original or adapted DEM is background in report plots adapt and write tests for adaptive topography check if parameter methodmeshnormal has a plausible value adapt variable names to consistent wording array computing delete not used variables first doc fix bug: add change of depth to DEM instead of thickness adapt test for computation with depth fix bug test normals for testing normals comments test still error! tidy up minor change chnage output files minor improvements peakfile hDetrained etc is summed up over all timesteps comments Felix comments Felix adapt test move function to choose plot-DEM merge detrained, entrained, stopped depth change to sfcChange adapt ouput name adapt test adapt test fix bug in MB file, adapt test fix errors in test fix error fix error comments AW threshold to chnage surface in ini simplify adaptDem function adapt test for simplified adapt Dem function
Contributor
|
Standardtest ok, apart from know res |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
option (flag
delStoppedParticles) that particles with mass = 0 or velocity = 0 are deletedoption that surface according to entrainment (
adaptSfcEntrainment), detrainment (adaptSfcDetrainment) and/or stopping (adaptSfcStopped) is adapted in every time stepnow the surface is only adapted if in one raster cell the height change is > 0.1 m (can/should be adapated)
check normals:
avaKot (entres):
-- normalized normals (z-component) (= cos(theta)) do not change (relatively) by more than 1.5% (from one time step to another) (except in the last time step)
-- theta (slope) does not change by more than 3° (absolut) (except in the last time step)
-- theta (slope) changes by more than 10% (relatively), but only in areas where there is stopping (and in flat terrain) (except in the last time step)
e.g. time step 94.5 s (it has the maximal change (in one cell) of the slope angle from one timestep to another)
avaKot, entres simulation with detrainment (in whole resistance area, detK = 20), explicitFriction = 1, delStoppedParticles = 1, adaptSfcStopped = 1, adaptSfcDetrainment = 1, adaptSfcEntrainment = 1
pfv (in whole domain)
zoom to slope angle change (slope angle(t=94.5) - slope angle(t=94.4)):
zoom to depth change (that is added to surface in t=94.5):
avaKot (ent; adaptSfcStopped = 0, adaptSfcEntrainment = 1): maximal slope angle change (per cell from one timestep to another): 0.079°
avaMal (ent; adaptSfcStopped = 0, adaptSfcEntrainment = 1)): maximal slope angle change (per cell from one timestep to another): 0.6° (at time step 39.7)
pfv (in whole domain)
zoom to slope angle change (slope angle(t=39.7) - slope angle(t=39.6)):
zoom to depth change (that is added to surface in t=39.7):
-- normalized normals (z-component) (= cos(theta)) do not change (relatively) by more than 1.5% (from one time step to another) (except in the last time step)
-- theta (slope) does not change by more than 5° (absolut) (except in the last time step)
-- theta changes by more than 3° (absolut): due to stopping
-- theta (slope) changes by more than 10% (relatively), but only in areas where there is stopping (and in flat terrain) (except in the last time step)
changed computation time due to adapting surface: (explicitFriction = 1, delStoppedParticles = 1, adaptSfcStopped = 1, adaptSfcDetrainment = 1, adaptSfcEntrainment = 1)
adapted docu is in progress...
some further ideas/ thoughts/ issues: #1113