Skip to content

[com1] add option for resistance #1105

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
Jun 3, 2025
Merged

[com1] add option for resistance #1105

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
8a154a3
add option for resistance
awirb Mar 12, 2025
c1b6e57
feat(config): add black plugin for code formatting
fso42 Jun 2, 2025
0d97b8c
(sys) black formatting of files
fso42 Jun 2, 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
3 changes: 3 additions & 0 deletions .qlty/qlty.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,5 +156,8 @@ name = "trufflehog"
[[plugin]]
name = "yamllint"

[[plugin]]
name = "black"

#[[plugin]]
#name = "flake8"
2 changes: 1 addition & 1 deletion avaframe/com1DFA/DFAfunctionsCython.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ cpdef (double, double) computeEntMassAndForce(double, double, double, double, do

cpdef double computeDetMass(double, double, double, double)

cpdef double computeResForce(double, double, double, double, double, double, int, int)
cpdef double computeResForce(double, double, double, double, int, int)

cdef (double, double, double) addArtificialViscosity(double, double, double, double, double, double, double, double,
int, int, double, double, double, double,
Expand Down
19 changes: 3 additions & 16 deletions avaframe/com1DFA/DFAfunctionsCython.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ def computeForceC(cfg, particles, fields, dem, int frictType, int resistanceType
cdef double entDefResistance = cfg.getfloat('entDefResistance')
cdef double rho = cfg.getfloat('rho')
cdef double rhoEnt = cfg.getfloat('rhoEnt')
cdef double hRes = cfg.getfloat('hRes')
cdef double gravAcc = cfg.getfloat('gravAcc')
cdef double xsiVoellmy = cfg.getfloat('xsivoellmy')
cdef double muVoellmy = cfg.getfloat('muvoellmy')
Expand Down Expand Up @@ -371,7 +370,7 @@ def computeForceC(cfg, particles, fields, dem, int frictType, int resistanceType

# adding resistance force due to obstacles
cResCell = cResRaster[indCellY][indCellX]
cResPart = computeResForce(hRes, h, areaPart, rho, cResCell, uMag, explicitFriction, resistanceType)
cResPart = computeResForce(areaPart, rho, cResCell, uMag, explicitFriction, resistanceType)
forceFrict[k] = forceFrict[k] - cResPart

uxArray[k] = ux
Expand Down Expand Up @@ -502,16 +501,12 @@ cpdef double computeDetMass(double dt, double detCell,
return dmDet


cpdef double computeResForce(double hRes, double h, double areaPart, double rho, double cResCell,
cpdef double computeResForce(double areaPart, double rho, double cResCell,
double uMag, int explicitFriction, int resistanceType):
""" compute force component due to resistance

Parameters
----------
hRes: float
resistance height
h : float
particle flow thickness
areaPart : float
particle area
rho : float
Expand All @@ -530,23 +525,15 @@ cpdef double computeResForce(double hRes, double h, double areaPart, double rho,
cResPart : float
resistance component for particle
"""
cdef double hResEff = hRes

cdef double cRecResPart
if(h < hRes):
hResEff = h
# explicit formulation (explicitFriction == 1)
if explicitFriction == 1:
if resistanceType == 1:
# cRes
cRecResPart = - rho * areaPart * hResEff * cResCell * uMag * uMag
elif resistanceType == 2:
# cResH
cRecResPart = - rho * areaPart * cResCell * uMag * uMag
elif explicitFriction == 0:
if resistanceType == 1:
# cRes
cRecResPart = - rho * areaPart * hResEff * cResCell * uMag
elif resistanceType == 2:
# cResH
cRecResPart = - rho * areaPart * cResCell * uMag
return cRecResPart
Expand Down
Loading
Loading