[Bf-blender-cvs] [4500bd8] fluid-mantaflow: added phitemp grid to mantaflow script (for blender to use for liquid mesh map)
Sebastián Barschkis
noreply at git.blender.org
Sat May 28 14:41:14 CEST 2016
Commit: 4500bd81953a30f9d88c896efccc353103cead9c
Author: Sebastián Barschkis
Date: Thu May 26 22:05:12 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB4500bd81953a30f9d88c896efccc353103cead9c
added phitemp grid to mantaflow script (for blender to use for liquid mesh map)
===================================================================
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 d3b4c81..0ebcbf6 100644
--- a/intern/mantaflow/intern/strings/liquid_script.h
+++ b/intern/mantaflow/intern/strings/liquid_script.h
@@ -54,6 +54,7 @@ flags = s.create(FlagGrid)\n\
\n\
phiParts = s.create(LevelsetGrid)\n\
phi = s.create(LevelsetGrid)\n\
+phiTemp = s.create(LevelsetGrid)\n\
pressure = s.create(RealGrid)\n\
\n\
vel = s.create(MACGrid)\n\
@@ -71,7 +72,8 @@ gpi = s.create(IntGrid)\n";
const std::string prep_domain = "\n\
flags.initDomain(boundaryWidth=0)\n\
-phi.initFromFlags(flags)\n";
+phi.initFromFlags(flags)\n\
+phiTemp.initFromFlags(flags)\n";
//////////////////////////////////////////////////////////////////////
// ADAPTIVE STEP
@@ -85,11 +87,12 @@ def manta_step(start_frame):\n\
\n\
# Sample particles on first frame\n\
if (start_frame == 1):\n\
- phi.printGrid(zSlice=10)\n\
+ phi.copyFrom(phiTemp)\n\
flags.updateFromLevelset(phi)\n\
sampleLevelsetWithParticles( phi=phi, flags=flags, parts=pp, discretization=2, randomness=0.4 )\n\
mapGridToPartsVec3(source=vel, parts=pp, target=pVel )\n\
\n\
+ phiTemp.printGrid(zSlice=23)\n\
while s.frame == last_frame:\n\
global step\n\
step = step + 1\n\
@@ -179,6 +182,7 @@ mantaMsg('Deleting grids, mesh, particlesystem')\n\
if 'flags' in globals() : del flags\n\
if 'phiParts' in globals() : del phiParts\n\
if 'phi' in globals() : del phi\n\
+if 'phiTemp' in globals() : del phiTemp\n\
if 'pressure' in globals() : del pressure\n\
if 'vel' in globals() : del vel\n\
if 'velOld' in globals() : del velOld\n\
More information about the Bf-blender-cvs
mailing list