diff options
author | Daniel Genrich <daniel.genrich@gmx.net> | 2008-04-22 01:30:50 +0400 |
---|---|---|
committer | Daniel Genrich <daniel.genrich@gmx.net> | 2008-04-22 01:30:50 +0400 |
commit | c9c3c41815ab0b029d36530b8684e7dada81a8bc (patch) | |
tree | 1c2b39d8d4b0e8f96fd8a9146322d3766933c9fb /intern/elbeem | |
parent | 006d4d1176d87ff03446665436ace2c1d31eeaf3 (diff) | |
parent | 2a7fa9e14730d44cdb2d4302481be866735d7300 (diff) |
svn merge -r 14236:14505 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'intern/elbeem')
-rw-r--r-- | intern/elbeem/CMakeLists.txt | 9 | ||||
-rw-r--r-- | intern/elbeem/Makefile | 9 | ||||
-rw-r--r-- | intern/elbeem/extern/LBM_fluidsim.h | 9 | ||||
-rw-r--r-- | intern/elbeem/intern/Makefile | 9 | ||||
-rw-r--r-- | intern/elbeem/intern/ntl_vector3dim.h | 2 | ||||
-rw-r--r-- | intern/elbeem/intern/solver_util.cpp | 8 |
6 files changed, 17 insertions, 29 deletions
diff --git a/intern/elbeem/CMakeLists.txt b/intern/elbeem/CMakeLists.txt index c0484846c6b..45e9b95e5ff 100644 --- a/intern/elbeem/CMakeLists.txt +++ b/intern/elbeem/CMakeLists.txt @@ -1,13 +1,10 @@ # $Id$ -# ***** BEGIN GPL/BL DUAL LICENSE BLOCK ***** +# ***** 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. The Blender -# Foundation also sells licenses for use in proprietary software under -# the Blender License. See http://www.blender.org/BL/ for information -# about this. +# 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 @@ -25,7 +22,7 @@ # # Contributor(s): Jacques Beaurain. # -# ***** END GPL/BL DUAL LICENSE BLOCK ***** +# ***** END GPL LICENSE BLOCK ***** SET(INC ${PNG_INC} ${ZLIB_INC} ${SDL_INC}) diff --git a/intern/elbeem/Makefile b/intern/elbeem/Makefile index 3e0333fb3cd..9ea08d63374 100644 --- a/intern/elbeem/Makefile +++ b/intern/elbeem/Makefile @@ -1,15 +1,12 @@ # # $Id$ # -# ***** BEGIN GPL/BL DUAL LICENSE BLOCK ***** +# ***** 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. The Blender -# Foundation also sells licenses for use in proprietary software under -# the Blender License. See http://www.blender.org/BL/ for information -# about this. +# 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 @@ -27,7 +24,7 @@ # # Contributor(s): Hans Lambermont # -# ***** END GPL/BL DUAL LICENSE BLOCK ***** +# ***** END GPL LICENSE BLOCK ***** # elbeem main makefile. # diff --git a/intern/elbeem/extern/LBM_fluidsim.h b/intern/elbeem/extern/LBM_fluidsim.h index 0f7e0e1ef5d..6e7fc86213c 100644 --- a/intern/elbeem/extern/LBM_fluidsim.h +++ b/intern/elbeem/extern/LBM_fluidsim.h @@ -3,15 +3,12 @@ * * $Id$ * - * ***** BEGIN GPL/BL DUAL LICENSE BLOCK ***** + * ***** 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. The Blender - * Foundation also sells licenses for use in proprietary software under - * the Blender License. See http://www.blender.org/BL/ for information - * about this. + * 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 @@ -29,7 +26,7 @@ * * Contributor(s): none yet. * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** + * ***** END GPL LICENSE BLOCK ***** */ #ifndef LBM_FLUIDSIM_H #define LBM_FLUIDSIM_H diff --git a/intern/elbeem/intern/Makefile b/intern/elbeem/intern/Makefile index 49f0b936e6b..c03b8678186 100644 --- a/intern/elbeem/intern/Makefile +++ b/intern/elbeem/intern/Makefile @@ -1,15 +1,12 @@ # # $Id$ # -# ***** BEGIN GPL/BL DUAL LICENSE BLOCK ***** +# ***** 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. The Blender -# Foundation also sells licenses for use in proprietary software under -# the Blender License. See http://www.blender.org/BL/ for information -# about this. +# 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 @@ -27,7 +24,7 @@ # # Contributor(s): none yet. # -# ***** END GPL/BL DUAL LICENSE BLOCK ***** +# ***** END GPL LICENSE BLOCK ***** # elbeem intern Makefile # diff --git a/intern/elbeem/intern/ntl_vector3dim.h b/intern/elbeem/intern/ntl_vector3dim.h index 27c3be0d71f..6f17f9f5e7b 100644 --- a/intern/elbeem/intern/ntl_vector3dim.h +++ b/intern/elbeem/intern/ntl_vector3dim.h @@ -825,7 +825,7 @@ template<class T> inline ntlColor vec2Col(T v) { return ntlColor(v[0],v[1],v[2]) #endif #endif #endif - + #if GFX_PRECISION==1 typedef float gfxReal; #define GFX_REAL_MAX __FLT_MAX__ diff --git a/intern/elbeem/intern/solver_util.cpp b/intern/elbeem/intern/solver_util.cpp index a6685babe68..25b8b98b3c6 100644 --- a/intern/elbeem/intern/solver_util.cpp +++ b/intern/elbeem/intern/solver_util.cpp @@ -37,10 +37,10 @@ void LbmFsgrSolver::prepareVisualization( void ) { int lev = mMaxRefine; int workSet = mLevel[lev].setCurr; - int mainGravDir=0; + int mainGravDir=6; // if normalizing fails, we asume z-direction gravity LbmFloat mainGravLen = 0.; FORDF1{ - LbmFloat thisGravLen = dot(LbmVec(dfVecX[l],dfVecY[l],dfVecZ[l]), getNormalized(mLevel[mMaxRefine].gravity) ); + LbmFloat thisGravLen = dot(LbmVec(dfVecX[l],dfVecY[l],dfVecZ[l]), mLevel[mMaxRefine].gravity ); if(thisGravLen>mainGravLen) { mainGravLen = thisGravLen; mainGravDir = l; @@ -112,6 +112,7 @@ void LbmFsgrSolver::prepareVisualization( void ) { const CellFlagType nbflag = RFLAG_NB(lev, i,j,k, workSet,l); if(nbflag&CFInter){ intercnt++; } + // check all directions otherwise we get bugs with splashes on obstacles if(l!=mainGravDir) continue; // only check bnd along main grav. dir //if((nbflag&CFBnd)&&(nbflag&CFBndNoslip)){ noslipbnd=1; } if((nbflag&CFBnd)){ noslipbnd=1; } @@ -140,11 +141,10 @@ void LbmFsgrSolver::prepareVisualization( void ) { if(val<minval) val = minval; *mpIso->lbmGetData(i,j,ZKOFF) += minval-( val * mIsoWeight[13] ); } -#endif // SURFACE_ENH>0 - } else { // all others, unused? continue; } +#endif // SURFACE_ENH>0 *mpIso->lbmGetData( i-1 , j-1 ,ZKOFF-ZKD1) += ( val * mIsoWeight[0] ); *mpIso->lbmGetData( i , j-1 ,ZKOFF-ZKD1) += ( val * mIsoWeight[1] ); |