[Bf-blender-cvs] [f7fb1cb] fluid-mantaflow: updated manta pp files and simplified python api

[Sebastián Barschkis]

Commit: f7fb1cb2d816c28e04a56a19c31f73a45a6a553c
Author: Sebastián Barschkis
Date:   Thu Nov 3 22:04:14 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rBf7fb1cb2d816c28e04a56a19c31f73a45a6a553c

updated manta pp files and simplified python api

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

M	intern/mantaflow/intern/manta_pp/commonkernels.h
M	intern/mantaflow/intern/manta_pp/conjugategrad.cpp
M	intern/mantaflow/intern/manta_pp/conjugategrad.h
M	intern/mantaflow/intern/manta_pp/edgecollapse.cpp
M	intern/mantaflow/intern/manta_pp/edgecollapse.h
M	intern/mantaflow/intern/manta_pp/fastmarch.cpp
M	intern/mantaflow/intern/manta_pp/fastmarch.h
M	intern/mantaflow/intern/manta_pp/fileio.cpp
M	intern/mantaflow/intern/manta_pp/fileio.h
M	intern/mantaflow/intern/manta_pp/fluidsolver.cpp
M	intern/mantaflow/intern/manta_pp/fluidsolver.h
M	intern/mantaflow/intern/manta_pp/general.cpp
M	intern/mantaflow/intern/manta_pp/general.h
M	intern/mantaflow/intern/manta_pp/gitinfo.h
M	intern/mantaflow/intern/manta_pp/grid.cpp
M	intern/mantaflow/intern/manta_pp/grid.h
M	intern/mantaflow/intern/manta_pp/grid4d.cpp
M	intern/mantaflow/intern/manta_pp/grid4d.h
M	intern/mantaflow/intern/manta_pp/kernel.cpp
M	intern/mantaflow/intern/manta_pp/kernel.h
M	intern/mantaflow/intern/manta_pp/levelset.cpp
M	intern/mantaflow/intern/manta_pp/levelset.h
M	intern/mantaflow/intern/manta_pp/mesh.cpp
M	intern/mantaflow/intern/manta_pp/mesh.h
M	intern/mantaflow/intern/manta_pp/movingobs.cpp
M	intern/mantaflow/intern/manta_pp/movingobs.h
M	intern/mantaflow/intern/manta_pp/noisefield.cpp
M	intern/mantaflow/intern/manta_pp/noisefield.h
M	intern/mantaflow/intern/manta_pp/particle.cpp
M	intern/mantaflow/intern/manta_pp/particle.h
M	intern/mantaflow/intern/manta_pp/particle.h.reg
M	intern/mantaflow/intern/manta_pp/particle.h.reg.cpp
M	intern/mantaflow/intern/manta_pp/plugin/advection.cpp
M	intern/mantaflow/intern/manta_pp/plugin/extforces.cpp
M	intern/mantaflow/intern/manta_pp/plugin/fire.cpp
M	intern/mantaflow/intern/manta_pp/plugin/flip.cpp
M	intern/mantaflow/intern/manta_pp/plugin/initplugins.cpp
M	intern/mantaflow/intern/manta_pp/plugin/kepsilon.cpp
M	intern/mantaflow/intern/manta_pp/plugin/meshplugins.cpp
M	intern/mantaflow/intern/manta_pp/plugin/pressure.cpp
M	intern/mantaflow/intern/manta_pp/plugin/surfaceturbulence.cpp
M	intern/mantaflow/intern/manta_pp/plugin/vortexplugins.cpp
M	intern/mantaflow/intern/manta_pp/plugin/waveletturbulence.cpp
M	intern/mantaflow/intern/manta_pp/plugin/waves.cpp
M	intern/mantaflow/intern/manta_pp/pwrapper/registry.cpp
M	intern/mantaflow/intern/manta_pp/pwrapper/registry.h
M	intern/mantaflow/intern/manta_pp/shapes.cpp
M	intern/mantaflow/intern/manta_pp/shapes.h
M	intern/mantaflow/intern/manta_pp/test.cpp
M	intern/mantaflow/intern/manta_pp/timing.cpp
M	intern/mantaflow/intern/manta_pp/timing.h
M	intern/mantaflow/intern/manta_pp/turbulencepart.cpp
M	intern/mantaflow/intern/manta_pp/turbulencepart.h
M	intern/mantaflow/intern/manta_pp/vortexpart.cpp
M	intern/mantaflow/intern/manta_pp/vortexpart.h
M	intern/mantaflow/intern/manta_pp/vortexsheet.cpp
M	intern/mantaflow/intern/manta_pp/vortexsheet.h
M	intern/mantaflow/intern/manta_python_API.cpp

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

diff --git a/intern/mantaflow/intern/manta_pp/commonkernels.h b/intern/mantaflow/intern/manta_pp/commonkernels.h
index 641eb3d..6e328d9 100644
--- a/intern/mantaflow/intern/manta_pp/commonkernels.h
+++ b/intern/mantaflow/intern/manta_pp/commonkernels.h
@@ -9,7 +9,7 @@
 
 
 
-#line 1 "/Users/sbarschkis/Developer/Mantaflow/mantaflowLinkerFix161019/source/commonkernels.h"
+#line 1 "/Users/sbarschkis/Developer/Mantaflow/mantaflowDevelop/mantaflowgit/source/commonkernels.h"
 /******************************************************************************
  *
  * MantaFlow fluid solver framework
diff --git a/intern/mantaflow/intern/manta_pp/conjugategrad.cpp b/intern/mantaflow/intern/manta_pp/conjugategrad.cpp
index 0702ba4..7e036d0 100644
--- a/intern/mantaflow/intern/manta_pp/conjugategrad.cpp
+++ b/intern/mantaflow/intern/manta_pp/conjugategrad.cpp
@@ -9,7 +9,7 @@
 
 
 
-#line 1 "/Users/sbarschkis/Developer/Mantaflow/mantaflowLinkerFix161019/source/conjugategrad.cpp"
+#line 1 "/Users/sbarschkis/Developer/Mantaflow/mantaflowDevelop/mantaflowgit/source/conjugategrad.cpp"
 /******************************************************************************
  *
  * MantaFlow fluid solver framework
diff --git a/intern/mantaflow/intern/manta_pp/conjugategrad.h b/intern/mantaflow/intern/manta_pp/conjugategrad.h
index 08e1ee3..be09af6 100644
--- a/intern/mantaflow/intern/manta_pp/conjugategrad.h
+++ b/intern/mantaflow/intern/manta_pp/conjugategrad.h
@@ -9,7 +9,7 @@
 
 
 
-#line 1 "/Users/sbarschkis/Developer/Mantaflow/mantaflowLinkerFix161019/source/conjugategrad.h"
+#line 1 "/Users/sbarschkis/Developer/Mantaflow/mantaflowDevelop/mantaflowgit/source/conjugategrad.h"
 /******************************************************************************
  *
  * MantaFlow fluid solver framework
diff --git a/intern/mantaflow/intern/manta_pp/edgecollapse.cpp b/intern/mantaflow/intern/manta_pp/edgecollapse.cpp
index 6332cfe..7ac799d 100644
--- a/intern/mantaflow/intern/manta_pp/edgecollapse.cpp
+++ b/intern/mantaflow/intern/manta_pp/edgecollapse.cpp
@@ -9,7 +9,7 @@
 
 
 
-#line 1 "/Users/sbarschkis/Developer/Mantaflow/mantaflowLinkerFix161019/source/edgecollapse.cpp"
+#line 1 "/Users/sbarschkis/Developer/Mantaflow/mantaflowDevelop/mantaflowgit/source/edgecollapse.cpp"
 /******************************************************************************
  *
  * MantaFlow fluid solver framework
diff --git a/intern/mantaflow/intern/manta_pp/edgecollapse.h b/intern/mantaflow/intern/manta_pp/edgecollapse.h
index b97eae2..aceca8d 100644
--- a/intern/mantaflow/intern/manta_pp/edgecollapse.h
+++ b/intern/mantaflow/intern/manta_pp/edgecollapse.h
@@ -9,7 +9,7 @@
 
 
 
-#line 1 "/Users/sbarschkis/Developer/Mantaflow/mantaflowLinkerFix161019/source/edgecollapse.h"
+#line 1 "/Users/sbarschkis/Developer/Mantaflow/mantaflowDevelop/mantaflowgit/source/edgecollapse.h"
 /******************************************************************************
  *
  * MantaFlow fluid solver framework
diff --git a/intern/mantaflow/intern/manta_pp/fastmarch.cpp b/intern/mantaflow/intern/manta_pp/fastmarch.cpp
index 730a858..96bd1f0 100644
--- a/intern/mantaflow/intern/manta_pp/fastmarch.cpp
+++ b/intern/mantaflow/intern/manta_pp/fastmarch.cpp
@@ -9,7 +9,7 @@
 
 
 
-#line 1 "/Users/sbarschkis/Developer/Mantaflow/mantaflowLinkerFix161019/source/fastmarch.cpp"
+#line 1 "/Users/sbarschkis/Developer/Mantaflow/mantaflowDevelop/mantaflowgit/source/fastmarch.cpp"
 /******************************************************************************
  *
  * MantaFlow fluid solver framework
diff --git a/intern/mantaflow/intern/manta_pp/fastmarch.h b/intern/mantaflow/intern/manta_pp/fastmarch.h
index 257f7fb..3a72474 100644
--- a/intern/mantaflow/intern/manta_pp/fastmarch.h
+++ b/intern/mantaflow/intern/manta_pp/fastmarch.h
@@ -9,7 +9,7 @@
 
 
 
-#line 1 "/Users/sbarschkis/Developer/Mantaflow/mantaflowLinkerFix161019/source/fastmarch.h"
+#line 1 "/Users/sbarschkis/Developer/Mantaflow/mantaflowDevelop/mantaflowgit/source/fastmarch.h"
 /******************************************************************************
  *
  * MantaFlow fluid solver framework
diff --git a/intern/mantaflow/intern/manta_pp/fileio.cpp b/intern/mantaflow/intern/manta_pp/fileio.cpp
index 905d816..f763f6a 100644
--- a/intern/mantaflow/intern/manta_pp/fileio.cpp
+++ b/intern/mantaflow/intern/manta_pp/fileio.cpp
@@ -9,7 +9,7 @@
 
 
 
-#line 1 "/Users/sbarschkis/Developer/Mantaflow/mantaflowLinkerFix161019/source/fileio.cpp"
+#line 1 "/Users/sbarschkis/Developer/Mantaflow/mantaflowDevelop/mantaflowgit/source/fileio.cpp"
 /******************************************************************************
  *
  * MantaFlow fluid solver framework
diff --git a/intern/mantaflow/intern/manta_pp/fileio.h b/intern/mantaflow/intern/manta_pp/fileio.h
index e17f834..4a89667 100644
--- a/intern/mantaflow/intern/manta_pp/fileio.h
+++ b/intern/mantaflow/intern/manta_pp/fileio.h
@@ -9,7 +9,7 @@
 
 
 
-#line 1 "/Users/sbarschkis/Developer/Mantaflow/mantaflowLinkerFix161019/source/fileio.h"
+#line 1 "/Users/sbarschkis/Developer/Mantaflow/mantaflowDevelop/mantaflowgit/source/fileio.h"
 /******************************************************************************
  *
  * MantaFlow fluid solver framework
diff --git a/intern/mantaflow/intern/manta_pp/fluidsolver.cpp b/intern/mantaflow/intern/manta_pp/fluidsolver.cpp
index 8b386b5..26d0266 100644
--- a/intern/mantaflow/intern/manta_pp/fluidsolver.cpp
+++ b/intern/mantaflow/intern/manta_pp/fluidsolver.cpp
@@ -9,7 +9,7 @@
 
 
 
-#line 1 "/Users/sbarschkis/Developer/Mantaflow/mantaflowLinkerFix161019/source/fluidsolver.cpp"
+#line 1 "/Users/sbarschkis/Developer/Mantaflow/mantaflowDevelop/mantaflowgit/source/fluidsolver.cpp"
 /******************************************************************************
  *
  * MantaFlow fluid solver framework
diff --git a/intern/mantaflow/intern/manta_pp/fluidsolver.h b/intern/mantaflow/intern/manta_pp/fluidsolver.h
index d888709..4e5b1ef 100644
--- a/intern/mantaflow/intern/manta_pp/fluidsolver.h
+++ b/intern/mantaflow/intern/manta_pp/fluidsolver.h
@@ -9,7 +9,7 @@
 
 
 
-#line 1 "/Users/sbarschkis/Developer/Mantaflow/mantaflowLinkerFix161019/source/fluidsolver.h"
+#line 1 "/Users/sbarschkis/Developer/Mantaflow/mantaflowDevelop/mantaflowgit/source/fluidsolver.h"
 /******************************************************************************
  *
  * MantaFlow fluid solver framework
diff --git a/intern/mantaflow/intern/manta_pp/general.cpp b/intern/mantaflow/intern/manta_pp/general.cpp
index 2bc1479..dd4a1af 100644
--- a/intern/mantaflow/intern/manta_pp/general.cpp
+++ b/intern/mantaflow/intern/manta_pp/general.cpp
@@ -9,7 +9,7 @@
 
 
 
-#line 1 "/Users/sbarschkis/Developer/Mantaflow/mantaflowLinkerFix161019/source/general.cpp"
+#line 1 "/Users/sbarschkis/Developer/Mantaflow/mantaflowDevelop/mantaflowgit/source/general.cpp"
 /******************************************************************************
  *
  * MantaFlow fluid solver framework
diff --git a/intern/mantaflow/intern/manta_pp/general.h b/intern/mantaflow/intern/manta_pp/general.h
index acd6afc..717fc02 100644
--- a/intern/mantaflow/intern/manta_pp/general.h
+++ b/intern/mantaflow/intern/manta_pp/general.h
@@ -9,7 +9,7 @@
 
 
 
-#line 1 "/Users/sbarschkis/Developer/Mantaflow/mantaflowLinkerFix161019/source/general.h"
+#line 1 "/Users/sbarschkis/Developer/Mantaflow/mantaflowDevelop/mantaflowgit/source/general.h"
 /******************************************************************************
  *
  * MantaFlow fluid solver framework
@@ -89,6 +89,13 @@ inline bool _chklevel(int level=0) { return gDebugLevel >= level; }
 #define assertMsg(cond,msg)  if(!(cond)) throwError(msg)
 #define assertDeb(cond,msg)  DEBUG_ONLY( assertMsg(cond,msg) )
 
+// for compatibility with blender, blender only defines WITH_MANTA, make sure we have "BLENDER"
+#ifndef BLENDER
+#ifdef WITH_MANTA
+#define BLENDER 1
+#endif
+#endif
+
 // common type for indexing large grids
 typedef long long IndexInt;
 
diff --git a/intern/mantaflow/intern/manta_pp/gitinfo.h b/intern/mantaflow/intern/manta_pp/gitinfo.h
index d9c5f88..1daf0ba 100644
--- a/intern/mantaflow/intern/manta_pp/gitinfo.h
+++ b/intern/mantaflow/intern/manta_pp/gitinfo.h
@@ -1,3 +1,4 @@
 
-// could not determine git version
+
+#define MANTA_GIT_VERSION "commit f197e2e08f2259deccde0fc9991e0f955ef89e44" 
 
diff --git a/intern/mantaflow/intern/manta_pp/grid.cpp b/intern/mantaflow/intern/manta_pp/grid.cpp
index bbc45a7..39ae4ec 100644
--- a/intern/mantaflow/intern/manta_pp/grid.cpp
+++ b/intern/mantaflow/intern/manta_pp/grid.cpp
@@ -9,7 +9,7 @@
 
 
 
-#line 1 "/Users/sbarschkis/Developer/Mantaflow/mantaflowLinkerFix161019/source/grid.cpp"
+#line 1 "/Users/sbarschkis/Developer/Mantaflow/mantaflowDevelop/mantaflowgit/source/grid.cpp"
 /******************************************************************************
  *
  * MantaFlow fluid solver framework
diff --git a/intern/mantaflow/intern/manta_pp/grid.h b/intern/mantaflow/intern/manta_pp/grid.h
index 666fc5f..78abde4 100644
--- a/intern/mantaflow/intern/manta_pp/grid.h
+++ b/intern/mantaflow/intern/manta_pp/grid.h
@@ -9,7 +9,7 @@
 
 
 
-#line 1 "/Users/sbarschkis/Developer/Mantaflow/mantaflowLinkerFix161019/source/grid.h"
+#line 1 "/Users/sbarschkis/Developer/Mantaflow/mantaflowDevelop/mantaflowgit/source/grid.h"
 /******************************************************************************
  *
  * MantaFlow fluid solver framework
diff --git a/intern/mantaflow/intern/manta_pp/grid4d.cpp b/intern/mantaflow/intern/manta_pp/grid4d.cpp
index 0d06914..049fc02 100644
--- a/intern/mantaflow/intern/manta_pp/grid4d.cpp
+++ b/intern/mantaflow/intern/manta_pp/grid4d.cpp
@@ -9,7 +9,7 @@
 
 
 
-#line 1 "/Users/sbarschkis/Developer/Mantaflow/mantaflowLinkerFix161019/source/grid4d.cpp"
+#line 1 "/Users/sbarschkis/Developer/Mantaflow/mantaflowDevelop/mantaflowgit/source/grid4d.cpp"
 /******************************************************************************
  *
  * MantaFlow fluid solver framework
diff --git a/intern/mantaflow/intern/manta_pp/grid4d.h b/intern/mantaflow/intern/manta_pp/grid4d.h
index d108310..3bd5b23 100644
--- a/intern/mantaflow/intern/manta_pp/grid4d.h
+++

@@ Diff output truncated at 10240 characters. @@