Skip to content
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

Jump to bottom

Arb fix/d2q9 pf velocity #471

Merged
merged 4 commits into from
Dec 20, 2023
Merged

Arb fix/d2q9 pf velocity #471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bcad0ef
+ initial fix to remove nan. todo-new field for solid, remove edge ra…
TravisMitchell Dec 20, 2023
8a8a277
+ add nan flag for cart grid as well for consistent behaviour
TravisMitchell Dec 20, 2023
a1be45a
+ comment print statements
TravisMitchell Dec 20, 2023
f05a11b
+ adjust calc grad phi for efficiency, maintainability, and consistency
TravisMitchell Dec 20, 2023
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
15 changes: 7 additions & 8 deletions models/multiphase/d2q9_pf_velocity/Dynamics.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,20 +86,20 @@ if (Options$RT) {
AddStage("BaseInit" , "Init_distributions" , save=Fields$group %in% c("g","h","Vel"))

# iteration
AddStage("BaseIter" , "calcHydroIter" , save=Fields$group %in% c("g","h","Vel","nw") , load=DensityAll$group %in% c("g","h","Vel","nw")) # TODO: is nw needed here?
AddStage("BaseIter" , "calcHydroIter" , save=Fields$group %in% c("g","h","Vel","nw") , load=DensityAll$group %in% c("PF","g","h","Vel","nw")) # TODO: is nw needed here?
AddStage("PhaseIter" , "calcPhaseFIter" , save=Fields$group %in% c("PF") , load=DensityAll$group %in% c("g","h","Vel","nw"))
AddStage("WallIter" , "calcWallPhaseIter" , save=Fields$group %in% c("PF") , load=DensityAll$group %in% c("nw"))
AddStage("WallIter" , "calcWallPhaseIter" , save=Fields$group %in% c("PF") , load=DensityAll$group %in% c("nw","PF")) # Purposefully read/write of PF for boundary. complex geom may force RACE condition.
}

AddAction("Iteration", c("BaseIter", "PhaseIter","WallIter"))
AddAction("Init" , c("PhaseInit","WallInit", "WallIter","BaseInit"))

# Outputs:
AddQuantity(name="Rho", unit="kg/m3")
AddQuantity(name="PhaseField",unit="1")
AddQuantity(name="U", unit="m/s",vector=T)
AddQuantity(name="NormalizedPressure", unit="Pa")
AddQuantity(name="Pressure", unit="Pa")
AddQuantity(name="Rho", unit="kg/m3")
AddQuantity(name="PhaseField", unit="1")
AddQuantity(name="U", unit="m/s",vector=T)
AddQuantity(name="NormalizedPressure", unit="1")
AddQuantity(name="Pressure", unit="Pa")
AddQuantity(name="Normal", unit="1", vector=T)

# Initialisation States
Expand Down Expand Up @@ -209,5 +209,4 @@ if (Options$Outflow) {
}
AddNodeType(name="Solid", group="BOUNDARY")
AddNodeType(name="Wall", group="BOUNDARY")
AddNodeType(name="BGK", group="COLLISION")
AddNodeType(name="MRT", group="COLLISION")
Loading
Loading