[Bf-blender-cvs] [4a2909c] fluid-mantaflow: cleanup in manta liquid and smoke scripts

[Sebastián Barschkis]

Commit: 4a2909c1471b0e4e2a3572e390b828da862f1ac9
Author: Sebastián Barschkis
Date:   Wed Aug 17 19:15:45 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB4a2909c1471b0e4e2a3572e390b828da862f1ac9

cleanup in manta liquid and smoke scripts

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

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

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

diff --git a/intern/mantaflow/intern/strings/liquid_script.h b/intern/mantaflow/intern/strings/liquid_script.h
index 3c5bc27..8e375ac 100644
--- a/intern/mantaflow/intern/strings/liquid_script.h
+++ b/intern/mantaflow/intern/strings/liquid_script.h
@@ -52,6 +52,7 @@ if doOpen:\n\
 //////////////////////////////////////////////////////////////////////
 
 const std::string liquid_variables_low = "\n\
+mantaMsg('Liquid variables low')\n\
 narrowBand       = True\n\
 narrowBandWidth  = 3\n\
 combineBandWidth = narrowBandWidth - 1\n\
@@ -67,6 +68,7 @@ maxVel  = 0\n\
 using_highres = $USE_WAVELETS$\n";
 
 const std::string liquid_variables_high = "\n\
+mantaMsg('Liquid variables high')\n\
 scale = 0.5\n\
 xl_radiusFactor = 2.5\n";
 
@@ -75,6 +77,7 @@ xl_radiusFactor = 2.5\n";
 //////////////////////////////////////////////////////////////////////
 
 const std::string liquid_alloc_low = "\n\
+mantaMsg('Liquid alloc low')\n\
 flags      = s.create(FlagGrid)\n\
 \n\
 phiParts   = s.create(LevelsetGrid)\n\
@@ -96,6 +99,7 @@ pindex     = s.create(ParticleIndexSystem)\n\
 gpi        = s.create(IntGrid)\n";
 
 const std::string liquid_alloc_high = "\n\
+mantaMsg('Liquid alloc high')\n\
 xl_flags   = xl.create(FlagGrid)\n\
 xl_phi     = xl.create(LevelsetGrid)\n\
 xl_pp      = xl.create(BasicParticleSystem)\n\
diff --git a/intern/mantaflow/intern/strings/smoke_script.h b/intern/mantaflow/intern/strings/smoke_script.h
index 7cba85b..9680d5c 100644
--- a/intern/mantaflow/intern/strings/smoke_script.h
+++ b/intern/mantaflow/intern/strings/smoke_script.h
@@ -87,7 +87,7 @@ using_fire = True\n";
 
 const std::string smoke_alloc_low = "\n\
 # prepare grids low\n\
-mantaMsg('Smoke alloc grids low')\n\
+mantaMsg('Smoke alloc low')\n\
 flags       = s.create(FlagGrid)\n\
 vel         = s.create(MACGrid)\n\
 x_vel       = s.create(RealGrid)\n\
@@ -108,7 +108,7 @@ fuel_inflow = s.create(LevelsetGrid)\n";
 
 const std::string smoke_alloc_high = "\n\
 # prepare grids high\n\
-mantaMsg('Smoke alloc grids high')\n\
+mantaMsg('Smoke alloc high')\n\
 xl_flags   = xl.create(FlagGrid)\n\
 xl_vel     = xl.create(MACGrid)\n\
 xl_density = xl.create(RealGrid)\n\
@@ -498,8 +498,6 @@ if 'maxvel'          in globals() : del maxvel\n";
 
 const std::string smoke_delete_variables_high = "\n\
 mantaMsg('Deleting variables high')\n\
-if 'upres'       in globals() : del upres\n\
-if 'xl_gs'       in globals() : del xl_gs\n\
 if 'wltStrength' in globals() : del wltStrength\n\
 if 'uvs'         in globals() : del uvs\n\
 if 'uv'          in globals() : del uv\n\