Commit: e87694001fc8b4eb8e5a57491d0b375b4fb864c1
Author: Sebastián Barschkis
Date: Mon Mar 14 07:53:41 2016 +0100
Branches: fluid-mantaflow
https://developer.blender.org/rBe87694001fc8b4eb8e5a57491d0b375b4fb864c1
moved old liquid code to separate file
===================================================================
A intern/mantaflow/intern/strings/liquid.h
M intern/mantaflow/intern/strings/smoke.h
===================================================================
diff --git a/intern/mantaflow/intern/strings/liquid.h
b/intern/mantaflow/intern/strings/liquid.h
new file mode 100644
index 0000000..e8473dd
--- /dev/null
+++ b/intern/mantaflow/intern/strings/liquid.h
@@ -0,0 +1,75 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2016 Blender Foundation.
+ * All rights reserved.
+ *
+ * Contributor(s): Sebastian Barschkis (sebbas)
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file mantaflow/intern/strings/liquid.h
+ * \ingroup mantaflow
+ */
+
+#include <string>
+using namespace std;
+
+//////////////////////////////////////////////////////////////////////
+// GENERAL SETUP
+//////////////////////////////////////////////////////////////////////
+
+// DEPRECATED! BUT KEEPING HERE FOR REFERENCE FOR LATER USE
+const string liquid_flags = "\n\
+low_flags_updated = False\n";
+
+//////////////////////////////////////////////////////////////////////
+// STEP FUNCTIONS LOW
+//////////////////////////////////////////////////////////////////////
+
+// DEPRECATED! BUT KEEPING HERE FOR REFERENCE FOR LATER USE
+const string liquid_step_low = "\n\
+def sim_step_low(t):\n\
+#update flags from density on first step\n\
+ setWallBcs(flags=flags, vel=vel)\n\
+ density.multConst(-1.)\n\
+ mantaMsg(using_colors)\n\
+ global low_flags_updated\n\
+ if not low_flags_updated:\n\
+ mantaMsg('Updating Flags from Levelset on startup!')\n\
+ flags.updateFromLevelset(density)\n\
+ low_flags_updated = True \n\
+ setWallBcs(flags=flags, vel=vel)\n\
+ density.reinitMarching(flags=flags, velTransport=vel)\n\
+ advectSemiLagrange(flags=flags, vel=vel, grid=density, order=2)\n\
+ flags.updateFromLevelset(density)\n\
+ \n\
+ advectSemiLagrange(flags=flags, vel=vel, grid=vel, order=2)\n\
+ addGravity(flags=flags, vel=vel, gravity=vec3(0,0,-0.981))\n\
+ \n\
+ # mantaMsg current maximal velocity\n\
+ maxvel = vel.getMaxValue()\n\
+ mantaMsg('Current max velocity %f ' % maxvel)\n\
+ \n\
+ # pressure solve\n\
+ setWallBcs(flags=flags, vel=vel)\n\
+ solvePressure(flags=flags, vel=vel, pressure=pressure, cgMaxIterFac=0.5,
useResNorm=True) \n\
+ setWallBcs(flags=flags, vel=vel)\n\
+ s.step()\n\
+ density.multConst(-1.)\n";
+
diff --git a/intern/mantaflow/intern/strings/smoke.h
b/intern/mantaflow/intern/strings/smoke.h
index ab6c5a0..ddaea54 100644
--- a/intern/mantaflow/intern/strings/smoke.h
+++ b/intern/mantaflow/intern/strings/smoke.h
@@ -42,7 +42,6 @@ const string flags = "\n\
using_colors = $USING_COLORS$\n\
using_heat = $USING_HEAT$\n\
using_fire = $USING_FIRE$\n\
-low_flags_updated = False\n\
using_wavelets = $USE_WAVELETS$\n";
const string uv_setup = "\n\
@@ -490,40 +489,6 @@ def update_flame_high():\n\
updateFlame(react=xl_react, flame=xl_flame)\n";
//////////////////////////////////////////////////////////////////////
-// STEP FUNCTIONS LIQUID
-//////////////////////////////////////////////////////////////////////
-
-const string liquid_step_low = "\n\
-def sim_step_low(t):\n\
-#update flags from density on first step\n\
- setWallBcs(flags=flags, vel=vel)\n\
- density.multConst(-1.)\n\
- mantaMsg(using_colors)\n\
- global low_flags_updated\n\
- if not low_flags_updated:\n\
- mantaMsg('Updating Flags from Levelset on startup!')\n\
- flags.updateFromLevelset(density)\n\
- low_flags_updated = True \n\
- setWallBcs(flags=flags, vel=vel)\n\
- density.reinitMarching(flags=flags, velTransport=vel)\n\
- advectSemiLagrange(flags=flags, vel=vel, grid=density, order=2)\n\
- flags.updateFromLevelset(density)\n\
- \n\
- advectSemiLagrange(flags=flags, vel=vel, grid=vel, order=2)\n\
- addGravity(flags=flags, vel=vel, gravity=vec3(0,0,-0.981))\n\
- \n\
- # mantaMsg current maximal velocity\n\
- maxvel = vel.getMaxValue()\n\
- mantaMsg('Current max velocity %f ' % maxvel)\n\
- \n\
- # pressure solve\n\
- setWallBcs(flags=flags, vel=vel)\n\
- solvePressure(flags=flags, vel=vel, pressure=pressure, cgMaxIterFac=0.5,
useResNorm=True) \n\
- setWallBcs(flags=flags, vel=vel)\n\
- s.step()\n\
- density.multConst(-1.)\n";
-
-//////////////////////////////////////////////////////////////////////
// EXPORT GRIDS
//////////////////////////////////////////////////////////////////////
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
