[Bf-blender-cvs] [07c02b0462d] fluid-mantaflow: cleanup debug output and also added some sanity type conversions

[Sebastián Barschkis]

Commit: 07c02b0462d1bd8490033c98b14abf65e1cbdbc3
Author: Sebastián Barschkis
Date:   Sat Dec 2 12:52:32 2017 +0100
Branches: fluid-mantaflow
https://developer.blender.org/rB07c02b0462d1bd8490033c98b14abf65e1cbdbc3

cleanup debug output and also added some sanity type conversions

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

M	intern/mantaflow/intern/FLUID.cpp
M	intern/mantaflow/intern/strings/liquid_script.h
M	intern/mantaflow/intern/strings/shared_script.h
M	intern/mantaflow/intern/strings/smoke_script.h

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

diff --git a/intern/mantaflow/intern/FLUID.cpp b/intern/mantaflow/intern/FLUID.cpp
index 824785223e2..6cbf1e949ab 100644
--- a/intern/mantaflow/intern/FLUID.cpp
+++ b/intern/mantaflow/intern/FLUID.cpp
@@ -228,9 +228,17 @@ FLUID::FLUID(int *res, SmokeModifierData *smd) : mCurrentID(++solverID)
 
 void FLUID::initDomain(SmokeModifierData *smd)
 {
-	std::string tmpString = manta_import
-		+ manta_debuglevel
-		+ fluid_variables_low
+	// Set manta debug level first
+	mCommands.clear();
+	mCommands.push_back(manta_import + manta_debuglevel);
+
+	std::ostringstream debuglevel;
+	debuglevel <<  "set_manta_debuglevel(" << with_debug << ")";
+	mCommands.push_back(debuglevel.str());
+	runPythonString(mCommands);
+
+	// Now init basic fluid domain
+	std::string tmpString = fluid_variables_low
 		+ fluid_solver_low
 		+ fluid_obstacle_export_low
 		+ fluid_guiding_export_low
@@ -241,11 +249,6 @@ void FLUID::initDomain(SmokeModifierData *smd)
 	std::string finalString = parseScript(tmpString, smd);
 	mCommands.clear();
 	mCommands.push_back(finalString);
-	
-	// Set manta debug level
-	std::ostringstream debuglevel;
-	debuglevel <<  "set_manta_debuglevel(" << with_debug << ")";
-	mCommands.push_back(debuglevel.str());
 	runPythonString(mCommands);
 }
 
@@ -484,6 +487,8 @@ FLUID::~FLUID()
 	// Destruction string for Python
 	std::string tmpString = "";
 
+	tmpString += manta_import;
+
 	// Fluid
 	tmpString += fluid_delete_variables_low;
 	tmpString += fluid_delete_variables_high;
diff --git a/intern/mantaflow/intern/strings/liquid_script.h b/intern/mantaflow/intern/strings/liquid_script.h
index deea39f8272..bb26b1ffd81 100644
--- a/intern/mantaflow/intern/strings/liquid_script.h
+++ b/intern/mantaflow/intern/strings/liquid_script.h
@@ -114,23 +114,23 @@ const std::string liquid_pre_step_low = "\n\
 def liquid_pre_step_low_$ID$():\n\
     # translate obvels (world space) to grid space\n\
     if using_obstacle_s$ID$:\n\
-        x_obvel_s$ID$.multConst(gs_s$ID$.x)\n\
-        y_obvel_s$ID$.multConst(gs_s$ID$.y)\n\
-        z_obvel_s$ID$.multConst(gs_s$ID$.z)\n\
+        x_obvel_s$ID$.multConst(Real(gs_s$ID$.x))\n\
+        y_obvel_s$ID$.multConst(Real(gs_s$ID$.y))\n\
+        z_obvel_s$ID$.multConst(Real(gs_s$ID$.z))\n\
         copyRealToVec3(sourceX=x_obvel_s$ID$, sourceY=y_obvel_s$ID$, sourceZ=z_obvel_s$ID$, target=obvelC_s$ID$)\n\
     \n\
     # translate guiding vels (world space) to grid space\n\
     if using_guiding_s$ID$:\n\
-        x_guidevel_s$ID$.multConst(gs_s$ID$.x)\n\
-        y_guidevel_s$ID$.multConst(gs_s$ID$.y)\n\
-        z_guidevel_s$ID$.multConst(gs_s$ID$.z)\n\
+        x_guidevel_s$ID$.multConst(Real(gs_s$ID$.x))\n\
+        y_guidevel_s$ID$.multConst(Real(gs_s$ID$.y))\n\
+        z_guidevel_s$ID$.multConst(Real(gs_s$ID$.z))\n\
         copyRealToVec3(sourceX=x_guidevel_s$ID$, sourceY=y_guidevel_s$ID$, sourceZ=z_guidevel_s$ID$, target=guidevelC_s$ID$)\n\
     \n\
     # translate invels (world space) to grid space\n\
     if using_invel_s$ID$:\n\
-        x_invel_s$ID$.multConst(gs_s$ID$.x)\n\
-        y_invel_s$ID$.multConst(gs_s$ID$.y)\n\
-        z_invel_s$ID$.multConst(gs_s$ID$.z)\n\
+        x_invel_s$ID$.multConst(Real(gs_s$ID$.x))\n\
+        y_invel_s$ID$.multConst(Real(gs_s$ID$.y))\n\
+        z_invel_s$ID$.multConst(Real(gs_s$ID$.z))\n\
         copyRealToVec3(sourceX=x_invel_s$ID$, sourceY=y_invel_s$ID$, sourceZ=z_invel_s$ID$, target=invel_s$ID$)\n\
     \n\
     copyRealToVec3(sourceX=x_vel_s$ID$, sourceY=y_vel_s$ID$, sourceZ=z_vel_s$ID$, target=vel_s$ID$)\n\
diff --git a/intern/mantaflow/intern/strings/shared_script.h b/intern/mantaflow/intern/strings/shared_script.h
index f547296ae08..e6df80a489e 100644
--- a/intern/mantaflow/intern/strings/shared_script.h
+++ b/intern/mantaflow/intern/strings/shared_script.h
@@ -267,11 +267,11 @@ if 'pLifeSnd_pp$ID$' in globals() : del pLifeSnd_pp$ID$\n";
 
 const std::string fluid_multigrid_cleanup_low = "\n\
 mantaMsg('Cleanup multigrid low')\n\
-releaseMG(s$ID$)\n";
+if 's$ID$' in globals() : releaseMG(s$ID$)\n";
 
 const std::string fluid_multigrid_cleanup_high = "\n\
 mantaMsg('Cleanup multigrid high')\n\
-releaseMG(xl$ID$)\n";
+if 'xl$ID$' in globals() : releaseMG(xl$ID$)\n";
 
 const std::string fluid_guiding_cleanup_low = "\n\
 mantaMsg('Cleanup guiding low')\n\
diff --git a/intern/mantaflow/intern/strings/smoke_script.h b/intern/mantaflow/intern/strings/smoke_script.h
index 7f30016c828..ccca92d5483 100644
--- a/intern/mantaflow/intern/strings/smoke_script.h
+++ b/intern/mantaflow/intern/strings/smoke_script.h
@@ -179,23 +179,23 @@ def smoke_pre_step_low_$ID$():\n\
     mantaMsg('Smoke pre step low')\n\
     # translate obvels (world space) to grid space\n\
     if using_obstacle_s$ID$:\n\
-        x_obvel_s$ID$.multConst(gs_s$ID$.x)\n\
-        y_obvel_s$ID$.multConst(gs_s$ID$.y)\n\
-        z_obvel_s$ID$.multConst(gs_s$ID$.z)\n\
+        x_obvel_s$ID$.multConst(Real(gs_s$ID$.x))\n\
+        y_obvel_s$ID$.multConst(Real(gs_s$ID$.y))\n\
+        z_obvel_s$ID$.multConst(Real(gs_s$ID$.z))\n\
         copyRealToVec3(sourceX=x_obvel_s$ID$, sourceY=y_obvel_s$ID$, sourceZ=z_obvel_s$ID$, target=obvelC_s$ID$)\n\
     \n\
     # translate guiding vels (world space) to grid space\n\
     if using_guiding_s$ID$:\n\
-        x_guidevel_s$ID$.multConst(gs_s$ID$.x)\n\
-        y_guidevel_s$ID$.multConst(gs_s$ID$.y)\n\
-        z_guidevel_s$ID$.multConst(gs_s$ID$.z)\n\
+        x_guidevel_s$ID$.multConst(Real(gs_s$ID$.x))\n\
+        y_guidevel_s$ID$.multConst(Real(gs_s$ID$.y))\n\
+        z_guidevel_s$ID$.multConst(Real(gs_s$ID$.z))\n\
         copyRealToVec3(sourceX=x_guidevel_s$ID$, sourceY=y_guidevel_s$ID$, sourceZ=z_guidevel_s$ID$, target=guidevelC_s$ID$)\n\
     \n\
     # translate invels (world space) to grid space\n\
     if using_invel_s$ID$:\n\
-        x_invel_s$ID$.multConst(gs_s$ID$.x)\n\
-        y_invel_s$ID$.multConst(gs_s$ID$.y)\n\
-        z_invel_s$ID$.multConst(gs_s$ID$.z)\n\
+        x_invel_s$ID$.multConst(Real(gs_s$ID$.x))\n\
+        y_invel_s$ID$.multConst(Real(gs_s$ID$.y))\n\
+        z_invel_s$ID$.multConst(Real(gs_s$ID$.z))\n\
         copyRealToVec3(sourceX=x_invel_s$ID$, sourceY=y_invel_s$ID$, sourceZ=z_invel_s$ID$, target=invel_s$ID$)\n\
     \n\
     copyRealToVec3(sourceX=x_vel_s$ID$, sourceY=y_vel_s$ID$, sourceZ=z_vel_s$ID$, target=vel_s$ID$)\n\