Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNils Thuerey <nils@thuerey.de>2006-11-05 21:11:04 +0300
committerNils Thuerey <nils@thuerey.de>2006-11-05 21:11:04 +0300
commit59ef29a07342b862aa960d9ff80faed965d153a0 (patch)
tree43a9d319f840dd680a23e3fb8249dd49231e0c0d /intern/elbeem
parentc8411cfeab4024d88a3a5e9ae260cd0e3daef71e (diff)
- another solaris math function fix
Diffstat (limited to 'intern/elbeem')
-rw-r--r--intern/elbeem/intern/solver_util.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/intern/elbeem/intern/solver_util.cpp b/intern/elbeem/intern/solver_util.cpp
index d11ae6c6b40..f3552299cb7 100644
--- a/intern/elbeem/intern/solver_util.cpp
+++ b/intern/elbeem/intern/solver_util.cpp
@@ -16,6 +16,9 @@
#include "simulation_object.h"
#include <zlib.h>
+#ifndef sqrtf
+#define sqrtf sqrt
+#endif
/******************************************************************************
* helper functions
@@ -892,7 +895,6 @@ void LbmFsgrSolver::advanceParticles() {
v *= 1./sqrtf(vlensqr)*0.166;
}
// compute cell velocity
- LbmFloat cellVelSqr = 0.;
LbmFloat *tcel = RACPNT(level, oi,oj,ok, workSet);
LbmFloat velUx=0., velUy=0., velUz=0.;
FORDF0 {
@@ -901,7 +903,8 @@ void LbmFsgrSolver::advanceParticles() {
velUz += (this->dfDvecZ[l]*RAC(tcel,l));
}
// add impulse
- /*cellVelSqr = velUx*velUx+ velUy*velUy+ velUz*velUz;
+ /*
+ LbmFloat cellVelSqr = velUx*velUx+ velUy*velUy+ velUz*velUz;
//errMsg("PTIMPULSE"," new v"<<v<<" cvs"<<cellVelSqr<<"="<<sqrt(cellVelSqr));
if(cellVelSqr< 0.166*0.166) {
FORDF1 {