[Bf-blender-cvs] [3c516cac3c2] fluid-mantaflow: disabling liquid obstacle velocities for now

Sebastián Barschkis noreply at git.blender.org
Fri Jun 23 21:34:50 CEST 2017


Commit: 3c516cac3c2108ded07d40c03c44e4d3412d3db0
Author: Sebastián Barschkis
Date:   Thu Jun 22 22:45:18 2017 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB3c516cac3c2108ded07d40c03c44e4d3412d3db0

disabling liquid obstacle velocities for now

need fractions support for obvels first

===================================================================

M	intern/mantaflow/intern/strings/liquid_script.h

===================================================================

diff --git a/intern/mantaflow/intern/strings/liquid_script.h b/intern/mantaflow/intern/strings/liquid_script.h
index 2d650d78ecb..e1d7063550f 100644
--- a/intern/mantaflow/intern/strings/liquid_script.h
+++ b/intern/mantaflow/intern/strings/liquid_script.h
@@ -237,12 +237,12 @@ def liquid_step_$ID$():\n\
     extrapolateVec3Simple(vel=obvel_s$ID$, phi=phiObsIn_s$ID$, distance=1, inside=False)\n\
     \n\
     extrapolateMACSimple(flags=flags_s$ID$, vel=vel_s$ID$, distance=2, intoObs=True)\n\
-    setWallBcs(flags=flags_s$ID$, vel=vel_s$ID$, fractions=fractions_s$ID$, phiObs=phiObs_s$ID$, obvel=obvel_s$ID$)\n\
+    setWallBcs(flags=flags_s$ID$, vel=vel_s$ID$, fractions=fractions_s$ID$, phiObs=phiObs_s$ID$)#, obvel=obvel_s$ID$) # TODO: uncomment for obvel support (once fraction wallbcs works)\n\
     \n\
     solvePressure(flags=flags_s$ID$, vel=vel_s$ID$, pressure=pressure_s$ID$, phi=phi_s$ID$, fractions=fractions_s$ID$)\n\
     \n\
     extrapolateMACSimple(flags=flags_s$ID$, vel=vel_s$ID$, distance=4, intoObs=True)\n\
-    setWallBcs(flags=flags_s$ID$, vel=vel_s$ID$, fractions=fractions_s$ID$, phiObs=phiObs_s$ID$, obvel=obvel_s$ID$)\n\
+    setWallBcs(flags=flags_s$ID$, vel=vel_s$ID$, fractions=fractions_s$ID$, phiObs=phiObs_s$ID$)#, obvel=obvel_s$ID$) # TODO: uncomment for obvel support (once fraction wallbcs works)\n\
     \n\
     if (dim_s$ID$==3):\n\
         # mis-use phiParts as temp grid to close the mesh\n\




More information about the Bf-blender-cvs mailing list