[Bf-blender-cvs] [fb7b154accb] fluid-mantaflow: improved liquid inflow / generating phi grid

[Sebastián Barschkis]

Commit: fb7b154accb11a8208bd20acd88f7adbe24a96f5
Author: Sebastián Barschkis
Date:   Wed May 3 19:24:16 2017 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rBfb7b154accb11a8208bd20acd88f7adbe24a96f5

improved liquid inflow / generating phi grid

phiObs has to be subtracted from phi and not just from phiIn. otherwise when joining phi and phiIn, some obstacle areas in phi are not set to positive value, stay negative and hence show up as liquid

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

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 2a9977f57c5..8f99684b23e 100644
--- a/intern/mantaflow/intern/strings/liquid_script.h
+++ b/intern/mantaflow/intern/strings/liquid_script.h
@@ -167,8 +167,8 @@ def manta_step_$ID$(framenr):\n\
             setOpenBound(flags=flags_s$ID$, bWidth=boundaryWidth_s$ID$, openBound=boundConditions_s$ID$, type=FlagOutflow|FlagEmpty)\n\
         \n\
         phiObs_s$ID$.join(phiObsIn_s$ID$)\n\
-        phiIn_s$ID$.subtract(phiObs_s$ID$)\n\
         phi_s$ID$.join(phiIn_s$ID$)\n\
+        phi_s$ID$.subtract(phiObsIn_s$ID$)\n\
         \n\
         #updateFractions(flags=flags_s$ID$, phiObs=phiObs_s$ID$, fractions=fractions_s$ID$, boundaryWidth=boundaryWidth_s$ID$) # TODO: uncomment for fractions\n\
         setObstacleFlags(flags=flags_s$ID$, phiObs=phiObs_s$ID$, phiOut=phiOut_s$ID$)#, fractions=fractions_s$ID$) # TODO: uncomment for fractions\n\