[Bf-blender-cvs] [d02bb60] fluid-mantaflow: updated manta pp files and adapted smoke.h

Sebastián Barschkis noreply at git.blender.org
Thu Jan 28 12:36:53 CET 2016 

Commit: d02bb60d3c667525632686db422b9598c3ba0a88
Author: Sebastián Barschkis
Date:   Thu Oct 1 11:02:40 2015 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rBd02bb60d3c667525632686db422b9598c3ba0a88

updated manta pp files and adapted smoke.h

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

M	intern/smoke/intern/scenarios/smoke.h
M	source/blender/python/manta_pp/commonkernels.h
M	source/blender/python/manta_pp/conjugategrad.cpp
M	source/blender/python/manta_pp/conjugategrad.h
M	source/blender/python/manta_pp/edgecollapse.cpp
M	source/blender/python/manta_pp/edgecollapse.h
M	source/blender/python/manta_pp/fastmarch.cpp
M	source/blender/python/manta_pp/fastmarch.h
M	source/blender/python/manta_pp/fileio.cpp
M	source/blender/python/manta_pp/fileio.h
M	source/blender/python/manta_pp/fluidsolver.cpp
M	source/blender/python/manta_pp/fluidsolver.h
M	source/blender/python/manta_pp/general.cpp
M	source/blender/python/manta_pp/general.h
M	source/blender/python/manta_pp/grid.cpp
M	source/blender/python/manta_pp/grid.h
M	source/blender/python/manta_pp/gui/customctrl.cpp
M	source/blender/python/manta_pp/gui/customctrl.h
M	source/blender/python/manta_pp/gui/glwidget.cpp
M	source/blender/python/manta_pp/gui/glwidget.h
M	source/blender/python/manta_pp/gui/mainwindow.cpp
M	source/blender/python/manta_pp/gui/mainwindow.h
M	source/blender/python/manta_pp/gui/meshpainter.cpp
M	source/blender/python/manta_pp/gui/meshpainter.h
M	source/blender/python/manta_pp/gui/moc_customctrl.cpp
M	source/blender/python/manta_pp/gui/moc_customctrl.cpp_parameters
A	source/blender/python/manta_pp/gui/moc_customctrl.cxx
A	source/blender/python/manta_pp/gui/moc_customctrl.cxx_parameters
M	source/blender/python/manta_pp/gui/moc_glwidget.cpp
M	source/blender/python/manta_pp/gui/moc_glwidget.cpp_parameters
A	source/blender/python/manta_pp/gui/moc_glwidget.cxx
A	source/blender/python/manta_pp/gui/moc_glwidget.cxx_parameters
M	source/blender/python/manta_pp/gui/moc_mainwindow.cpp
M	source/blender/python/manta_pp/gui/moc_mainwindow.cpp_parameters
A	source/blender/python/manta_pp/gui/moc_mainwindow.cxx
A	source/blender/python/manta_pp/gui/moc_mainwindow.cxx_parameters
M	source/blender/python/manta_pp/gui/moc_meshpainter.cpp
M	source/blender/python/manta_pp/gui/moc_meshpainter.cpp_parameters
A	source/blender/python/manta_pp/gui/moc_meshpainter.cxx
A	source/blender/python/manta_pp/gui/moc_meshpainter.cxx_parameters
M	source/blender/python/manta_pp/gui/moc_painter.cpp
M	source/blender/python/manta_pp/gui/moc_painter.cpp_parameters
A	source/blender/python/manta_pp/gui/moc_painter.cxx
A	source/blender/python/manta_pp/gui/moc_painter.cxx_parameters
M	source/blender/python/manta_pp/gui/moc_particlepainter.cpp
M	source/blender/python/manta_pp/gui/moc_particlepainter.cpp_parameters
A	source/blender/python/manta_pp/gui/moc_particlepainter.cxx
A	source/blender/python/manta_pp/gui/moc_particlepainter.cxx_parameters
M	source/blender/python/manta_pp/gui/moc_qtmain.cpp
M	source/blender/python/manta_pp/gui/moc_qtmain.cpp_parameters
A	source/blender/python/manta_pp/gui/moc_qtmain.cxx
A	source/blender/python/manta_pp/gui/moc_qtmain.cxx_parameters
M	source/blender/python/manta_pp/gui/painter.cpp
M	source/blender/python/manta_pp/gui/painter.h
M	source/blender/python/manta_pp/gui/particlepainter.cpp
M	source/blender/python/manta_pp/gui/particlepainter.h
M	source/blender/python/manta_pp/gui/qtmain.cpp
M	source/blender/python/manta_pp/gui/qtmain.h
M	source/blender/python/manta_pp/hginfo.h
M	source/blender/python/manta_pp/kernel.cpp
M	source/blender/python/manta_pp/kernel.h
M	source/blender/python/manta_pp/levelset.cpp
M	source/blender/python/manta_pp/levelset.h
M	source/blender/python/manta_pp/mesh.cpp
M	source/blender/python/manta_pp/mesh.h
M	source/blender/python/manta_pp/movingobs.cpp
M	source/blender/python/manta_pp/movingobs.h
M	source/blender/python/manta_pp/noisefield.cpp
M	source/blender/python/manta_pp/noisefield.h
M	source/blender/python/manta_pp/particle.cpp
M	source/blender/python/manta_pp/particle.h
M	source/blender/python/manta_pp/plugin/advection.cpp
M	source/blender/python/manta_pp/plugin/extforces.cpp
M	source/blender/python/manta_pp/plugin/fire.cpp
M	source/blender/python/manta_pp/plugin/flip.cpp
M	source/blender/python/manta_pp/plugin/initplugins.cpp
M	source/blender/python/manta_pp/plugin/kepsilon.cpp
M	source/blender/python/manta_pp/plugin/meshplugins.cpp
M	source/blender/python/manta_pp/plugin/pressure.cpp
M	source/blender/python/manta_pp/plugin/vortexplugins.cpp
M	source/blender/python/manta_pp/plugin/waveletturbulence.cpp
M	source/blender/python/manta_pp/plugin/waves.cpp
M	source/blender/python/manta_pp/shapes.cpp
M	source/blender/python/manta_pp/shapes.h
M	source/blender/python/manta_pp/test.cpp
M	source/blender/python/manta_pp/timing.cpp
M	source/blender/python/manta_pp/timing.h
M	source/blender/python/manta_pp/turbulencepart.cpp
M	source/blender/python/manta_pp/turbulencepart.h
M	source/blender/python/manta_pp/vortexpart.cpp
M	source/blender/python/manta_pp/vortexpart.h
M	source/blender/python/manta_pp/vortexsheet.cpp
M	source/blender/python/manta_pp/vortexsheet.h

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

diff --git a/intern/smoke/intern/scenarios/smoke.h b/intern/smoke/intern/scenarios/smoke.h
index 2e03f2c..1c71673 100644
--- a/intern/smoke/intern/scenarios/smoke.h
+++ b/intern/smoke/intern/scenarios/smoke.h
@@ -200,7 +200,8 @@ const string smoke_step_low = "def sim_step_low(t, standalone = False):\n\
     density.add(inflow_grid)\n\
   if manta_using_heat:\n\
     gravity=vec3(0,0,-0.0981) if solver_dim==3 else vec3(0,-0.0981,0)\n\
-    addHeatBuoyancy(density=density, densCoeff = $ALPHA$, vel=vel, gravity=gravity, flags=flags, heat = heat_low, heatCoeff = $BETA$*10)\n\
+    addBuoyancy2(flags=flags, grid=density, vel=vel, gravity=gravity, coefficient=$ALPHA$)\n\
+    addBuoyancy2(flags=flags, grid=heat_low, vel=vel, gravity=gravity, coefficient=$BETA$*(-10))\n\
   else:\n\
     gravity=vec3(0,0,-0.01 * $ALPHA$) if solver_dim==3 else vec3(0,-0.01* $ALPHA$,0)\n\
     addBuoyancy(density=density, vel=vel, gravity=gravity, flags=flags)\n\
diff --git a/source/blender/python/manta_pp/commonkernels.h b/source/blender/python/manta_pp/commonkernels.h
index 87fe130..eb81503 100644
--- a/source/blender/python/manta_pp/commonkernels.h
+++ b/source/blender/python/manta_pp/commonkernels.h
@@ -9,7 +9,7 @@
 
 
 
-#line 1 "/home/user/Developer/mantaflowgit/source/commonkernels.h"
+#line 1 "/Users/user/Developer/Xcode Projects/blenderFireIntegration/mantaflowgit/source/commonkernels.h"
 /******************************************************************************
  *
  * MantaFlow fluid solver framework
diff --git a/source/blender/python/manta_pp/conjugategrad.cpp b/source/blender/python/manta_pp/conjugategrad.cpp
index e0ed063..b619d54 100644
--- a/source/blender/python/manta_pp/conjugategrad.cpp
+++ b/source/blender/python/manta_pp/conjugategrad.cpp
@@ -9,7 +9,7 @@
 
 
 
-#line 1 "/home/user/Developer/mantaflowgit/source/conjugategrad.cpp"
+#line 1 "/Users/user/Developer/Xcode Projects/blenderFireIntegration/mantaflowgit/source/conjugategrad.cpp"
 /******************************************************************************
  *
  * MantaFlow fluid solver framework
diff --git a/source/blender/python/manta_pp/conjugategrad.h b/source/blender/python/manta_pp/conjugategrad.h
index 81fefb5..069a44b 100644
--- a/source/blender/python/manta_pp/conjugategrad.h
+++ b/source/blender/python/manta_pp/conjugategrad.h
@@ -9,7 +9,7 @@
 
 
 
-#line 1 "/home/user/Developer/mantaflowgit/source/conjugategrad.h"
+#line 1 "/Users/user/Developer/Xcode Projects/blenderFireIntegration/mantaflowgit/source/conjugategrad.h"
 /******************************************************************************
  *
  * MantaFlow fluid solver framework
diff --git a/source/blender/python/manta_pp/edgecollapse.cpp b/source/blender/python/manta_pp/edgecollapse.cpp
index a80984d..92e60e2 100644
--- a/source/blender/python/manta_pp/edgecollapse.cpp
+++ b/source/blender/python/manta_pp/edgecollapse.cpp
@@ -9,7 +9,7 @@
 
 
 
-#line 1 "/home/user/Developer/mantaflowgit/source/edgecollapse.cpp"
+#line 1 "/Users/user/Developer/Xcode Projects/blenderFireIntegration/mantaflowgit/source/edgecollapse.cpp"
 /******************************************************************************
  *
  * MantaFlow fluid solver framework
diff --git a/source/blender/python/manta_pp/edgecollapse.h b/source/blender/python/manta_pp/edgecollapse.h
index 784f7cb..87401e9 100644
--- a/source/blender/python/manta_pp/edgecollapse.h
+++ b/source/blender/python/manta_pp/edgecollapse.h
@@ -9,7 +9,7 @@
 
 
 
-#line 1 "/home/user/Developer/mantaflowgit/source/edgecollapse.h"
+#line 1 "/Users/user/Developer/Xcode Projects/blenderFireIntegration/mantaflowgit/source/edgecollapse.h"
 /******************************************************************************
  *
  * MantaFlow fluid solver framework
diff --git a/source/blender/python/manta_pp/fastmarch.cpp b/source/blender/python/manta_pp/fastmarch.cpp
index f22bdba..90c3c2d 100644
--- a/source/blender/python/manta_pp/fastmarch.cpp
+++ b/source/blender/python/manta_pp/fastmarch.cpp
@@ -9,7 +9,7 @@
 
 
 
-#line 1 "/home/user/Developer/mantaflowgit/source/fastmarch.cpp"
+#line 1 "/Users/user/Developer/Xcode Projects/blenderFireIntegration/mantaflowgit/source/fastmarch.cpp"
 /******************************************************************************
  *
  * MantaFlow fluid solver framework
diff --git a/source/blender/python/manta_pp/fastmarch.h b/source/blender/python/manta_pp/fastmarch.h
index fda9d95..d1160cf 100644
--- a/source/blender/python/manta_pp/fastmarch.h
+++ b/source/blender/python/manta_pp/fastmarch.h
@@ -9,7 +9,7 @@
 
 
 
-#line 1 "/home/user/Developer/mantaflowgit/source/fastmarch.h"
+#line 1 "/Users/user/Developer/Xcode Projects/blenderFireIntegration/mantaflowgit/source/fastmarch.h"
 /******************************************************************************
  *
  * MantaFlow fluid solver framework
diff --git a/source/blender/python/manta_pp/fileio.cpp b/source/blender/python/manta_pp/fileio.cpp
index 2981556..9c51472 100644
--- a/source/blender/python/manta_pp/fileio.cpp
+++ b/source/blender/python/manta_pp/fileio.cpp
@@ -9,7 +9,7 @@
 
 
 
-#line 1 "/home/user/Developer/mantaflowgit/source/fileio.cpp"
+#line 1 "/Users/user/Developer/Xcode Projects/blenderFireIntegration/mantaflowgit/source/fileio.cpp"
 /******************************************************************************
  *
  * MantaFlow fluid solver framework
diff --git a/source/blender/python/manta_pp/fileio.h b/source/blender/python/manta_pp/fileio.h
index d73b2d5..7b0d42f 100644
--- a/source/blender/python/manta_pp/fileio.h
+++ b/source/blender/python/manta_pp/fileio.h
@@ -9,7 +9,7 @@
 
 
 
-#line 1 "/home/user/Developer/mantaflowgit/source/fileio.h"
+#line 1 "/Users/user/Developer/Xcode Projects/blenderFireIntegration/mantaflowgit/source/fileio.h"
 /******************************************************************************
  *
  * MantaFlow fluid solver framework
diff --git a/source/blender/python/manta_pp/fluidsolver.cpp b/source/blender/python/manta_pp/fluidsolver.cpp
index eae19d8..7099b29 100644
--- a/source/blender/python/manta_pp/fluidsolver.cpp
+++ b/source/blender/python/manta_pp/fluidsolver.cpp
@@ -9,7 +9,7 @@
 
 
 
-#line 1 "/home/user/Developer/mantaflowgit/source/fluidsolver.cpp"
+#line 1 "/Users/user/Developer/Xcode Projects/blenderFireIntegration/mantaflowgit/source/fluidsolver.cpp"
 /******************************************************************************
  *
  * MantaFlow fluid solver framework
@@ -86,7 +86,7 @@ FluidSolver::FluidSolver(Vec3i gridsize, int dim)
 	: PbClass(this), mDt(1.0), mTimeTotal(0.), mFrame(0), 
 	  mCflCond(1000), mDtMin(1.), mDtMax(1.), mFrameLength(1.),
 	  mGridSize(gridsize), mDim(dim) , mTimePerFrame(0.), mLockDt(false), mAdaptDt(true)
-{
+{    
 	assertMsg(dim==2 || dim==3, "Can only create 2D and 3D solvers");
 	assertMsg(dim!=2 || gridsize.z == 1, "Trying to create 2D solver with size.z != 1");
 }
diff --git a/source/blender/python/manta_pp/fluidsolver.h b/source/blender/python/manta_pp/fluidsolver.h
index 3e7fe90..4452448 100644
--- a/source/blender/python/manta_pp/fluidsolver.h
+++ b/source/blender/python/manta_pp/fluidsolver.h
@@ -9,7 +9,7 @@
 
 
 
-#line 1 "/home/user/Developer/mantaflowgit/source/fluidsolver.h"
+#line 1 "/Users/user/Developer/Xcode Projects/blenderFireIntegration/mantaflowgit/source/fluidsolver.h"
 /******************************************************************************
  *
  * MantaFlow fluid solver framework
diff --git a/source/blender/python/manta_pp/general.cpp b/source/blender/python/manta_pp/general.cpp
index 4196208..4411efb 100644
--- a/source/blender/python/manta_pp/general.cpp
+++ b/source/blender/python/manta_pp/general.cpp
@@ -9,7 +9,7 @@
 
 
 
-#line 1 "/home/user/Developer/mantaflowgit/source/general.cpp"
+#line 1 "/Users/user/Developer/Xcode Projects/blenderFireIntegration/mantaflowgit/source/general.cpp"
 /******************************************************************************
  *
  * MantaFlow fluid solver framework
diff --git a/source/blender/python/manta_pp/general.h b/source/blender/python/manta_pp/general.h
index b00295d..a7e89be 100644
--- a/source/blender/python/manta_pp/general.h
+++ b/source/blender/python/manta_pp/general.h
@@ -9,7 +9,7 @@
 
 
 
-#line 1 "/home/user/Developer/mantaflowgit/source/general.h"
+#line 1 "/Users/user/Developer/Xcode Projects/blenderFireIntegration/mantaflowgit/source/general.h"
 /******************************************************************************
  *
  * MantaFlow fluid solver framework
diff --git a/source/blender/python/manta_pp/grid.cpp b/source/blender/python/manta_pp/grid.cpp
index 3584565..ecae5b5 100644
--- a/source/blender/python/manta_pp/grid.cpp
+++ b/source/blender/python/manta_pp/grid.cpp
@@ -9,7 +9,7 @@
 
 
 
-#line 1 "/home/user/Developer/mantaflowgit/source/grid.cpp"
+#line 1 "/Users/user/Developer/Xcode Projects/blenderFireIntegration/mantaflowgit/source/grid.cpp"
 /******************************************************************************
  *
  * MantaFlow fluid solver framework
diff --git a/source/blender/python/manta_pp/grid.h b/source/blender/python/manta_pp/grid.h
index d510a8d..a68bb71 100644
--- a/source/blender/python/manta_pp/grid.h
+++ b/source/blender/python/manta_pp/grid.h
@@ -9,7 +9,7 @@
 
 
 
-#line 1 "/home/user/Developer/mantaflowgit/source/grid.h"
+#line 1 "/Users/user/Developer/Xcode Projects/blenderFireIntegration/mantaflowgit/source/grid.h"
 /******************************************************************************
  *
  * MantaFlow fluid solver framework
diff --git a/source/blender/python/manta_pp/gui/customctrl.cpp b/source/blender/python/manta_pp/gui/customctrl.cpp
index ab5c8fa..dbb3a24 100644
--- a/source/blender/python/manta_pp/gui/customctrl.cpp
+++ b/source/blender/python/manta_pp/gui/customctrl.cpp
@@ -9,7 +9,7 @@
 
 
 
-#line 1 "/home/user/Developer/mantaflowgit/source/gui/customctrl.cpp"
+#line 1 "/Users/user/Developer/Xcode Projects/blenderFireIntegration/mantaflowgit/source/gui/customctrl.cpp"
 /******************************************************************************
  *
  * MantaFlow fluid solver framework
diff --git a/source/blender/python/manta_pp/gui/customctrl.h b/sourc

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list