[Bf-blender-cvs] [fa4dec8] soc-2014-fluid: Linux running error fixed. Replay sim error fixed

[Roman Pogribnyi]

Commit: fa4dec8e52599f197dd48302b1185d51e9504758
Author: Roman Pogribnyi
Date:   Tue Aug 5 19:34:15 2014 +0200
Branches: soc-2014-fluid
https://developer.blender.org/rBfa4dec8e52599f197dd48302b1185d51e9504758

Linux running error fixed. Replay sim error fixed

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

M	intern/smoke/intern/MANTA.cpp
M	source/blender/python/manta_pp/pwrapper/pymain.cpp

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

diff --git a/intern/smoke/intern/MANTA.cpp b/intern/smoke/intern/MANTA.cpp
index a1a3f28..8d7cfd7 100644
--- a/intern/smoke/intern/MANTA.cpp
+++ b/intern/smoke/intern/MANTA.cpp
@@ -377,8 +377,6 @@ void generate_manta_sim_file(Scene *scene, SmokeModifierData *smd)
 		ss << "xl_wltnoise.timeAnim = 0.1 \n";
 	}
 	
-	/*GUI for debugging purposes*/
-//	ss << "if (GUI):\n  gui = Gui()\n  gui.show() \n";
 	
 	/*Flow solving stepsv, main loop*/
 	//setting 20 sim frames for now
@@ -398,7 +396,6 @@ void generate_manta_sim_file(Scene *scene, SmokeModifierData *smd)
 	//ss << "    source_shape.applyToGrid(grid=density, value=1)\n";
 	
 	ss << "    densityInflowMesh( flags=flags, density=density, noise=noise, mesh=source, scale=1, sigma=0.5 )\n";
-	//ss << "    densityInflow( flags=flags, density=density, noise=noise, shape=source_shape, scale=1, sigma=0.5 )\n";
 	//ss << "    sourceVel.applyToGrid( grid=vel , value=velInflow )\n";
 	ss << "    sourceVel.applyToGrid(grid=vel , value=velInflow,cutoff = 3)\n";
 	ss << "    applyInflow=True\n";
diff --git a/source/blender/python/manta_pp/pwrapper/pymain.cpp b/source/blender/python/manta_pp/pwrapper/pymain.cpp
index af6a53f..a392699 100644
--- a/source/blender/python/manta_pp/pwrapper/pymain.cpp
+++ b/source/blender/python/manta_pp/pwrapper/pymain.cpp
@@ -38,12 +38,38 @@ typedef string pyString;
 //*****************************************************************************
 // main...
 static bool manta_initialized = false;
+const static string clean_code1 = "def del_var(x): \n\
+  print (\"deleting\", x) \n\
+  try:\n\
+    del x\n\
+    print (\"deleted\") \n\
+  except:\n\
+    print (\"not deleted\") \n\
+del_var(s) \n\
+del_var(uvs)\n\
+del_var(velInflow )\n\
+del_var(res)\n\
+del_var(gs) \n\
+del_var(noise) \n\
+del_var(source)\n\
+del_var(sourceVel)\n\
+del_var(flags) \n\
+del_var(vel) \n\
+del_var(density) \n\
+del_var(pressure) \n\
+del_var(energy) \n\
+del_var(tempFlag)\n\
+del_var(sdf_flow)\n\
+del_var(source_shape)";
+const static string clean_code2 = "del s; del noise;";
 void runMantaScript(vector<string>& args) {
 	string filename = args[0];
 	
 	// Initialize extension classes and wrappers
 	srand(0);
 	PyGILState_STATE gilstate = PyGILState_Ensure();
+	/*cleaning possible previous setups*/
+	PyRun_SimpleString(clean_code2.c_str());
 	debMsg("running manta init?", 0);
 	
 	if (! manta_initialized)
@@ -85,7 +111,7 @@ void runMantaScript(vector<string>& args) {
 	delete[] buf;    
 #else
 	// for linux, use this as it produces nicer error messages
-	PyRun_SimpleFileEx(fp, filename.c_str(), 1);    
+	PyRun_SimpleFileEx(fp, filename.c_str(), 0);    
 //	for (int frame=0; frame < 4; ++frame)
 //	{
 //		std::string frame_str = static_cast<ostringstream*>( &(ostringstream() << frame) )->str();