diff --git a/src/basics/basics/container/CbVectorPool.h b/src/basics/basics/container/CbVectorPool.h
index e3978e2a1515faab890500c0a8c7beb9ef7fa1d2..a89804d82814756d6c9f8889a4b82714b9f6ea11 100644
--- a/src/basics/basics/container/CbVectorPool.h
+++ b/src/basics/basics/container/CbVectorPool.h
@@ -211,8 +211,10 @@ public:
os<<std::endl;
}
os<<"pool"<<std::endl;
- for(size_type i=0; i<cbPool.pool.size(); i++)
- os<<cbPool.pool[i]<<","; os<<std::endl;
+ for(size_type i=0; i<cbPool.pool.size(); i++) {
+ os<<cbPool.pool[i]<<",";
+ os<<std::endl;
+ }
return os;
}
diff --git a/src/basics/basics/writer/WbWriterAvsASCII.cpp b/src/basics/basics/writer/WbWriterAvsASCII.cpp
index f3e73988436ac0b11f7f5a6e4bcc970c63de720b..f55b86405a920df20445dc20e752848a9bbd56c6 100644
--- a/src/basics/basics/writer/WbWriterAvsASCII.cpp
+++ b/src/basics/basics/writer/WbWriterAvsASCII.cpp
@@ -660,12 +660,17 @@ std::string WbWriterAvsASCII::writeTrianglesWithNodeData(const std::string& file
for(int i=0;i<nofNodeData;i++) out.write((char*)&fdummy,sizeof(float)); //max Wert pro Datentyp
//daten ins file schreiben
- for(int d=0; d<nofNodeData; ++d)
+ for(int d=0; d<nofNodeData; ++d){
for(int n=0; n<(int)nodedata[d].size(); n++)
- { fdummy=(float)nodedata[d][n]; out.write((char*)&fdummy,sizeof(float)); }
+ {
+ fdummy=(float)nodedata[d][n];
+ out.write((char*)&fdummy,sizeof(float));
+ }
+ }
fdummy = 1.;
- for(int i=0;i<nofNodeData;i++) out.write((char*)&fdummy,sizeof(float)); //max Wert pro Datentyp
+ for(int i=0;i<nofNodeData;i++)
+ out.write((char*)&fdummy,sizeof(float)); //max Wert pro Datentyp
out.close();
UBLOG(logDEBUG1,"WbWriterAvsASCII::writeTrianglesWithNodeData to "<<avsfilename<<" - end");
diff --git a/src/basics/geometry3d/GbCylinder3D.cpp b/src/basics/geometry3d/GbCylinder3D.cpp
index f45fe77abe1b3015cbc6b6b3357ddf2c72cc0f90..1bfae6b3461111e94f6fa2eb84f32ed3027dd67e 100644
--- a/src/basics/geometry3d/GbCylinder3D.cpp
+++ b/src/basics/geometry3d/GbCylinder3D.cpp
@@ -153,7 +153,10 @@ void GbCylinder3D::finalize()
/*=======================================================*/
double GbCylinder3D::getHeight()
{
- if(mLine) return mLine->getLength(); return 0.0;
+ if(mLine)
+ return mLine->getLength();
+
+ return 0.0;
}
/*=======================================================*/
GbPoint3D* GbCylinder3D::getPoint1()
@@ -453,7 +456,7 @@ GbLine3D* GbCylinder3D::createClippedLine3D(GbPoint3D& point1, GbPoint3D& point2
double x1a,y1a,z1a,x1b,y1b,z1b, //uebergebene Strecke
x2a,y2a,x2b,y2b, //erste "Kreisstrecke"
x3a,y3a,x3b,y3b, //zweite "Kreisstrecke"
- y2m,z2m,y3m,z3m;
+ y2m,/*z2m,*/y3m,z3m;
double nenner1ab;
if(this->isParallelToX1Axis())
@@ -467,7 +470,7 @@ GbLine3D* GbCylinder3D::createClippedLine3D(GbPoint3D& point1, GbPoint3D& point2
x2a=mLine->getPoint1()->getX1Coordinate();
y2m=mLine->getPoint1()->getX2Coordinate();
- z2m=mLine->getPoint1()->getX3Coordinate();
+// z2m=mLine->getPoint1()->getX3Coordinate();
y2a=y2m+mRad;
x2b=mLine->getPoint1()->getX1Coordinate();
y2b=y2m-mRad;
@@ -490,7 +493,7 @@ GbLine3D* GbCylinder3D::createClippedLine3D(GbPoint3D& point1, GbPoint3D& point2
x2a=mLine->getPoint1()->getX2Coordinate();
y2m=mLine->getPoint1()->getX3Coordinate();
- z2m=mLine->getPoint1()->getX1Coordinate();
+// z2m=mLine->getPoint1()->getX1Coordinate();
y2a=y2m+mRad;
x2b=mLine->getPoint1()->getX2Coordinate();
y2b=y2m-mRad;
@@ -513,7 +516,7 @@ GbLine3D* GbCylinder3D::createClippedLine3D(GbPoint3D& point1, GbPoint3D& point2
x2a=mLine->getPoint1()->getX3Coordinate();
y2m=mLine->getPoint1()->getX2Coordinate();
- z2m=mLine->getPoint1()->getX1Coordinate();
+// z2m=mLine->getPoint1()->getX1Coordinate();
y2a=y2m+mRad;
x2b=mLine->getPoint1()->getX3Coordinate();
y2b=y2m-mRad;
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/EqDensityBCAlgorithm.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/EqDensityBCAlgorithm.cpp
index 852ac405b0ad0fe6947030f8b5cf293f05c1d68c..ce59be23325566d36823b4c6c55d4efc203a640a 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/EqDensityBCAlgorithm.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/EqDensityBCAlgorithm.cpp
@@ -32,15 +32,14 @@ void EqDensityBCAlgorithm::applyBC()
int nx1 = x1;
int nx2 = x2;
int nx3 = x3;
- int direction = -1;
//flag points in direction of fluid
- if (bcPtr->hasDensityBoundaryFlag(D3Q27System::E)) { nx1 -= 1; direction = D3Q27System::E; }
- else if (bcPtr->hasDensityBoundaryFlag(D3Q27System::W)) { nx1 += 1; direction = D3Q27System::W; }
- else if (bcPtr->hasDensityBoundaryFlag(D3Q27System::N)) { nx2 -= 1; direction = D3Q27System::N; }
- else if (bcPtr->hasDensityBoundaryFlag(D3Q27System::S)) { nx2 += 1; direction = D3Q27System::S; }
- else if (bcPtr->hasDensityBoundaryFlag(D3Q27System::T)) { nx3 -= 1; direction = D3Q27System::T; }
- else if (bcPtr->hasDensityBoundaryFlag(D3Q27System::B)) { nx3 += 1; direction = D3Q27System::B; }
+ if (bcPtr->hasDensityBoundaryFlag(D3Q27System::E)) { nx1 -= 1;}
+ else if (bcPtr->hasDensityBoundaryFlag(D3Q27System::W)) { nx1 += 1;}
+ else if (bcPtr->hasDensityBoundaryFlag(D3Q27System::N)) { nx2 -= 1;}
+ else if (bcPtr->hasDensityBoundaryFlag(D3Q27System::S)) { nx2 += 1;}
+ else if (bcPtr->hasDensityBoundaryFlag(D3Q27System::T)) { nx3 -= 1;}
+ else if (bcPtr->hasDensityBoundaryFlag(D3Q27System::B)) { nx3 += 1;}
else UB_THROW(UbException(UB_EXARGS, "Danger...no orthogonal BC-Flag on density boundary..."));
LBMReal rho, vx1, vx2, vx3;
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/NonEqDensityBCAlgorithm.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/NonEqDensityBCAlgorithm.cpp
index 865e2f1cf2a522a593890e9d3891ff1f31cc44fa..305aecd100d3e0d711dc81612d93891733f429c5 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/NonEqDensityBCAlgorithm.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/NonEqDensityBCAlgorithm.cpp
@@ -31,15 +31,14 @@ void NonEqDensityBCAlgorithm::applyBC()
int nx1 = x1;
int nx2 = x2;
int nx3 = x3;
- int direction = -1;
//flag points in direction of fluid
- if (bcPtr->hasDensityBoundaryFlag(D3Q27System::E)) { nx1 -= 1; direction = D3Q27System::E; }
- else if (bcPtr->hasDensityBoundaryFlag(D3Q27System::W)) { nx1 += 1; direction = D3Q27System::W; }
- else if (bcPtr->hasDensityBoundaryFlag(D3Q27System::N)) { nx2 -= 1; direction = D3Q27System::N; }
- else if (bcPtr->hasDensityBoundaryFlag(D3Q27System::S)) { nx2 += 1; direction = D3Q27System::S; }
- else if (bcPtr->hasDensityBoundaryFlag(D3Q27System::T)) { nx3 -= 1; direction = D3Q27System::T; }
- else if (bcPtr->hasDensityBoundaryFlag(D3Q27System::B)) { nx3 += 1; direction = D3Q27System::B; }
+ if (bcPtr->hasDensityBoundaryFlag(D3Q27System::E)) { nx1 -= 1;}
+ else if (bcPtr->hasDensityBoundaryFlag(D3Q27System::W)) { nx1 += 1;}
+ else if (bcPtr->hasDensityBoundaryFlag(D3Q27System::N)) { nx2 -= 1;}
+ else if (bcPtr->hasDensityBoundaryFlag(D3Q27System::S)) { nx2 += 1;}
+ else if (bcPtr->hasDensityBoundaryFlag(D3Q27System::T)) { nx3 -= 1;}
+ else if (bcPtr->hasDensityBoundaryFlag(D3Q27System::B)) { nx3 += 1;}
else return; //UB_THROW(UbException(UB_EXARGS, "Danger...no orthogonal BC-Flag on density boundary..."));
LBMReal rho, vx1, vx2, vx3;
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOCoProcessor.cpp
index 11004a02736d04ecc274296150b4084f47343204..2c032d6dc6d667c8f5e3227b08209a596054d646 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/MPIIOCoProcessor.cpp
@@ -234,9 +234,10 @@ void MPIIOCoProcessor::writeBlocks(int step)
void MPIIOCoProcessor::readBlocks(int step)
{
- int rank, size;
+ int rank;
+// int size;
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
- size = 1;
+// size = 1;
if (comm->isRoot())
{
UBLOG(logINFO, "MPIIOCoProcessor::readBlocks start MPI IO rank = " << rank);
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/QCriterionCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/QCriterionCoProcessor.cpp
index 5e8acdc613d545212000ed5fc448ae5abdd1552b..b53487f6b5100d3fc8145f404a924940cd6e7b54 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/QCriterionCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/QCriterionCoProcessor.cpp
@@ -241,8 +241,9 @@ void QCriterionCoProcessor::getNeighborVelocities(int offx, int offy, int offz,
int rankSelf= block->getRank();
- // FIXME: logical not is only applied to the left hand side of this comparison
- if (!(offx+offy+offz)==1) throw UbException(UB_EXARGS,"getNeighborVelocities called for diagonal directions!");
+ if (!(offx+offy+offz)==1) // FIXME: logical not is only applied to the left hand side of this comparison
+ throw UbException(UB_EXARGS,"getNeighborVelocities called for diagonal directions!");
+
//////get neighbor nodes, if existent
if ((ix1==0 && offx==1) || (ix2==0 && offy==1) || (ix3==0 && offz==1))
{
diff --git a/src/cpu/VirtualFluidsCore/Grid/BasicCalculator.cpp b/src/cpu/VirtualFluidsCore/Grid/BasicCalculator.cpp
index 4f58b73968ba1c8b57b0255c118b98db64648f44..d0127b372cd2969f9aef6a5517b904ca6e01d4eb 100644
--- a/src/cpu/VirtualFluidsCore/Grid/BasicCalculator.cpp
+++ b/src/cpu/VirtualFluidsCore/Grid/BasicCalculator.cpp
@@ -69,7 +69,7 @@ void BasicCalculator::calculate()
int maxInitLevel = maxLevel - minLevel;
int straightStartLevel = minInitLevel;
int internalIterations = 1 << (maxInitLevel - minInitLevel);
- int forwardStartLevel;
+// int forwardStartLevel;
int threshold;
#ifdef TIMING
@@ -87,7 +87,7 @@ void BasicCalculator::calculate()
for (int staggeredStep = 1; staggeredStep <= internalIterations; staggeredStep++)
{
- forwardStartLevel = straightStartLevel;
+// forwardStartLevel = straightStartLevel;
if (staggeredStep == internalIterations) straightStartLevel = minInitLevel;
else
{
diff --git a/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.cpp b/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.cpp
index 0f669ddaede35ceb69bea23527f07f02061d8add..90c644674884d1f242a8453a94dc837879097029 100644
--- a/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.cpp
+++ b/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.cpp
@@ -228,11 +228,11 @@ void D3Q27TriFaceMeshInteractor::setQs(const double& timeStep)
//bounding cubes des TriFaceMesh ermitteln (pro level)
//////////////////////////////////////////////////////////////////////////
//min/max Werte des Dreiecksnetzes holen
- double geoMinX1(0.0), geoMinX2(0.0), geoMinX3(0.0), geoMaxX1(0.0), geoMaxX2(0.0), geoMaxX3(0.0);
+// double geoMinX1(0.0), geoMinX2(0.0), geoMinX3(0.0), geoMaxX1(0.0), geoMaxX2(0.0), geoMaxX3(0.0);
- geoMinX1 = this->geoObject3D->getX1Minimum(); geoMaxX1 = this->geoObject3D->getX1Maximum();
- geoMinX2 = this->geoObject3D->getX2Minimum(); geoMaxX2 = this->geoObject3D->getX2Maximum();
- geoMinX3 = this->geoObject3D->getX3Minimum(); geoMaxX3 = this->geoObject3D->getX3Maximum();
+// geoMinX1 = this->geoObject3D->getX1Minimum(); geoMaxX1 = this->geoObject3D->getX1Maximum();
+// geoMinX2 = this->geoObject3D->getX2Minimum(); geoMaxX2 = this->geoObject3D->getX2Maximum();
+// geoMinX3 = this->geoObject3D->getX3Minimum(); geoMaxX3 = this->geoObject3D->getX3Maximum();
//////////////////////////////////////////////////////////////////////////
@@ -720,7 +720,7 @@ void D3Q27TriFaceMeshInteractor::initInteractor2(const double& timeStep)
UbTimer setQTimer; setQTimer.start();
UBLOG(logDEBUG3, " - setQs for "<<(int)triangles.size()<<" triangles");
- bool solidFromOtherInteractor = false;
+// bool solidFromOtherInteractor = false;
float blockMinX[3],blockMaxX[3],boxCenter[3],halfBoxSize[3];
for(size_t t=0; t<triangles.size(); t++)
@@ -872,12 +872,12 @@ void D3Q27TriFaceMeshInteractor::initInteractor2(const double& timeStep)
//dieser nun uebersprungen wird, dann hat man spaeter beim fuellalgorithmus luecken
//in der front und der block wird u.U. faelschlicher weise komplett solid markiert
//Lsg: positionen merken und erst Nach dem fuellarlgo wieder auf not active setzen :-)
- solidFromOtherInteractor = false;
+// solidFromOtherInteractor = false;
if(bcMatrix->isSolid(ix1,ix2,ix3))
{
if(this->reinitWithStoredQsFlag)
{
- solidFromOtherInteractor = true; //hier muss man weitermachen
+ //solidFromOtherInteractor = true; //hier muss man weitermachen
//SG //oje
std::vector<int> p(3);
p[0]=ix1; p[1]=ix2; p[2]=ix3;
@@ -890,7 +890,7 @@ void D3Q27TriFaceMeshInteractor::initInteractor2(const double& timeStep)
p[0]=ix1; p[1]=ix2; p[2]=ix3;
solidsFromOtherInteractors.insert(p);
//SG continue;
- solidFromOtherInteractor = true;
+ //solidFromOtherInteractor = true;
}
}
diff --git a/src/cpu/VirtualFluidsCore/Visitors/CheckRatioBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/CheckRatioBlockVisitor.cpp
index d7f16b428c0f8e9ccac8b784f1a0e5b6044e3961..5c18afa0a89183f1d6a8f1234d3c5d3d30668e4d 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/CheckRatioBlockVisitor.cpp
+++ b/src/cpu/VirtualFluidsCore/Visitors/CheckRatioBlockVisitor.cpp
@@ -19,8 +19,10 @@ void CheckRatioBlockVisitor::visit(SPtr<Grid3D> grid, SPtr<Block3D> block)
ix3 = block->getX3();
level = block->getLevel();
- int nix1, nix2, nix3, nlev;
- int neighix1, neighix2, neighix3, neighlev;
+// int nix1, nix2, nix3;
+ int nlev;
+// int neighix1, neighix2, neighix3,
+ int neighlev;
std::vector<SPtr<Block3D>> neighbors;
grid->getAllNeighbors(ix1, ix2, ix3, level, this->levelDepth, neighbors);
// bool hasAdded = false;
@@ -29,13 +31,13 @@ void CheckRatioBlockVisitor::visit(SPtr<Grid3D> grid, SPtr<Block3D> block)
if ((neighbors[i]->isActive()||includeNotActiveBlocks)
&&neighbors[i]->getLevel()>level)
{
- neighix1 = neighbors[i]->getX1();
- neighix2 = neighbors[i]->getX2();
- neighix3 = neighbors[i]->getX3();
+ // neighix1 = neighbors[i]->getX1();
+ // neighix2 = neighbors[i]->getX2();
+ // neighix3 = neighbors[i]->getX3();
neighlev = neighbors[i]->getLevel();
- nix1 = neighix1>>1;
- nix2 = neighix2>>1;
- nix3 = neighix3>>1;
+ // nix1 = neighix1>>1;
+ // nix2 = neighix2>>1;
+ // nix3 = neighix3>>1;
nlev = neighlev-1;
if (nlev!=level)
diff --git a/src/cpu/VirtualFluidsCore/Visitors/OverlapBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/OverlapBlockVisitor.cpp
index a8c619d198e9355bf945844ad118ea68d609c31e..5a1c2442392ea3500a0a95c3e8cc3364586c5354 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/OverlapBlockVisitor.cpp
+++ b/src/cpu/VirtualFluidsCore/Visitors/OverlapBlockVisitor.cpp
@@ -22,7 +22,7 @@ void OverlapBlockVisitor::visit(SPtr<Grid3D> grid, SPtr<Block3D> block)
int neighix1, neighix2, neighix3, neighlev;
std::vector<SPtr<Block3D>> neighbors;
grid->getAllNeighbors(ix1, ix2, ix3, level, this->levelDepth, neighbors);
- bool hasAdded = false;
+// bool hasAdded = false;
for(size_t i=0; i<neighbors.size(); i++)
{
if( ( neighbors[i]->isActive() || includeNotActiveBlocks )
@@ -47,7 +47,7 @@ void OverlapBlockVisitor::visit(SPtr<Grid3D> grid, SPtr<Block3D> block)
{
newBlock = SPtr<Block3D>(new Block3D(nix1,nix2,nix3,nlev));
grid->addBlock(newBlock);
- hasAdded=true;
+ // hasAdded=true;
}
}
}
diff --git a/src/cpu/VirtualFluidsCore/Visitors/SetUndefinedNodesBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/SetUndefinedNodesBlockVisitor.cpp
index e33fb44af2a72da6dc87fad51b2f97a29f96ac36..66b200c2241abbfa5fd5f618e2d1e0a9823a6fb7 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/SetUndefinedNodesBlockVisitor.cpp
+++ b/src/cpu/VirtualFluidsCore/Visitors/SetUndefinedNodesBlockVisitor.cpp
@@ -654,14 +654,19 @@ void SetUndefinedNodesBlockVisitor::visit(SPtr<Grid3D> grid, SPtr<Block3D> block
maxX2 = static_cast<int>(bcMatrix->getNX2())-1-gl;
maxX3 = static_cast<int>(bcMatrix->getNX3())-1-gl;
- for (int ix3=minX3; ix3<=maxX3; ix3++)
- for (int ix2=minX2; ix2<=maxX2; ix2++)
+ for (int ix3=minX3; ix3<=maxX3; ix3++) {
+ for (int ix2=minX2; ix2<=maxX2; ix2++) {
for (int ix1=minX1; ix1<=maxX1; ix1++)
{
- if(bcMatrix->isUndefined(ix1, ix2, ix3)) bcMatrix->setFluid(ix1, ix2, ix3);
- else bcMatrix->setUndefined(ix1, ix2, ix3);
+ if(bcMatrix->isUndefined(ix1, ix2, ix3))
+ bcMatrix->setFluid(ix1, ix2, ix3);
+ else
+ bcMatrix->setUndefined(ix1, ix2, ix3);
}
- return;
+ }
+ }
+
+ return;
}
}