Patch [#31264] Elbeem Fixes by Jason Wilkins.

Thank you for submitting!

11 files changed, 32 insertions, 30 deletions

diff --git a/intern/elbeem/CMakeLists.txt b/intern/elbeem/CMakeLists.txt
index a3c106ff465..064269b02bc 100644
--- a/intern/elbeem/CMakeLists.txt
+++ b/intern/elbeem/CMakeLists.txt
@@ -86,6 +86,7 @@ set(SRC
 	intern/solver_interface.h
 	intern/solver_relax.h
 	intern/utilities.h
+    intern/globals.h
 )
 
 add_definitions(
diff --git a/intern/elbeem/intern/globals.h b/intern/elbeem/intern/globals.h
new file mode 100644
index 00000000000..cbfd4d0b752
--- /dev/null
+++ b/intern/elbeem/intern/globals.h
@@ -0,0 +1,10 @@
+/** \file elbeem/intern/globals.h
+ *  \ingroup elbeem
+ */
+
+// required globals
+
+extern bool glob_mpactive;
+
+extern int glob_mpnum;
+extern int glob_mpindex;
diff --git a/intern/elbeem/intern/ntl_blenderdumper.cpp b/intern/elbeem/intern/ntl_blenderdumper.cpp
index f3e8ecc1c31..4efff4337a6 100644
--- a/intern/elbeem/intern/ntl_blenderdumper.cpp
+++ b/intern/elbeem/intern/ntl_blenderdumper.cpp
@@ -18,6 +18,7 @@
 #include "ntl_blenderdumper.h"
 #include "ntl_world.h"
 #include "solver_interface.h"
+#include "globals.h"
 
 #include <zlib.h>
 
@@ -46,10 +47,6 @@ ntlBlenderDumper::~ntlBlenderDumper()
 	debMsgStd("ntlBlenderDumper",DM_NOTIFY, "ntlBlenderDumper done", 10);
 }
 
-// required globals
-extern bool glob_mpactive;
-extern int glob_mpnum, glob_mpindex;
-
 /******************************************************************************
  * Only dump time dep. objects to file
  *****************************************************************************/
diff --git a/intern/elbeem/intern/ntl_vector3dim.h b/intern/elbeem/intern/ntl_vector3dim.h
index 1e9728d7658..e3e492c396e 100644
--- a/intern/elbeem/intern/ntl_vector3dim.h
+++ b/intern/elbeem/intern/ntl_vector3dim.h
@@ -17,6 +17,11 @@
 // under windos there seem to be strange 
 // errors when including the STL header too
 // late...
+
+#ifdef _MSC_VER
+#define _USE_MATH_DEFINES 1
+#endif
+
 #include <iostream>
 #include <map>
 #include <vector>
@@ -63,14 +68,11 @@ using std::string;
 #ifndef snprintf
 #define snprintf _snprintf
 #endif
-#ifndef bool
-#define bool int
-#endif
-#ifndef false
-#define false 0
+
+#ifdef _MSC_VER
+#if _MSC_VER >= 1300
+#include <float.h>
 #endif
-#ifndef true
-#define true 1
 #endif
 
 #else // WIN32
@@ -102,6 +104,9 @@ using std::string;
 
 #ifndef M_PI
 #define M_PI 3.1415926536
+#endif
+
+#ifndef M_E
 #define M_E  2.7182818284
 #endif
 
diff --git a/intern/elbeem/intern/ntl_world.cpp b/intern/elbeem/intern/ntl_world.cpp
index 3b649c9f5b9..0b36f724985 100644
--- a/intern/elbeem/intern/ntl_world.cpp
+++ b/intern/elbeem/intern/ntl_world.cpp
@@ -496,9 +496,6 @@ void ntlWorld::singleStepSims(double targetTime) {
 
 
 
-extern bool glob_mpactive;
-extern int glob_mpindex;
-
 /******************************************************************************
  * Render the current scene
  * uses the global variables from the parser
diff --git a/intern/elbeem/intern/particletracer.cpp b/intern/elbeem/intern/particletracer.cpp
index b939f9e51ef..d6bc450198f 100644
--- a/intern/elbeem/intern/particletracer.cpp
+++ b/intern/elbeem/intern/particletracer.cpp
@@ -19,6 +19,7 @@
 #include "ntl_matrices.h"
 #include "ntl_ray.h"
 #include "ntl_matrices.h"
+#include "globals.h"
 
 #include <zlib.h>
 
@@ -155,9 +156,6 @@ void ParticleTracer::cleanup() {
 	}
 }
 		
-extern bool glob_mpactive;
-extern int glob_mpindex,glob_mpnum;
-
 /******************************************************************************
  *! dump particles if desired 
  *****************************************************************************/
diff --git a/intern/elbeem/intern/solver_adap.cpp b/intern/elbeem/intern/solver_adap.cpp
index de5099f4416..aaf558c4762 100644
--- a/intern/elbeem/intern/solver_adap.cpp
+++ b/intern/elbeem/intern/solver_adap.cpp
@@ -928,9 +928,6 @@ void LbmFsgrSolver::interpolateCellFromCoarse(int lev, int i, int j,int k, int d
 
 
 
-// required globals
-extern bool glob_mpactive;
-extern int glob_mpnum, glob_mpindex;
 #define MPTADAP_INTERV 4
 
 /*****************************************************************************/
diff --git a/intern/elbeem/intern/solver_init.cpp b/intern/elbeem/intern/solver_init.cpp
index 7e9f5e7f420..aede617a4d3 100644
--- a/intern/elbeem/intern/solver_init.cpp
+++ b/intern/elbeem/intern/solver_init.cpp
@@ -15,6 +15,8 @@
 #include "solver_relax.h"
 // for geo init FGI_ defines
 #include "elbeem.h"
+#include "globals.h"
+
 
 // helper for 2d init
 #define SWAPYZ(vec) { \
@@ -296,9 +298,6 @@
 #endif  // LBMDIM==2
 
 
-// required globals
-extern bool glob_mpactive;
-extern int glob_mpnum, glob_mpindex;
 
 
 /******************************************************************************
diff --git a/intern/elbeem/intern/solver_main.cpp b/intern/elbeem/intern/solver_main.cpp
index 8ec0f95a366..b9436e84922 100644
--- a/intern/elbeem/intern/solver_main.cpp
+++ b/intern/elbeem/intern/solver_main.cpp
@@ -14,6 +14,8 @@
 #include "solver_relax.h"
 #include "particletracer.h"
 #include "loop_tools.h"
+#include "globals.h"
+
 #include <stdlib.h>
 
 /*****************************************************************************/
@@ -24,8 +26,6 @@ double globdfcnt;
 double globdfavg[19];
 double globdfmax[19];
 double globdfmin[19];
-extern int glob_mpindex,glob_mpnum;
-extern bool globOutstrForce;
 
 // simulation object interface
 void LbmFsgrSolver::step() { 
diff --git a/intern/elbeem/intern/solver_relax.h b/intern/elbeem/intern/solver_relax.h
index 370d8ea182b..ad88b3c37c5 100644
--- a/intern/elbeem/intern/solver_relax.h
+++ b/intern/elbeem/intern/solver_relax.h
@@ -390,7 +390,7 @@
 #define  DEFAULT_STREAM  \
 	m[dC] = RAC(ccel,dC); \
 	 \
-	if(((!nbored) & CFBnd)) { \
+	if(0 /* ((!nbored) & CFBnd) */) { \
 	 \
 	m[dN ] = CSRC_N ; m[dS ] = CSRC_S ; \
 	m[dE ] = CSRC_E ; m[dW ] = CSRC_W ; \
diff --git a/intern/elbeem/intern/solver_util.cpp b/intern/elbeem/intern/solver_util.cpp
index 0a80b234ad3..935a910e7d5 100644
--- a/intern/elbeem/intern/solver_util.cpp
+++ b/intern/elbeem/intern/solver_util.cpp
@@ -18,6 +18,8 @@
 #include "ntl_world.h"
 #include "simulation_object.h"
 
+#include "globals.h"
+
 #include <stdlib.h>
 #include <zlib.h>
 #ifndef sqrtf
@@ -31,10 +33,6 @@
 // try to enhance surface?
 #define SURFACE_ENH 2
 
-extern bool glob_mpactive;
-extern bool glob_mpnum;
-extern bool glob_mpindex;
-
 //! for raytracing
 void LbmFsgrSolver::prepareVisualization( void ) {
 	int lev = mMaxRefine;