diff options
author | Daniel Genrich <daniel.genrich@gmx.net> | 2008-09-22 14:21:57 +0400 |
---|---|---|
committer | Daniel Genrich <daniel.genrich@gmx.net> | 2008-09-22 14:21:57 +0400 |
commit | 80f4b5b94fc0829efeda6a7788ca76b335400715 (patch) | |
tree | 9b90e0ee5c4d163deb7dad7a482e7d8f3eae1a18 /intern/elbeem | |
parent | eb37006e5331757cc4a060374161f54f2fc59baf (diff) |
Removing control define
Diffstat (limited to 'intern/elbeem')
-rw-r--r-- | intern/elbeem/CMakeLists.txt | 2 | ||||
-rw-r--r-- | intern/elbeem/SConscript | 2 | ||||
-rw-r--r-- | intern/elbeem/intern/solver_class.h | 4 | ||||
-rw-r--r-- | intern/elbeem/intern/solver_control.h | 7 | ||||
-rw-r--r-- | intern/elbeem/intern/solver_init.cpp | 9 | ||||
-rw-r--r-- | intern/elbeem/intern/solver_main.cpp | 4 | ||||
-rw-r--r-- | intern/elbeem/intern/solver_relax.h | 15 |
7 files changed, 5 insertions, 38 deletions
diff --git a/intern/elbeem/CMakeLists.txt b/intern/elbeem/CMakeLists.txt index d73d0c3e06d..03fd4a3fefc 100644 --- a/intern/elbeem/CMakeLists.txt +++ b/intern/elbeem/CMakeLists.txt @@ -28,7 +28,7 @@ SET(INC ${PNG_INC} ${ZLIB_INC} ${SDL_INC} extern) 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) diff --git a/intern/elbeem/SConscript b/intern/elbeem/SConscript index 5ee8da8a071..68892ac261c 100644 --- a/intern/elbeem/SConscript +++ b/intern/elbeem/SConscript @@ -5,7 +5,7 @@ Import('env') 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' diff --git a/intern/elbeem/intern/solver_class.h b/intern/elbeem/intern/solver_class.h index 310dd50617d..acfa095e1d8 100644 --- a/intern/elbeem/intern/solver_class.h +++ b/intern/elbeem/intern/solver_class.h @@ -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 @@ class LbmFsgrSolver : 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 diff --git a/intern/elbeem/intern/solver_control.h b/intern/elbeem/intern/solver_control.h index 0f45d2133ff..57112b365ce 100644 --- a/intern/elbeem/intern/solver_control.h +++ b/intern/elbeem/intern/solver_control.h @@ -29,11 +29,6 @@ class ControlForces; #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 @@ -119,8 +114,6 @@ class ControlForces; 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 { diff --git a/intern/elbeem/intern/solver_init.cpp b/intern/elbeem/intern/solver_init.cpp index b1222d48ce5..270531d80be 100644 --- a/intern/elbeem/intern/solver_init.cpp +++ b/intern/elbeem/intern/solver_init.cpp @@ -328,9 +328,7 @@ LbmFsgrSolver::LbmFsgrSolver() : 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 @@ LbmFsgrSolver::~LbmFsgrSolver() 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 @@ void LbmFsgrSolver::parseAttrList() 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 @@ bool LbmFsgrSolver::initializeSolverPostinit() { 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(); diff --git a/intern/elbeem/intern/solver_main.cpp b/intern/elbeem/intern/solver_main.cpp index 616ac0e2a23..9df53a824d4 100644 --- a/intern/elbeem/intern/solver_main.cpp +++ b/intern/elbeem/intern/solver_main.cpp @@ -53,9 +53,9 @@ void LbmFsgrSolver::stepMain() { // 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; diff --git a/intern/elbeem/intern/solver_relax.h b/intern/elbeem/intern/solver_relax.h index db6e537aff3..c28e7aacd29 100644 --- a/intern/elbeem/intern/solver_relax.h +++ b/intern/elbeem/intern/solver_relax.h @@ -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 |