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)
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'
#endif
#endif
-#if LBM_INCLUDE_CONTROL==1
#include "solver_control.h"
-#endif
#if LBM_INCLUDE_TESTSOLVERS==1
#include "solver_test.h"
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
#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
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 {
mInit2dYZ(false),
mForceTadapRefine(-1), mCutoff(-1)
{
-#if LBM_INCLUDE_CONTROL==1
mpControl = new LbmControlData();
-#endif
#if LBM_INCLUDE_TESTSOLVERS==1
mpTest = new LbmTestdata();
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);
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;
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();
// 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;
#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