[Bf-blender-cvs] [00bc0e6] fluid-mantaflow: clean up strings for solver and gc
Sebastián Barschkis
noreply at git.blender.org
Wed Mar 23 20:18:11 CET 2016
Commit: 00bc0e68042d8ad61ebc8b48c2510882ee98995c
Author: Sebastián Barschkis
Date: Tue Mar 22 21:22:04 2016 +0100
Branches: fluid-mantaflow
https://developer.blender.org/rB00bc0e68042d8ad61ebc8b48c2510882ee98995c
clean up strings for solver and gc
===================================================================
M intern/mantaflow/intern/strings/smoke.h
===================================================================
diff --git a/intern/mantaflow/intern/strings/smoke.h b/intern/mantaflow/intern/strings/smoke.h
index 6c0900d..478a5ef 100644
--- a/intern/mantaflow/intern/strings/smoke.h
+++ b/intern/mantaflow/intern/strings/smoke.h
@@ -35,7 +35,7 @@
const std::string manta_import = "\
from manta import *\n\
-import os, shutil, math, sys\n";
+import os, shutil, math, sys, gc\n";
const std::string flags = "\n\
using_colors = $USING_COLORS$\n\
@@ -207,6 +207,9 @@ using_colors = True\n";
const std::string with_fire = "\n\
using_fire = True\n";
+const std::string gc_collect = "\n\
+gc.collect()\n";
+
//////////////////////////////////////////////////////////////////////
// STANDALONE MODE
//////////////////////////////////////////////////////////////////////
@@ -310,6 +313,14 @@ if 'uvs' in globals() : del uvs\n\
if 'uv' in globals() : del uv\n\
if 'octaves' in globals() : del octaves\n";
+const std::string del_solver_low = "\n\
+mantaMsg('Deleting solver low')\n\
+if 's' in globals() : del s\n";
+
+const std::string del_solver_high = "\n\
+mantaMsg('Deleting solver high')\n\
+if 'xl' in globals() : del xl\n";
+
//////////////////////////////////////////////////////////////////////
// MANTA STEP
//////////////////////////////////////////////////////////////////////
@@ -556,4 +567,4 @@ def apply_inflow():\n\
fuel.add(fuel_inflow)\n";
const std::string smoke_inflow_high = "\n\
- # TODO\n";
+# TODO\n";
More information about the Bf-blender-cvs
mailing list