Revision: 16670
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16670
Author: genscher
Date: 2008-09-22 12:21:57 +0200 (Mon, 22 Sep 2008)
Log Message:
-----------
Removing control define
Modified Paths:
--------------
trunk/blender/intern/elbeem/CMakeLists.txt
trunk/blender/intern/elbeem/SConscript
trunk/blender/intern/elbeem/intern/solver_class.h
trunk/blender/intern/elbeem/intern/solver_control.h
trunk/blender/intern/elbeem/intern/solver_init.cpp
trunk/blender/intern/elbeem/intern/solver_main.cpp
trunk/blender/intern/elbeem/intern/solver_relax.h
Modified: trunk/blender/intern/elbeem/CMakeLists.txt
===================================================================
--- trunk/blender/intern/elbeem/CMakeLists.txt 2008-09-22 10:04:45 UTC (rev
16669)
+++ trunk/blender/intern/elbeem/CMakeLists.txt 2008-09-22 10:21:57 UTC (rev
16670)
@@ -28,7 +28,7 @@
FILE(GLOB SRC intern/*.cpp)
-ADD_DEFINITIONS(-DNOGUI -DELBEEM_BLENDER=1 -DLBM_INCLUDE_CONTROL=1)
+ADD_DEFINITIONS(-DNOGUI -DELBEEM_BLENDER=1)
IF(WINDOWS)
ADD_DEFINITIONS(-DUSE_MSVC6FIXES)
ENDIF(WINDOWS)
Modified: trunk/blender/intern/elbeem/SConscript
===================================================================
--- trunk/blender/intern/elbeem/SConscript 2008-09-22 10:04:45 UTC (rev
16669)
+++ trunk/blender/intern/elbeem/SConscript 2008-09-22 10:21:57 UTC (rev
16670)
@@ -5,7 +5,7 @@
sources = env.Glob('intern/*.cpp')
-defs = 'NOGUI ELBEEM_BLENDER=1 LBM_INCLUDE_CONTROL=1'
+defs = 'NOGUI ELBEEM_BLENDER=1'
if env['WITH_BF_OPENMP'] == 1:
defs += ' PARALLEL'
Modified: trunk/blender/intern/elbeem/intern/solver_class.h
===================================================================
--- trunk/blender/intern/elbeem/intern/solver_class.h 2008-09-22 10:04:45 UTC
(rev 16669)
+++ trunk/blender/intern/elbeem/intern/solver_class.h 2008-09-22 10:21:57 UTC
(rev 16670)
@@ -105,9 +105,7 @@
#endif
#endif
-#if LBM_INCLUDE_CONTROL==1
#include "solver_control.h"
-#endif
#if LBM_INCLUDE_TESTSOLVERS==1
#include "solver_test.h"
@@ -501,13 +499,11 @@
LbmFloat& debRAC(LbmFloat* s,int l);
# endif // FSGR_STRICT_DEBUG==1
-# if LBM_INCLUDE_CONTROL==1
LbmControlData *mpControl;
void initCpdata();
void handleCpdata();
void cpDebugDisplay(int dispset);
-# endif // LBM_INCLUDE_CONTROL==1
bool mUseTestdata;
# if LBM_INCLUDE_TESTSOLVERS==1
Modified: trunk/blender/intern/elbeem/intern/solver_control.h
===================================================================
--- trunk/blender/intern/elbeem/intern/solver_control.h 2008-09-22 10:04:45 UTC
(rev 16669)
+++ trunk/blender/intern/elbeem/intern/solver_control.h 2008-09-22 10:21:57 UTC
(rev 16670)
@@ -29,12 +29,7 @@
#define FARF_SEPSWE 2
// relaxation macros for solver_relax.h
-#if LBM_INCLUDE_CONTROL!=1
-// defined in relax.h
-
-#else // LBM_INCLUDE_TESTSOLVERS!=1
-
// WARNING has to match controlparts.h
#define CPF_ENTRIES 12
#define CPF_FORCE 0
@@ -119,9 +114,7 @@
if(mass<rho*1.0) mass = rho*1.0; myfrac = 1.0; \
}
-#endif // LBM_INCLUDE_TESTSOLVERS!=1
-
// a single set of control particles and params
class LbmControlSet {
public:
Modified: trunk/blender/intern/elbeem/intern/solver_init.cpp
===================================================================
--- trunk/blender/intern/elbeem/intern/solver_init.cpp 2008-09-22 10:04:45 UTC
(rev 16669)
+++ trunk/blender/intern/elbeem/intern/solver_init.cpp 2008-09-22 10:21:57 UTC
(rev 16670)
@@ -328,9 +328,7 @@
mInit2dYZ(false),
mForceTadapRefine(-1), mCutoff(-1)
{
-#if LBM_INCLUDE_CONTROL==1
mpControl = new LbmControlData();
-#endif
#if LBM_INCLUDE_TESTSOLVERS==1
mpTest = new LbmTestdata();
@@ -442,9 +440,7 @@
if(mpPreviewSurface) delete mpPreviewSurface;
// cleanup done during scene deletion...
-#if LBM_INCLUDE_CONTROL==1
if(mpControl) delete mpControl;
-#endif
// always output performance estimate
debMsgStd("LbmFsgrSolver::~LbmFsgrSolver",DM_MSG," Avg.
MLSUPS:"<<(mAvgMLSUPS/mAvgMLSUPSCnt), 5);
@@ -495,9 +491,7 @@
mSimulationTime += starttimeskip;
if(starttimeskip>0.)
debMsgStd("LbmFsgrSolver::parseStdAttrList",DM_NOTIFY,"Used
starttimeskip="<<starttimeskip<<", t="<<mSimulationTime, 1);
-#if LBM_INCLUDE_CONTROL==1
mpControl->parseControldataAttrList(mpSifAttrs);
-#endif
#if LBM_INCLUDE_TESTSOLVERS==1
mUseTestdata = 0;
@@ -1275,9 +1269,8 @@
debMsgStd("LbmFsgrSolver::initialize",DM_MSG,"Init done ... ",10);
mInitDone = 1;
-#if LBM_INCLUDE_CONTROL==1
+ // init fluid control
initCpdata();
-#endif // LBM_INCLUDE_CONTROL==1
#if LBM_INCLUDE_TESTSOLVERS==1
initTestdata();
Modified: trunk/blender/intern/elbeem/intern/solver_main.cpp
===================================================================
--- trunk/blender/intern/elbeem/intern/solver_main.cpp 2008-09-22 10:04:45 UTC
(rev 16669)
+++ trunk/blender/intern/elbeem/intern/solver_main.cpp 2008-09-22 10:21:57 UTC
(rev 16670)
@@ -53,9 +53,9 @@
// init moving bc's, can change mMaxVlen
initMovingObstacles(false);
-#if LBM_INCLUDE_CONTROL==1
+
+ // handle fluid control
handleCpdata();
-#endif
// important - keep for tadap
LbmFloat lastMass = mCurrentMass;
Modified: trunk/blender/intern/elbeem/intern/solver_relax.h
===================================================================
--- trunk/blender/intern/elbeem/intern/solver_relax.h 2008-09-22 10:04:45 UTC
(rev 16669)
+++ trunk/blender/intern/elbeem/intern/solver_relax.h 2008-09-22 10:21:57 UTC
(rev 16670)
@@ -14,21 +14,6 @@
#else // FSGR_STRICT_DEBUG==1
#define CAUSE_PANIC { this->mPanic=1; } /*set flag*/
#endif // FSGR_STRICT_DEBUG==1
-
-// #if LBM_INCLUDE_TESTSOLVERS!=1
-#if LBM_INCLUDE_CONTROL!=1
-
-#define PRECOLLIDE_MODS(rho,ux,uy,uz, grav) \
- ux += (grav)[0]; \
- uy += (grav)[1]; \
- uz += (grav)[2];
-
-#define TEST_IF_CHECK
-
-#else // LBM_INCLUDE_CONTROL!=1
-// defined in solver_control.h
-#endif // LBM_INCLUDE_CONTROL!=1
-
/******************************************************************************
* normal relaxation
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
