diff options
| author | Sebastián Barschkis <sebbas@sebbas.org> | 2020-03-27 02:16:05 +0300 |
|---|---|---|
| committer | Sebastián Barschkis <sebbas@sebbas.org> | 2020-03-27 02:16:34 +0300 |
| commit | 5cf66890197211b2a64cb30fc6ba746360e02ae0 (patch) | |
| tree | d02bb0ba5073b85cc4234348e5dc1e449995f071 /intern | |
| parent | b7666f27d33737f1499fd416e2da3562ea4bca03 (diff) | |
Fluid: Removed obstacle levelset optimization
Currently results in unstable particle behavior and incorrect meshing.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/mantaflow/intern/strings/liquid_script.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/intern/mantaflow/intern/strings/liquid_script.h b/intern/mantaflow/intern/strings/liquid_script.h index e9222fc7d93..b0bf6f85914 100644 --- a/intern/mantaflow/intern/strings/liquid_script.h +++ b/intern/mantaflow/intern/strings/liquid_script.h @@ -190,9 +190,6 @@ def liquid_adaptive_step_$ID$(framenr):\n\ extrapolateLsSimple(phi=phiIn_s$ID$, distance=3)\n\ phi_s$ID$.join(phiIn_s$ID$)\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\ phiOut_s$ID$.join(phiOutIn_s$ID$)\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\ setObstacleFlags(flags=flags_s$ID$, phiObs=phiObs_s$ID$, phiOut=phiOut_s$ID$, fractions=fractions_s$ID$, phiIn=phiIn_s$ID$)\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\ if using_invel_s$ID$:\n\ extrapolateVec3Simple(vel=invelC_s$ID$, phi=phiIn_s$ID$, distance=6, inside=True)\n\ |