forked from bartvdbraak/blender
Fluid: Removed obstacle levelset optimization
Currently results in unstable particle behavior and incorrect meshing.
This commit is contained in:
parent
b7666f27d3
commit
5cf6689019
@ -190,9 +190,6 @@ def liquid_adaptive_step_$ID$(framenr):\n\
|
|||||||
extrapolateLsSimple(phi=phiIn_s$ID$, distance=3)\n\
|
extrapolateLsSimple(phi=phiIn_s$ID$, distance=3)\n\
|
||||||
phi_s$ID$.join(phiIn_s$ID$)\n\
|
phi_s$ID$.join(phiIn_s$ID$)\n\
|
||||||
\n\
|
\n\
|
||||||
if using_obstacle_s$ID$:\n\
|
|
||||||
phi_s$ID$.subtract(o=phiObsIn_s$ID$, flags=flags_s$ID$, subtractType=FlagObstacle)\n\
|
|
||||||
\n\
|
|
||||||
if using_outflow_s$ID$:\n\
|
if using_outflow_s$ID$:\n\
|
||||||
phiOut_s$ID$.join(phiOutIn_s$ID$)\n\
|
phiOut_s$ID$.join(phiOutIn_s$ID$)\n\
|
||||||
\n\
|
\n\
|
||||||
@ -200,6 +197,10 @@ def liquid_adaptive_step_$ID$(framenr):\n\
|
|||||||
updateFractions(flags=flags_s$ID$, phiObs=phiObs_s$ID$, fractions=fractions_s$ID$, boundaryWidth=boundaryWidth_s$ID$, fracThreshold=fracThreshold_s$ID$)\n\
|
updateFractions(flags=flags_s$ID$, phiObs=phiObs_s$ID$, fractions=fractions_s$ID$, boundaryWidth=boundaryWidth_s$ID$, fracThreshold=fracThreshold_s$ID$)\n\
|
||||||
setObstacleFlags(flags=flags_s$ID$, phiObs=phiObs_s$ID$, phiOut=phiOut_s$ID$, fractions=fractions_s$ID$, phiIn=phiIn_s$ID$)\n\
|
setObstacleFlags(flags=flags_s$ID$, phiObs=phiObs_s$ID$, phiOut=phiOut_s$ID$, fractions=fractions_s$ID$, phiIn=phiIn_s$ID$)\n\
|
||||||
\n\
|
\n\
|
||||||
|
if using_obstacle_s$ID$:\n\
|
||||||
|
# TODO (sebbas): Enable flags check again, currently produces unstable particle behavior\n\
|
||||||
|
phi_s$ID$.subtract(o=phiObsIn_s$ID$) #, flags=flags_s$ID$, subtractType=FlagObstacle)\n\
|
||||||
|
\n\
|
||||||
# add initial velocity: set invel as source grid to ensure const vels in inflow region, sampling makes use of this\n\
|
# add initial velocity: set invel as source grid to ensure const vels in inflow region, sampling makes use of this\n\
|
||||||
if using_invel_s$ID$:\n\
|
if using_invel_s$ID$:\n\
|
||||||
extrapolateVec3Simple(vel=invelC_s$ID$, phi=phiIn_s$ID$, distance=6, inside=True)\n\
|
extrapolateVec3Simple(vel=invelC_s$ID$, phi=phiIn_s$ID$, distance=6, inside=True)\n\
|
||||||
|
Loading…
Reference in New Issue
Block a user