diff --git a/apps/cpu/LaminarTubeFlow/ltf.cpp b/apps/cpu/LaminarTubeFlow/ltf.cpp
index 63cabd4f8acc33ccce7bd85f305762e5c35d6d66..f11526f0ebab646430028615e98e8f1a5710ec3b 100644
--- a/apps/cpu/LaminarTubeFlow/ltf.cpp
+++ b/apps/cpu/LaminarTubeFlow/ltf.cpp
@@ -325,7 +325,7 @@ void run(string configname)
}
}
-int main(int argc, char* argv[])
+int main(int /*argc*/, char* argv[])
{
if (argv != NULL)
{
diff --git a/src/basics/basics/container/CbVectorPool.h b/src/basics/basics/container/CbVectorPool.h
index 9a45f8ac90eb96e2a34d1fd2ae0da7f366bbdae3..a657b1dad257e7fe2bd444664222710033efd70d 100644
--- a/src/basics/basics/container/CbVectorPool.h
+++ b/src/basics/basics/container/CbVectorPool.h
@@ -66,13 +66,13 @@ template<typename T>
class CbVectorPool
{
public:
- typedef typename CbVector<T>::value_type value_type;
- typedef typename CbVector<T>::size_type size_type;
- typedef std::vector< value_type > Pool;
+ using value_type = typename CbVector<T>::value_type;
+ using size_type = typename CbVector<T>::size_type;
+ using Pool = std::vector<value_type>;
- typedef std::string CbVectorKey;
- typedef std::map< CbVectorKey, CbVector< value_type >* /*ptrVector*/ > CbVectorMap;
- typedef typename CbVectorMap::iterator CbVectorMapIter;
+ using CbVectorKey = std::string;
+ using CbVectorMap = std::map<CbVectorKey, CbVector<value_type> *>;
+ using CbVectorMapIter = typename CbVectorMap::iterator;
public:
//////////////////////////////////////////////////////////////////////////
@@ -401,8 +401,8 @@ class CbVectorAllocatorPool : public CbVectorAllocator<T>
{
public:
//typedefs wiederholen, da Basisklasse = template -> "Dependent-Base"-Problem
- typedef typename CbVector<T>::value_type value_type;
- typedef typename CbVector<value_type>::size_type size_type;
+ using value_type = typename CbVector<T>::value_type;
+ using size_type = typename CbVector<value_type>::size_type;
friend class CbVectorPool< value_type >;
diff --git a/src/basics/basics/parallel/PbMpi.h b/src/basics/basics/parallel/PbMpi.h
index f6bf20b6f21d392a20fd153ae8790048a76aea1e..25f9d48224fe0bc3b8c5d223f18f517a56414fe9 100644
--- a/src/basics/basics/parallel/PbMpi.h
+++ b/src/basics/basics/parallel/PbMpi.h
@@ -139,10 +139,10 @@ namespace PbMpi
//////////////////////////////////////////////////////////////////////////
namespace PbMpi
{
- typedef MPI_Comm Comm;
- typedef MPI_Group Group;
- typedef MPI_Request Request;
- typedef MPI_Status Status;
+ using Comm = MPI_Comm;
+ using Group = MPI_Group;
+ using Request = MPI_Request;
+ using Status = MPI_Status;
}
#define PbMpi_COMM_WORLD ((PbMpi::Comm)MPI_COMM_WORLD)
diff --git a/src/basics/basics/transmitter/TbTransmitter.h b/src/basics/basics/transmitter/TbTransmitter.h
index b5bb087df96a9045ff541f83afe7cc058e344289..85b57baa9c995509ec8bcbb4c846be5a93a6a14a 100644
--- a/src/basics/basics/transmitter/TbTransmitter.h
+++ b/src/basics/basics/transmitter/TbTransmitter.h
@@ -30,7 +30,7 @@ template<typename T>
class TbTransmitter
{
public:
- typedef T value_type;
+ using value_type = T;
public:
TbTransmitter() {}
diff --git a/src/basics/basics/transmitter/TbTransmitterLocal.h b/src/basics/basics/transmitter/TbTransmitterLocal.h
index 9d6cd1db818cb64f51c2bceb56cf53d17eb5fb9d..abc127a0a9f01d8b7a83954b0351ede87b0813c3 100644
--- a/src/basics/basics/transmitter/TbTransmitterLocal.h
+++ b/src/basics/basics/transmitter/TbTransmitterLocal.h
@@ -32,9 +32,9 @@ template<typename T>
class TbLocalTransmitter : public TbTransmitter<T>
{
public:
- typedef SPtr< TbLocalTransmitter<T> > TbLocalTransmitterPtr;
+ using TbLocalTransmitterPtr = SPtr<TbLocalTransmitter<T> >;
- typedef T value_type;
+ using value_type = T;
public:
TbLocalTransmitter() : TbTransmitter<T>()
@@ -62,7 +62,7 @@ template<typename T>
class TbVectorReceiverLocal : public TbTransmitter<T>
{
public:
- typedef T value_type;
+ using value_type = T;
public:
TbVectorReceiverLocal() : TbTransmitter<value_type>()
@@ -89,7 +89,7 @@ template<typename T>
class TbVectorSenderLocal : public TbTransmitter<T>
{
public:
- typedef T value_type;
+ using value_type = T;
public:
TbVectorSenderLocal(SPtr< TbVectorReceiverLocal< value_type > > receiver)
diff --git a/src/basics/basics/transmitter/TbTransmitterMpiPool.h b/src/basics/basics/transmitter/TbTransmitterMpiPool.h
index 052a9b39ed117bbc387d54abcba2f09e789b94c5..a32325f7f137f53193209fb66aee6f01648158c5 100644
--- a/src/basics/basics/transmitter/TbTransmitterMpiPool.h
+++ b/src/basics/basics/transmitter/TbTransmitterMpiPool.h
@@ -44,17 +44,17 @@ public:
typedef SPtr< TbCbVectorMpiPool< T > > MpiPoolPtr;
//////////////////////////////////////////////////////////////////////////
- typedef std::map<std::string, MpiPoolPtr > MpiPoolPtrMap;
- typedef typename MpiPoolPtrMap::iterator MpiPoolPtrMapIter;
+ using MpiPoolPtrMap = std::map<std::string, MpiPoolPtr>;
+ using MpiPoolPtrMapIter = typename MpiPoolPtrMap::iterator;
//da BasisKlasse templateKlasse ist MUSS man hier die typedefs nochmal wiederholen!
- typedef typename CbVector<T>::value_type value_type;
- typedef typename CbVector<T>::size_type size_type;
- typedef std::vector< value_type > Pool;
+ using value_type = typename CbVector<T>::value_type;
+ using size_type = typename CbVector<T>::size_type;
+ using Pool = std::vector<value_type>;
- typedef std::string CbVectorKey;
- typedef std::map< CbVectorKey, CbVector< value_type >* /*ptrVector*/ > CbVectorMap;
- typedef typename CbVectorMap::iterator CbVectorMapIter;
+ using CbVectorKey = std::string;
+ using CbVectorMap = std::map<CbVectorKey, CbVector<value_type> *>;
+ using CbVectorMapIter = typename CbVectorMap::iterator;
//////////////////////////////////////////////////////////////////////////
friend class TbCbVectorSenderMpiPool< T >;
@@ -447,7 +447,7 @@ template<typename T>
class TbCbVectorSenderMpiPool : public TbTransmitter< CbVector< T > >
{
public:
- typedef CbVector< T > value_type;
+ using value_type = CbVector<T>;
public:
TbCbVectorSenderMpiPool(std::string cbVectorKey, TbCbVectorMpiPool< T >* mpiVectorPool)
@@ -490,7 +490,7 @@ template<typename T>
class TbCbVectorReceiverMpiPool : public TbTransmitter< CbVector< T > >
{
public:
- typedef CbVector< T > value_type;
+ using value_type = CbVector<T>;
public:
TbCbVectorReceiverMpiPool(std::string cbVectorKey, TbCbVectorMpiPool< T >* mpiVectorPool)
diff --git a/src/basics/basics/utilities/UbFileInputBinary.cpp b/src/basics/basics/utilities/UbFileInputBinary.cpp
index a7071b367df58a6f51f04ab2c69d15ca0fe27665..0cf6a5a85deab826f7a4ca6089fe2aedca39f3cb 100644
--- a/src/basics/basics/utilities/UbFileInputBinary.cpp
+++ b/src/basics/basics/utilities/UbFileInputBinary.cpp
@@ -109,7 +109,7 @@ string UbFileInputBinary::readStringLine()
return dummy;
}
/*==========================================================*/
-string UbFileInputBinary::readLineTill(char stop)
+string UbFileInputBinary::readLineTill(char /*stop*/)
{
UB_THROW( UbException(UB_EXARGS,"method makes no sense for binary streams") );
}
@@ -119,32 +119,32 @@ string UbFileInputBinary::parseString()
UB_THROW( UbException(UB_EXARGS,"method makes no sense for binary streams") );
}
/*==========================================================*/
-bool UbFileInputBinary::containsString(const string& var)
+bool UbFileInputBinary::containsString(const string& /*var*/)
{
UB_THROW( UbException(UB_EXARGS,"method makes no sense for binary streams") );
}
/*==========================================================*/
-void UbFileInputBinary::setPosAfterLineWithString(const string& var)
+void UbFileInputBinary::setPosAfterLineWithString(const string& /*var*/)
{
UB_THROW( UbException(UB_EXARGS,"method makes no sense for binary streams") );
}
/*==========================================================*/
-int UbFileInputBinary::readIntegerAfterString(const string& var)
+int UbFileInputBinary::readIntegerAfterString(const string& /*var*/)
{
UB_THROW( UbException(UB_EXARGS,"method makes no sense for binary streams") );
}
/*==========================================================*/
-double UbFileInputBinary::readDoubleAfterString(const string& var)
+double UbFileInputBinary::readDoubleAfterString(const string& /*var*/)
{
UB_THROW( UbException(UB_EXARGS,"method makes no sense for binary streams") );
}
/*==========================================================*/
-string UbFileInputBinary::readStringAfterString(const string& var)
+string UbFileInputBinary::readStringAfterString(const string& /*var*/)
{
UB_THROW( UbException(UB_EXARGS,"method makes no sense for binary streams") );
}
/*==========================================================*/
-bool UbFileInputBinary::readBoolAfterString(const string& var)
+bool UbFileInputBinary::readBoolAfterString(const string& /*var*/)
{
UB_THROW( UbException(UB_EXARGS,"method makes no sense for binary streams") );
}
diff --git a/src/basics/basics/utilities/UbFileOutputASCII.cpp b/src/basics/basics/utilities/UbFileOutputASCII.cpp
index a195f9616cf4880ed31f8e2d42e33f1fd2f53aaa..3a0930105e936982e664d48a6cbb0abf150f12d2 100644
--- a/src/basics/basics/utilities/UbFileOutputASCII.cpp
+++ b/src/basics/basics/utilities/UbFileOutputASCII.cpp
@@ -6,7 +6,7 @@
using namespace std;
-UbFileOutputASCII::UbFileOutputASCII(const string& filename, const bool& createPath, const int& precision)
+UbFileOutputASCII::UbFileOutputASCII(const string& filename, const bool& createPath, const int& /*precision*/)
: UbFileOutput(filename)
{
this->commentindicator = 'C';
diff --git a/src/basics/basics/utilities/UbFileOutputBinary.cpp b/src/basics/basics/utilities/UbFileOutputBinary.cpp
index bc0cbad6664b27ca7c1da6720aa2cc7149967ab7..b514f024526afb819873ba483f77123156898170 100644
--- a/src/basics/basics/utilities/UbFileOutputBinary.cpp
+++ b/src/basics/basics/utilities/UbFileOutputBinary.cpp
@@ -64,22 +64,22 @@ bool UbFileOutputBinary::open(const string& filename, UbFileOutput::CREATEOPTION
return outfile.is_open();
}
/*==========================================================*/
-void UbFileOutputBinary::writeBool(const bool& value, const int& width)
+void UbFileOutputBinary::writeBool(const bool& value, const int& /*width*/)
{
outfile.write((char*)&value,sizeof(bool));
}
/*==========================================================*/
-void UbFileOutputBinary::writeDouble(const double& value, const int& width)
+void UbFileOutputBinary::writeDouble(const double& value, const int& /*width*/)
{
outfile.write((char*)&value,sizeof(double));
}
/*==========================================================*/
-void UbFileOutputBinary::writeFloat(const float& value, const int& width)
+void UbFileOutputBinary::writeFloat(const float& value, const int& /*width*/)
{
outfile.write((char*)&value,sizeof(float));
}
/*==========================================================*/
-void UbFileOutputBinary::setPrecision(const int& precision)
+void UbFileOutputBinary::setPrecision(const int& /*precision*/)
{
UB_THROW( UbException(UB_EXARGS,"no way") );
}
@@ -89,22 +89,22 @@ int UbFileOutputBinary::getPrecision()
UB_THROW( UbException(UB_EXARGS,"no way") );
}
/*==========================================================*/
-void UbFileOutputBinary::writeInteger(const int& value, const int& width)
+void UbFileOutputBinary::writeInteger(const int& value, const int& /*width*/)
{
outfile.write((char*)&value,sizeof(value));
}
/*==========================================================*/
-void UbFileOutputBinary::writeSize_t(const std::size_t& value, const int& width)
+void UbFileOutputBinary::writeSize_t(const std::size_t& value, const int& /*width*/)
{
outfile.write((char*)&value,sizeof(value));
}
/*==========================================================*/
-void UbFileOutputBinary::writeChar(const char& value, const int& width)
+void UbFileOutputBinary::writeChar(const char& value, const int& /*width*/)
{
outfile.write((char*)&value,sizeof(value));
}
/*==========================================================*/
-void UbFileOutputBinary::writeString(const string& value, const int& width)
+void UbFileOutputBinary::writeString(const string& value, const int& /*width*/)
{
char c='\0';
unsigned int length = (unsigned)value.length();
@@ -131,12 +131,12 @@ void UbFileOutputBinary::writeString(const string& value, const int& width)
}
}
/*==========================================================*/
-void UbFileOutputBinary::writeStringOnly(const string& value)
+void UbFileOutputBinary::writeStringOnly(const string& /*value*/)
{
UbException(UB_EXARGS,"no way... causes to many errors");
}
/*==========================================================*/
-void UbFileOutputBinary::writeLine(const std::string& value, const int& width)
+void UbFileOutputBinary::writeLine(const std::string& value, const int& /*width*/)
{
this->writeString(value);
char c='\n';
diff --git a/src/basics/geometry3d/GbCylinder3D.h b/src/basics/geometry3d/GbCylinder3D.h
index f5f85252523dd04bd8a52f61ffd46252d6f49ebe..2528834e5a4b11cb1d3419bc84dff5efb37be030 100644
--- a/src/basics/geometry3d/GbCylinder3D.h
+++ b/src/basics/geometry3d/GbCylinder3D.h
@@ -23,7 +23,7 @@ class GbObject3DCreator;
#include <PointerDefinitions.h>
class GbCylinder3D;
-typedef SPtr<GbCylinder3D> GbCylinder3DPtr;
+using GbCylinder3DPtr = SPtr<GbCylinder3D>;
class GbCylinder3D : public GbObject3D , public UbObserver
diff --git a/src/basics/geometry3d/GbHalfSpaceKrischan3D.h b/src/basics/geometry3d/GbHalfSpaceKrischan3D.h
index 004b5b63cddeb100f452f75786045b2cd3ebf8e8..82aaa7919da6dbd190695916e1a48145bd138dbc 100644
--- a/src/basics/geometry3d/GbHalfSpaceKrischan3D.h
+++ b/src/basics/geometry3d/GbHalfSpaceKrischan3D.h
@@ -68,7 +68,7 @@ public:
}
/*=====================================================*/
//true, wenn 'in Object' oder 'auf Boundary'!
- bool isPointInGbObject3D(const double& x1p, const double& x2p, const double& x3p, bool& pointIsOnBoundary) override
+ bool isPointInGbObject3D(const double& x1p, const double& x2p, const double& x3p, bool& /*pointIsOnBoundary*/) override
{
return (ptInside(x1p,x2p,x3p));
}
@@ -141,7 +141,7 @@ public:
n3 = this->Normal[2];
}
- void addSurfaceTriangleSet(std::vector<UbTupleFloat3>& nodes, std::vector<UbTupleInt3>& triangles) override
+ void addSurfaceTriangleSet(std::vector<UbTupleFloat3>& /*nodes*/, std::vector<UbTupleInt3>& /*triangles*/) override
{
std::cout << " addSurfaceTriangleSet(): TO BE DONE AND CHECKED ... " << std::endl;
}
@@ -158,7 +158,7 @@ public:
return triangles;
}
- void objectChanged(UbObservable* changedObject) override
+ void objectChanged(UbObservable* /*changedObject*/) override
{
return;
@@ -167,7 +167,7 @@ public:
//this->notifyObserversObjectChanged();
}
/*==========================================================*/
- void objectWillBeDeleted(UbObservable* objectForDeletion) override
+ void objectWillBeDeleted(UbObservable* /*objectForDeletion*/) override
{
return;
//if(this->mLine)
diff --git a/src/basics/geometry3d/GbObjectGroup3D.cpp b/src/basics/geometry3d/GbObjectGroup3D.cpp
index 54b40d5aed352b1daba03d94abdb35507f514dcc..31debedd96176054c11d497764d8884117359e65 100644
--- a/src/basics/geometry3d/GbObjectGroup3D.cpp
+++ b/src/basics/geometry3d/GbObjectGroup3D.cpp
@@ -21,50 +21,50 @@ void GbObjectGroup3D::finalize()
throw UbException(UB_EXARGS,"not implemented.");
}
/*=======================================================*/
-void GbObjectGroup3D::setCenterCoordinates(const double& x1, const double& x2, const double& x3)
+void GbObjectGroup3D::setCenterCoordinates(const double& /*x1*/, const double& /*x2*/, const double& /*x3*/)
{
throw UbException(UB_EXARGS,"not implemented.");
}
/*=====================================================*/
-double GbObjectGroup3D::getDistance(GbPoint3D* p)
+double GbObjectGroup3D::getDistance(GbPoint3D* /*p*/)
{
throw UbException(UB_EXARGS,"not implemented.");
}
/*=====================================================*/
-void GbObjectGroup3D::setCenterX1Coordinate(const double& value)
+void GbObjectGroup3D::setCenterX1Coordinate(const double& /*value*/)
{
throw UbException(UB_EXARGS,"not implemented.");
}
/*=====================================================*/
-void GbObjectGroup3D::setCenterX2Coordinate(const double& value)
+void GbObjectGroup3D::setCenterX2Coordinate(const double& /*value*/)
{
throw UbException(UB_EXARGS,"not implemented.");
}
/*=====================================================*/
-void GbObjectGroup3D::setCenterX3Coordinate(const double& value)
+void GbObjectGroup3D::setCenterX3Coordinate(const double& /*value*/)
{
throw UbException(UB_EXARGS,"not implemented.");
}
/*=====================================================*/
-void GbObjectGroup3D::setRadius(const double& radius)
+void GbObjectGroup3D::setRadius(const double& /*radius*/)
{
throw UbException(UB_EXARGS,"not implemented.");
}
/*=====================================================*/
-double GbObjectGroup3D::getDistance(const double& x1p, const double& x2p, const double& x3p)
+double GbObjectGroup3D::getDistance(const double& /*x1p*/, const double& /*x2p*/, const double& /*x3p*/)
{
throw UbException(UB_EXARGS,"not implemented.");
}
/*=====================================================*/
//true, wenn 'in Object' oder 'auf Boundary'!
-bool GbObjectGroup3D::isPointInGbObject3D(const double& x1p, const double& x2p, const double& x3p)
+bool GbObjectGroup3D::isPointInGbObject3D(const double& /*x1p*/, const double& /*x2p*/, const double& /*x3p*/)
{
return false;
}
/*=====================================================*/
//true, wenn 'in Object' oder 'auf Boundary'!
-bool GbObjectGroup3D::isPointInGbObject3D(const double& x1p, const double& x2p, const double& x3p, bool& pointIsOnBoundary)
+bool GbObjectGroup3D::isPointInGbObject3D(const double& /*x1p*/, const double& /*x2p*/, const double& /*x3p*/, bool& /*pointIsOnBoundary*/)
{
return false;
}
@@ -77,7 +77,7 @@ string GbObjectGroup3D::toString()
return ss.str();
}
/*=====================================================*/
-GbLine3D* GbObjectGroup3D::createClippedLine3D(GbPoint3D& point1, GbPoint3D& point2)
+GbLine3D* GbObjectGroup3D::createClippedLine3D(GbPoint3D& /*point1*/, GbPoint3D& /*point2*/)
{
return NULL;
}
@@ -107,27 +107,27 @@ void GbObjectGroup3D::addSurfaceTriangleSet(vector<UbTupleFloat3>& nodes, vector
{
}
/*=======================================================*/
-bool GbObjectGroup3D::hasIntersectionWithDirectedLine(GbPoint3D origin, GbPoint3D direction)
+bool GbObjectGroup3D::hasIntersectionWithDirectedLine(GbPoint3D /*origin*/, GbPoint3D /*direction*/)
{
return false;
}
/*=======================================================*/
-bool GbObjectGroup3D::isCellCuttingGbObject3D(const double& x1a,const double& x2a,const double& x3a,const double& x1b,const double& x2b,const double& x3b)
+bool GbObjectGroup3D::isCellCuttingGbObject3D(const double& /*x1a*/,const double& /*x2a*/,const double& /*x3a*/,const double& /*x1b*/,const double& /*x2b*/,const double& /*x3b*/)
{
return false;
}
/*=======================================================*/
-bool GbObjectGroup3D::isCellInsideOrCuttingGbObject3D(const double& x1a,const double& x2a,const double& x3a,const double& x1b,const double& x2b,const double& x3b)
+bool GbObjectGroup3D::isCellInsideOrCuttingGbObject3D(const double& /*x1a*/,const double& /*x2a*/,const double& /*x3a*/,const double& /*x1b*/,const double& /*x2b*/,const double& /*x3b*/)
{
return false;
}
/*==========================================================*/
-double GbObjectGroup3D::getCellVolumeInsideGbObject3D(const double& x1a,const double& x2a,const double& x3a,const double& x1b,const double& x2b,const double& x3b)
+double GbObjectGroup3D::getCellVolumeInsideGbObject3D(const double& /*x1a*/,const double& /*x2a*/,const double& /*x3a*/,const double& /*x1b*/,const double& /*x2b*/,const double& /*x3b*/)
{
return 0.0;
}
/*==========================================================*/
-double GbObjectGroup3D::getIntersectionRaytraceFactor(const double& x1, const double& x2, const double& x3, const double& rx1, const double& rx2, const double& rx3)
+double GbObjectGroup3D::getIntersectionRaytraceFactor(const double& /*x1*/, const double& /*x2*/, const double& /*x3*/, const double& /*rx1*/, const double& /*rx2*/, const double& /*rx3*/)
{
return 0.0;
}
diff --git a/src/basics/geometry3d/GbObjectGroup3D.h b/src/basics/geometry3d/GbObjectGroup3D.h
index a066a2a0ef808241a0861a39014954b895078d16..380174f4750acbfc296fc5338c640eb13cc1ae1d 100644
--- a/src/basics/geometry3d/GbObjectGroup3D.h
+++ b/src/basics/geometry3d/GbObjectGroup3D.h
@@ -32,7 +32,7 @@ public:
//////////////////////////////////////////////////////////////////////////
// Konstruktoren
GbObjectGroup3D();
- GbObjectGroup3D(GbObjectGroup3D *group){};
+ GbObjectGroup3D(GbObjectGroup3D * /*group*/){};
~GbObjectGroup3D() override;
GbObjectGroup3D* clone() override {return new GbObjectGroup3D(this);}
@@ -90,18 +90,18 @@ public:
this->notifyObserversObjectChanged();
}
void rotate(const double& rx1, const double& rx2, const double& rx3) override {/* rotation makes no sense*/ }
- void scale(const double& sx1, const double& sx2, const double& sx3) override { this->radius *= sx1; }
+ void scale(const double& sx1, const double& /*sx2*/, const double& /*sx3*/) override { this->radius *= sx1; }
TRIANGULATIONMODE getTriangulationMode() {return triangulationMode;}
void setTriangulationMode(TRIANGULATIONMODE mode) { this->triangulationMode = mode; }
//virtuelle Methoden von UbObserver
- void objectChanged(UbObservable* changedObject) override
+ void objectChanged(UbObservable* /*changedObject*/) override
{
this->notifyObserversObjectChanged();
//std::cout<<"GbSphere:objectChanged() - toDo-);";
}
- void objectWillBeDeleted(UbObservable* objectForDeletion) override
+ void objectWillBeDeleted(UbObservable* /*objectForDeletion*/) override
{
std::cout<<"throw UbException(-GbObjectGroup3D::finalize() - toDo-);";
}
diff --git a/src/basics/geometry3d/GbQuadFaceMesh3D.cpp b/src/basics/geometry3d/GbQuadFaceMesh3D.cpp
index 3211811370d466a32345772c1fecc6c13bb51e8e..8c7ccb1a076555732e147b150afd7c3c93f9d3f6 100644
--- a/src/basics/geometry3d/GbQuadFaceMesh3D.cpp
+++ b/src/basics/geometry3d/GbQuadFaceMesh3D.cpp
@@ -233,7 +233,7 @@ vector<GbTriangle3D*> GbQuadFaceMesh3D::getSurfaceTriangleSet()
* @param zp the z-coordinate of the point
* @return true if point is inside else return false
*/
-bool GbQuadFaceMesh3D::isPointInObject3DHalfSpace(const double& xp, const double& yp, const double& zp)
+bool GbQuadFaceMesh3D::isPointInObject3DHalfSpace(const double& /*xp*/, const double& /*yp*/, const double& /*zp*/)
{
throw UbException(UB_EXARGS,"not implemented");
//vector<GbQuadangle3D*> *Quadangles = this->quads;
@@ -283,12 +283,12 @@ bool GbQuadFaceMesh3D::isPointInGbObject3D(const double& x1, const double& x2, c
return false;
}
/*======================================================================*/
-bool GbQuadFaceMesh3D::isPointInGbObject3D(const double& x1, const double& x2, const double& x3, bool& pointIsOnBoundary)
+bool GbQuadFaceMesh3D::isPointInGbObject3D(const double& /*x1*/, const double& /*x2*/, const double& /*x3*/, bool& /*pointIsOnBoundary*/)
{
throw UbException(UB_EXARGS,"not implemented");
}
/*======================================================================*/
-GbLine3D* GbQuadFaceMesh3D::createClippedLine3D (GbPoint3D& point1, GbPoint3D& point2)
+GbLine3D* GbQuadFaceMesh3D::createClippedLine3D (GbPoint3D& /*point1*/, GbPoint3D& /*point2*/)
{
throw UbException(UB_EXARGS,"not implemented");
}
diff --git a/src/basics/geometry3d/GbQuadFaceMesh3D.h b/src/basics/geometry3d/GbQuadFaceMesh3D.h
index 0ffa94867464cb5e48fc0ca139d9b4ce51042ca7..0a754d75693c87976b28423c693d81125ad747b2 100644
--- a/src/basics/geometry3d/GbQuadFaceMesh3D.h
+++ b/src/basics/geometry3d/GbQuadFaceMesh3D.h
@@ -96,8 +96,8 @@ public:
//virtual std::vector<GbQuad3D*> getSurfaceQuadSet();
std::vector<GbTriangle3D*> getSurfaceTriangleSet() override;
- virtual void write(UbFileOutput* out) { std::cout<<"GbQuadFaceMesh3D::write - sorry not implemented\n"; }
- virtual void read(UbFileInput* in) { std::cout<<"GbQuadFaceMesh3D::read - sorry not implemented\n"; }
+ virtual void write(UbFileOutput* /*out*/) { std::cout<<"GbQuadFaceMesh3D::write - sorry not implemented\n"; }
+ virtual void read(UbFileInput* /*in*/) { std::cout<<"GbQuadFaceMesh3D::read - sorry not implemented\n"; }
void writeAVSMesh(UbFileOutput *out, bool normals=false);
diff --git a/src/basics/geometry3d/GbSphere3D.h b/src/basics/geometry3d/GbSphere3D.h
index 550b7c626bdb9765841006d6a7673715f1093d25..9fb4ae98aa278ea5256d3695c8a4feb04e876e9c 100644
--- a/src/basics/geometry3d/GbSphere3D.h
+++ b/src/basics/geometry3d/GbSphere3D.h
@@ -93,7 +93,7 @@ public:
this->notifyObserversObjectChanged();
}
void rotate(const double& rx1, const double& rx2, const double& rx3) override {/* rotation makes no sense*/ }
- void scale(const double& sx1, const double& sx2, const double& sx3) override
+ void scale(const double& sx1, const double& /*sx2*/, const double& /*sx3*/) override
{
this->radius *= sx1;
this->notifyObserversObjectChanged();
@@ -105,12 +105,12 @@ public:
void setTriangulationMode(TRIANGULATIONMODE mode) { this->triangulationMode = mode; }
//virtuelle Methoden von UbObserver
- void objectChanged(UbObservable* changedObject) override
+ void objectChanged(UbObservable* /*changedObject*/) override
{
this->notifyObserversObjectChanged();
//std::cout<<"GbSphere:objectChanged() - toDo-);";
}
- void objectWillBeDeleted(UbObservable* objectForDeletion) override
+ void objectWillBeDeleted(UbObservable* /*objectForDeletion*/) override
{
throw UbException(UB_EXARGS,"not implemented");
}
diff --git a/src/basics/geometry3d/GbTriFaceMesh3D.cpp b/src/basics/geometry3d/GbTriFaceMesh3D.cpp
index cfeeffc8e1d87f4afd573e0d31e433e3a1e2feeb..3a6b7652f0fc36a725b56879785ff93b0509d03a 100644
--- a/src/basics/geometry3d/GbTriFaceMesh3D.cpp
+++ b/src/basics/geometry3d/GbTriFaceMesh3D.cpp
@@ -948,7 +948,7 @@ bool GbTriFaceMesh3D::intersectLine(const double& p1_x1, const double& p1_x2, co
return (iSec != Kd::Intersection::NO_INTERSECTION);
}
/*======================================================================*/
-GbLine3D* GbTriFaceMesh3D::createClippedLine3D (GbPoint3D& point1, GbPoint3D& point2)
+GbLine3D* GbTriFaceMesh3D::createClippedLine3D (GbPoint3D& /*point1*/, GbPoint3D& /*point2*/)
{
throw UbException(UB_EXARGS,"not implemented");
}
diff --git a/src/basics/geometry3d/GbTriangularMesh3D.cpp b/src/basics/geometry3d/GbTriangularMesh3D.cpp
index 8c1cd4905880d37a4f89d3b79baef22bc1e1a384..13ba661455606ec0761e80971b58758084851654 100644
--- a/src/basics/geometry3d/GbTriangularMesh3D.cpp
+++ b/src/basics/geometry3d/GbTriangularMesh3D.cpp
@@ -559,7 +559,7 @@ UbTupleDouble6 GbTriangularMesh3D::calculateMomentOfInertia(double rhoP)
* @return the volume of this triangular mesh within the specified rectangle
* @exception NullPointerException if no triangles are found within the specified rectangle
*/
-double GbTriangularMesh3D::getVolumeForRectangle(const double& p1x1, const double& p1x2, const double& p2x1, const double& p2x2)
+double GbTriangularMesh3D::getVolumeForRectangle(const double& /*p1x1*/, const double& /*p1x2*/, const double& /*p2x1*/, const double& /*p2x2*/)
{
throw UbException(UB_EXARGS,"not yet implemented");
// GbPolygon2D polygon;
@@ -620,7 +620,7 @@ double GbTriangularMesh3D::getVolumeForRectangle(const double& p1x1, const doubl
* @param p2x2 the 2nd x2 coordinate of the rectangle
* @return the triangles of this triangular mesh located within the specified rectangle
*/
-vector<GbTriangle3D*>* GbTriangularMesh3D::getTrianglesForRectangle(const double& p1x1, const double& p1x2, const double& p2x1, const double& p2x2)
+vector<GbTriangle3D*>* GbTriangularMesh3D::getTrianglesForRectangle(const double& /*p1x1*/, const double& /*p1x2*/, const double& /*p2x1*/, const double& /*p2x2*/)
{
throw UbException(UB_EXARGS,"not yet implemented");
// QbList triangleList = new QbList(GbTriangle3D.class);
@@ -668,7 +668,7 @@ vector<GbTriangle3D*>* GbTriangularMesh3D::getTrianglesForRectangle(const double
* @param p2x2 the 2nd x2 coordinate of the rectangle
* @return the nodes of this triangular mesh located within the specified rectangle
*/
-vector<GbPoint3D*>* GbTriangularMesh3D::getNodesForRectangle(const double& p1x1, const double& p1x2, const double& p2x1, const double& p2x2)
+vector<GbPoint3D*>* GbTriangularMesh3D::getNodesForRectangle(const double& /*p1x1*/, const double& /*p1x2*/, const double& /*p2x1*/, const double& /*p2x2*/)
{
throw UbException(UB_EXARGS,"not implemented");
// QbList nodeList = new QbList(GbPoint3D.class);
@@ -693,7 +693,7 @@ vector<GbPoint3D*>* GbTriangularMesh3D::getNodesForRectangle(const double& p1x1,
* @return the difference of maximum and minimum x3 coordinates of this triangular mesh within the specified rectangle
* @exception NullPointerException if no triangles are found within the specified rectangle
*/
-double GbTriangularMesh3D::getX3RangeForRectangle(const double& p1x1, const double& p1x2, const double& p2x1, const double& p2x2)
+double GbTriangularMesh3D::getX3RangeForRectangle(const double& /*p1x1*/, const double& /*p1x2*/, const double& /*p2x1*/, const double& /*p2x2*/)
{
throw UbException(UB_EXARGS,"not implemented");
// GbPolygon3D polygon;
@@ -766,7 +766,7 @@ double GbTriangularMesh3D::getX3RangeForRectangle(const double& p1x1, const doub
* @return the minimum x3 coordinates of this triangular mesh within the specified rectangle
* @exception NullPointerException if no triangles are found within the specified rectangle
*/
-double GbTriangularMesh3D::getX3MinimumForRectangle(const double& p1x1, const double& p1x2, const double& p2x1, const double& p2x2)
+double GbTriangularMesh3D::getX3MinimumForRectangle(const double& /*p1x1*/, const double& /*p1x2*/, const double& /*p2x1*/, const double& /*p2x2*/)
{
throw UbException(UB_EXARGS,"not implemented");
// GbPolygon3D polygon;
@@ -834,7 +834,7 @@ double GbTriangularMesh3D::getX3MinimumForRectangle(const double& p1x1, const do
* @return the maximum x3 coordinates of this triangular mesh within the specified rectangle
* @exception NullPointerException if no triangles are found within the specified rectangle
*/
-double GbTriangularMesh3D::getX3MaximumForRectangle(const double& p1x1, const double& p1x2, const double& p2x1, const double& p2x2)
+double GbTriangularMesh3D::getX3MaximumForRectangle(const double& /*p1x1*/, const double& /*p1x2*/, const double& /*p2x1*/, const double& /*p2x2*/)
{
throw UbException(UB_EXARGS,"not implemented");
// GbPolygon3D polygon;
@@ -939,7 +939,7 @@ bool GbTriangularMesh3D::isPointInObject3DHalfSpace(const double& xp, const doub
return true;
}
/*======================================================================*/
-bool GbTriangularMesh3D::isPointInObject3DRayCrossing(const double& xp, const double& yp, const double& zp, int radius, int numVertices, int numTriangles)
+bool GbTriangularMesh3D::isPointInObject3DRayCrossing(const double& xp, const double& yp, const double& zp, int radius, int /*numVertices*/, int numTriangles)
{
GbVector3D point(xp,yp,zp);
@@ -973,12 +973,12 @@ bool GbTriangularMesh3D::isPointInGbObject3D(const double& x1, const double& x2,
else throw UbException(UB_EXARGS,"no ptInObjTest");
}
/*======================================================================*/
-bool GbTriangularMesh3D::isPointInGbObject3D(const double& x1, const double& x2, const double& x3, bool& pointIsOnBoundary)
+bool GbTriangularMesh3D::isPointInGbObject3D(const double& /*x1*/, const double& /*x2*/, const double& /*x3*/, bool& /*pointIsOnBoundary*/)
{
throw UbException(UB_EXARGS,"not implemented");
}
/*======================================================================*/
-GbLine3D* GbTriangularMesh3D::createClippedLine3D(GbPoint3D& point1, GbPoint3D& point2)
+GbLine3D* GbTriangularMesh3D::createClippedLine3D(GbPoint3D& /*point1*/, GbPoint3D& /*point2*/)
{
throw UbException(UB_EXARGS,"not implemented");
}
@@ -1193,7 +1193,7 @@ Returns a char:
'0': the query point p does not intersect (misses) triangle T.
*/
-char GbTriangularMesh3D::InTri3D( GbTriangle3D* T, int m, GbVector3D& p )
+char GbTriangularMesh3D::InTri3D( GbTriangle3D* T, int m, GbVector3D& /*p*/ )
{
// int i; /* Index for X,Y,Z */
int j; /* Index for X,Y */
@@ -1305,7 +1305,7 @@ char GbTriangularMesh3D::SegTriInt( GbTriangle3D* T, GbVector3D& q, GbVector3
else /* Error */ return code;
}
-char GbTriangularMesh3D::InPlane( GbTriangle3D* T, int m, GbVector3D& q, GbVector3D& r, GbVector3D& p)
+char GbTriangularMesh3D::InPlane( GbTriangle3D* /*T*/, int /*m*/, GbVector3D& /*q*/, GbVector3D& /*r*/, GbVector3D& /*p*/)
{
// cout<<"inplane\n";
/* NOT IMPLEMENTED */
diff --git a/src/basics/geometry3d/GbVoxelMatrix3D.cpp b/src/basics/geometry3d/GbVoxelMatrix3D.cpp
index 5d4bdf2d540d538c4c200e94cd5a13a161ae68f2..45a5adcc146170f59627f462034904c0f0b3f910 100644
--- a/src/basics/geometry3d/GbVoxelMatrix3D.cpp
+++ b/src/basics/geometry3d/GbVoxelMatrix3D.cpp
@@ -270,7 +270,7 @@ bool GbVoxelMatrix3D::isPointInGbObject3D(const double& x1p, const double& x2p,
return isPointInGbObject3D(x1p, x2p, x3p);
}
/*=======================================================*/
-bool GbVoxelMatrix3D::isCellInsideGbObject3D(const double& x1p1, const double& x2p1, const double& x3p1, const double& x1p2, const double& x2p2, const double& x3p2)
+bool GbVoxelMatrix3D::isCellInsideGbObject3D(const double& /*x1p1*/, const double& /*x2p1*/, const double& /*x3p1*/, const double& /*x1p2*/, const double& /*x2p2*/, const double& /*x3p2*/)
{
return false;
//FIXME: unreachable cide
@@ -395,7 +395,7 @@ vector<GbTriangle3D*> GbVoxelMatrix3D::getSurfaceTriangleSet()
return triangles;
}
/*=======================================================*/
-void GbVoxelMatrix3D::addSurfaceTriangleSet(vector<UbTupleFloat3>& nodes, vector<UbTupleInt3>& triangles)
+void GbVoxelMatrix3D::addSurfaceTriangleSet(vector<UbTupleFloat3>& /*nodes*/, vector<UbTupleInt3>& /*triangles*/)
{
UBLOG(logINFO, " GbVoxelMatrix3D addSurfaceTriangleSet start")
if (!this->addSurfaceTriangleSetFlag)
@@ -548,7 +548,7 @@ void GbVoxelMatrix3D::readMatrixFromVtiASCIIFile(std::string filename)
}
//////////////////////////////////////////////////////////////////////////
-void GbVoxelMatrix3D::rotate90aroundX(double cX1, double cX2, double cX3)
+void GbVoxelMatrix3D::rotate90aroundX(double /*cX1*/, double cX2, double cX3)
{
// double tempMinPunktX1 = minX1-cX1;
double tempMinPunktX2 = minX2-cX2;
@@ -599,7 +599,7 @@ void GbVoxelMatrix3D::rotate90aroundX()
rotate90aroundX(cX1, cX2, cX3);
}
//////////////////////////////////////////////////////////////////////////
-void GbVoxelMatrix3D::rotate90aroundY(double cX1, double cX2, double cX3)
+void GbVoxelMatrix3D::rotate90aroundY(double cX1, double /*cX2*/, double cX3)
{
double tempMinPunktX1 = getX1Maximum()-cX1;
// double tempMinPunktX2 = minX2-cX2;
@@ -650,7 +650,7 @@ void GbVoxelMatrix3D::rotate90aroundY()
rotate90aroundY(cX1, cX2, cX3);
}
//////////////////////////////////////////////////////////////////////////
-void GbVoxelMatrix3D::rotate90aroundZ(double cX1, double cX2, double cX3)
+void GbVoxelMatrix3D::rotate90aroundZ(double cX1, double cX2, double /*cX3*/)
{
double tempMinPunktX1 = minX1-cX1;
double tempMinPunktX2 = getX2Maximum()-cX2;
diff --git a/src/basics/geometry3d/GbVoxelMatrix3D.h b/src/basics/geometry3d/GbVoxelMatrix3D.h
index 9feceb824cb3de33ed6d8aa080dc28cb2c5d6a8f..48e72e9218605a4a3830356eac9a3255346e1505 100644
--- a/src/basics/geometry3d/GbVoxelMatrix3D.h
+++ b/src/basics/geometry3d/GbVoxelMatrix3D.h
@@ -24,7 +24,7 @@ class GbObject3DCreator;
class GbVoxelMatrix3D : public GbObject3D, public UbObserver
{
public:
- typedef CbArray3D<float> Matrix3D;
+ using Matrix3D = CbArray3D<float>;
static const float SOLID;
static const float FLUID;
enum Endian { BigEndian, LittleEndian };
@@ -95,8 +95,8 @@ public:
bool isCellInsideOrCuttingGbObject3D(const double& x1a, const double& x2a, const double& x3a, const double& x1b, const double& x2b, const double& x3b) override;
//double getCellVolumeInsideGbObject3D(const double& x1a,const double& x2a,const double& x3a,const double& x1b,const double& x2b,const double& x3b);
- GbPoint3D* calculateInterSectionPoint3D(GbPoint3D& point1, GbPoint3D &point2) { throw UbException(__FILE__, __LINE__, UB_FUNCTION, "not implemented"); }
- GbLine3D* createClippedLine3D(GbPoint3D& point1, GbPoint3D& point2) override { throw UbException(__FILE__, __LINE__, UB_FUNCTION, "not implemented"); }
+ GbPoint3D* calculateInterSectionPoint3D(GbPoint3D& /*point1*/, GbPoint3D & /*point2*/) { throw UbException(__FILE__, __LINE__, UB_FUNCTION, "not implemented"); }
+ GbLine3D* createClippedLine3D(GbPoint3D& /*point1*/, GbPoint3D& /*point2*/) override { throw UbException(__FILE__, __LINE__, UB_FUNCTION, "not implemented"); }
std::vector<GbTriangle3D*> getSurfaceTriangleSet() override;
void addSurfaceTriangleSet(std::vector<UbTupleFloat3>& nodes, std::vector<UbTupleInt3>& triangles) override;
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/DensityBCAdapter.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/DensityBCAdapter.cpp
index 4d510601c4053b7f5cffccddb59785e3e226cae6..0a7a57a6753960fc0c1174925494ed311fc6ea72 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/DensityBCAdapter.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/DensityBCAdapter.cpp
@@ -61,7 +61,7 @@ void DensityBCAdapter::init()
catch(...) { throw UbException(UB_EXARGS,"unknown exception" ); }
}
/*==========================================================*/
-void DensityBCAdapter::init(const D3Q27Interactor* const& interactor, const double& time)
+void DensityBCAdapter::init(const D3Q27Interactor* const& /*interactor*/, const double& time)
{
this->timeStep = time;
this->tmpDensityFunction = NULL;
@@ -99,7 +99,7 @@ void DensityBCAdapter::update( const D3Q27Interactor* const& interactor, const d
this->init(interactor,time);
}
/*==========================================================*/
-void DensityBCAdapter::adaptBCForDirection( const D3Q27Interactor& interactor, SPtr<BoundaryConditions> bc, const double& worldX1, const double& worldX2, const double& worldX3, const double& q, const int& fdirection, const double& time )
+void DensityBCAdapter::adaptBCForDirection( const D3Q27Interactor& /*interactor*/, SPtr<BoundaryConditions> bc, const double& /*worldX1*/, const double& /*worldX2*/, const double& /*worldX3*/, const double& q, const int& fdirection, const double& /*time*/ )
{
bc->setDensityBoundaryFlag(D3Q27System::INVDIR[fdirection],secondaryBcOption);
bc->setQ((float)q,fdirection);
@@ -111,7 +111,7 @@ void DensityBCAdapter::adaptBC( const D3Q27Interactor& interactor, SPtr<Boundary
bc->setBcAlgorithmType(algorithmType);
}
/*==========================================================*/
-void DensityBCAdapter::setNodeDensity( const D3Q27Interactor& interactor, SPtr<BoundaryConditions> bc, const double& worldX1, const double& worldX2, const double& worldX3, const double& timestep)
+void DensityBCAdapter::setNodeDensity( const D3Q27Interactor& /*interactor*/, SPtr<BoundaryConditions> bc, const double& worldX1, const double& worldX2, const double& worldX3, const double& timestep)
{
//Geschwindigkeiten setzen
try
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBCAdapter.cpp b/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBCAdapter.cpp
index 53e462f67822b82f8a303b65ed54f24d1715974e..1cb54321d4faa232c15e3d1cfd18595316bc35f0 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBCAdapter.cpp
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBCAdapter.cpp
@@ -15,7 +15,7 @@
// return D3Q27SlipBCAdapterCreator::getInstance();
//}
//*==========================================================*/
-void SlipBCAdapter::adaptBC(const D3Q27Interactor& interactor, SPtr<BoundaryConditions> bc, const double& worldX1, const double& worldX2, const double& worldX3, const double& time)
+void SlipBCAdapter::adaptBC(const D3Q27Interactor& interactor, SPtr<BoundaryConditions> bc, const double& /*worldX1*/, const double& /*worldX2*/, const double& /*worldX3*/, const double& /*time*/)
{
//////////////////////////////////////////////////////////////////////////
//>>> nur workaround! -> Hendrick nach normalen berechnung aus qs fragen
diff --git a/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBCAdapter.h b/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBCAdapter.h
index b6b34a616301e60ad19fb7f9cdea05a00ce5566e..18bda019003bdecd6cd0bf8beeeeb7a8c56448ab 100644
--- a/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBCAdapter.h
+++ b/src/cpu/VirtualFluidsCore/BoundaryConditions/SlipBCAdapter.h
@@ -70,7 +70,7 @@ public:
void init(const D3Q27Interactor* const& interactor, const double& timestep=0) override {}
void update(const D3Q27Interactor* const& interactor, const double& timestep=0) override {}
- void adaptBCForDirection( const D3Q27Interactor& interactor, SPtr<BoundaryConditions> bc, const double& worldX1, const double& worldX2, const double& worldX3, const double& q, const int& fdirection, const double& time=0 ) override
+ void adaptBCForDirection( const D3Q27Interactor& /*interactor*/, SPtr<BoundaryConditions> bc, const double& /*worldX1*/, const double& /*worldX2*/, const double& /*worldX3*/, const double& q, const int& fdirection, const double& /*time*/=0 ) override
{
bc->setSlipBoundaryFlag(D3Q27System::INVDIR[fdirection],secondaryBcOption);
bc->setQ((float)q,fdirection);
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/AverageValuesCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/AverageValuesCoProcessor.h
index 9b826e86545369b77a1c008bc94971b0617625ed..8fadba91aae54209e4a5b0b7e6438dd9771eb397 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/AverageValuesCoProcessor.h
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/AverageValuesCoProcessor.h
@@ -68,7 +68,7 @@ private:
//you need to calculate a square root before plotting RMS
enum Values{AvVx = 0, AvVy = 1, AvVz = 2, AvVxx = 3, AvVyy = 4, AvVzz = 5, AvVxy = 6, AvVxz = 7, AvVyz = 8, AvP = 9, AvPrms = 10};
- typedef void (*CalcMacrosFct)(const LBMReal* const& /*feq[27]*/,LBMReal& /*(d)rho*/, LBMReal& /*vx1*/, LBMReal& /*vx2*/, LBMReal& /*vx3*/);
+ using CalcMacrosFct = void (*)(const LBMReal *const &, LBMReal &, LBMReal &, LBMReal &, LBMReal &);
CalcMacrosFct calcMacros;
};
#endif
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/EmergencyExitCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/EmergencyExitCoProcessor.cpp
index a287ada4c6193522737fe9fb147a45ef04190268..6da4749b8f3ee1b0696c359be66d8478997ffe02 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/EmergencyExitCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/EmergencyExitCoProcessor.cpp
@@ -49,7 +49,7 @@ void EmergencyExitCoProcessor::collectData( double step )
}
}
//////////////////////////////////////////////////////////////////////////
-void EmergencyExitCoProcessor::writeMetafile(int status )
+void EmergencyExitCoProcessor::writeMetafile(int /*status*/ )
{
UbFileOutputASCII out(metafile);
out.writeBool(false);
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/LineTimeSeriesCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/LineTimeSeriesCoProcessor.h
index 027f2d9a109302233f007045bb59f79fda441150..e3559b93b7d2e790d9328393f58e5e3b816c9e6f 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/LineTimeSeriesCoProcessor.h
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/LineTimeSeriesCoProcessor.h
@@ -39,7 +39,7 @@ private:
bool root;
SPtr<GbLine3D> line;
//function pointer
- typedef void(*CalcMacrosFct)(const LBMReal* const& /*feq[27]*/, LBMReal& /*(d)rho*/, LBMReal& /*vx1*/, LBMReal& /*vx2*/, LBMReal& /*vx3*/);
+ using CalcMacrosFct = void (*)(const LBMReal *const &, LBMReal &, LBMReal &, LBMReal &, LBMReal &);
CalcMacrosFct calcMacros;
int blocknx;
int blockix1;
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/MicrophoneArrayCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/MicrophoneArrayCoProcessor.cpp
index 73527fc76617e3baa6de12f9c1cc32058af2cc1a..eb412b499bab44a2ba340170d0dd235c1d47a00a 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/MicrophoneArrayCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/MicrophoneArrayCoProcessor.cpp
@@ -105,7 +105,7 @@ void MicrophoneArrayCoProcessor::collectData(double step)
}
}
-void MicrophoneArrayCoProcessor::writeFile(double step)
+void MicrophoneArrayCoProcessor::writeFile(double /*step*/)
{
for (int i = 0; i < microphones.size(); i++)
{
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/MicrophoneArrayCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/MicrophoneArrayCoProcessor.h
index 52210186fbfc2d17b797eb45897214fb7ee563b4..73821538b06e5da5d9f73d10ba9bb6d6613571b8 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/MicrophoneArrayCoProcessor.h
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/MicrophoneArrayCoProcessor.h
@@ -50,7 +50,7 @@ private:
int count;
int micID;
- typedef void(*CalcMacrosFct)(const LBMReal* const& /*feq[27]*/, LBMReal& /*(d)rho*/, LBMReal& /*vx1*/, LBMReal& /*vx2*/, LBMReal& /*vx3*/);
+ using CalcMacrosFct = void (*)(const LBMReal *const &, LBMReal &, LBMReal &, LBMReal &, LBMReal &);
CalcMacrosFct calcMacros;
};
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/PressureCoefficientCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/PressureCoefficientCoProcessor.h
index 16736237cf1fcb613d93699c7bcf75dc1fc22d73..441e6ca8e6480c59c4e1196ff5fddac22eb3f355 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/PressureCoefficientCoProcessor.h
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/PressureCoefficientCoProcessor.h
@@ -47,7 +47,7 @@ private:
std::vector<double> outValues;
- typedef void(*CalcMacrosFct)(const LBMReal* const& /*feq[27]*/, LBMReal& /*(d)rho*/, LBMReal& /*vx1*/, LBMReal& /*vx2*/, LBMReal& /*vx3*/);
+ using CalcMacrosFct = void (*)(const LBMReal *const &, LBMReal &, LBMReal &, LBMReal &, LBMReal &);
CalcMacrosFct calcMacros;
};
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/ShearStressCoProcessor.cpp b/src/cpu/VirtualFluidsCore/CoProcessors/ShearStressCoProcessor.cpp
index 514021b837b00e96fe82143a329fb5e84213fc31..784ada9972aea9b04b4d0f22cbd8555ee506f6d2 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/ShearStressCoProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/ShearStressCoProcessor.cpp
@@ -254,7 +254,7 @@ void ShearStressCoProcessor::addData()
for(const auto& interactor : interactors)
{
- typedef std::map<SPtr<Block3D>, std::set< std::vector<int> > > TransNodeIndicesMap;
+ using TransNodeIndicesMap = std::map<SPtr<Block3D>, std::set<std::vector<int> > >;
for(TransNodeIndicesMap::value_type t : interactor->getBcNodeIndicesMap())
{
SPtr<Block3D> block = t.first;
@@ -358,7 +358,7 @@ void ShearStressCoProcessor::reset(double step)
UBLOG(logDEBUG3, "resetCoProcessor::update:" << step);
}
//////////////////////////////////////////////////////////////////////////
-void ShearStressCoProcessor::resetData(double step)
+void ShearStressCoProcessor::resetData(double /*step*/)
{
for(int level = minInitLevel; level<=maxInitLevel;level++)
{
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/TimeAveragedValuesCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/TimeAveragedValuesCoProcessor.h
index 7a70c79355cc1678390de82c65e42ec8d7999bbe..e88a859a9df8c478007cbab7fa8af883c57fb01f 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/TimeAveragedValuesCoProcessor.h
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/TimeAveragedValuesCoProcessor.h
@@ -108,7 +108,7 @@ private:
int iMinC;
int iMaxC;
- typedef void(*CalcMacrosFct)(const LBMReal* const& /*feq[27]*/, LBMReal& /*(d)rho*/, LBMReal& /*vx1*/, LBMReal& /*vx2*/, LBMReal& /*vx3*/);
+ using CalcMacrosFct = void (*)(const LBMReal *const &, LBMReal &, LBMReal &, LBMReal &, LBMReal &);
CalcMacrosFct calcMacros;
bool planarAveraging;
diff --git a/src/cpu/VirtualFluidsCore/CoProcessors/WriteMQFromSelectionCoProcessor.h b/src/cpu/VirtualFluidsCore/CoProcessors/WriteMQFromSelectionCoProcessor.h
index 5720b49296e377d02f9197eea5273f02b971dcb5..7df84b9f514d1001b09e8057a49e27a05eee7936 100644
--- a/src/cpu/VirtualFluidsCore/CoProcessors/WriteMQFromSelectionCoProcessor.h
+++ b/src/cpu/VirtualFluidsCore/CoProcessors/WriteMQFromSelectionCoProcessor.h
@@ -52,7 +52,7 @@ private:
SPtr<Communicator> comm;
SPtr<GbObject3D> gbObject;
- typedef void(*CalcMacrosFct)(const LBMReal* const& /*feq[27]*/, LBMReal& /*(d)rho*/, LBMReal& /*vx1*/, LBMReal& /*vx2*/, LBMReal& /*vx3*/);
+ using CalcMacrosFct = void (*)(const LBMReal *const &, LBMReal &, LBMReal &, LBMReal &, LBMReal &);
CalcMacrosFct calcMacros;
};
diff --git a/src/cpu/VirtualFluidsCore/Connectors/CoarseToFineNodeSetBlock3DConnector.h b/src/cpu/VirtualFluidsCore/Connectors/CoarseToFineNodeSetBlock3DConnector.h
index 9c5ec5bf6579d9ee999ef17bd20f4feb5ba89df8..ae8f09b16c4a55034e488b04051260aa3f4c9240 100644
--- a/src/cpu/VirtualFluidsCore/Connectors/CoarseToFineNodeSetBlock3DConnector.h
+++ b/src/cpu/VirtualFluidsCore/Connectors/CoarseToFineNodeSetBlock3DConnector.h
@@ -57,7 +57,7 @@ public:
protected:
typedef std::vector< int > INodeVector;
- typedef std::vector < INodeVector > INodeSet;
+ using INodeSet = std::vector<INodeVector>;
INodeSet iNodeSetSender00;
INodeSet iNodeSetSender01;
INodeSet iNodeSetSender10;
diff --git a/src/cpu/VirtualFluidsCore/Connectors/D3Q27ETCFOffVectorConnector.h b/src/cpu/VirtualFluidsCore/Connectors/D3Q27ETCFOffVectorConnector.h
index 094a9bec457a3acc23ab212fdf31b2d2973254b2..d7ba85b09ead1caebd0542712a56d14259c0d023 100644
--- a/src/cpu/VirtualFluidsCore/Connectors/D3Q27ETCFOffVectorConnector.h
+++ b/src/cpu/VirtualFluidsCore/Connectors/D3Q27ETCFOffVectorConnector.h
@@ -45,7 +45,7 @@ class D3Q27ETCFOffVectorConnector : public Block3DConnector
{
public:
typedef typename VectorTransmitter::value_type vector_type;
- typedef SPtr< VectorTransmitter > VectorTransmitterPtr;
+ using VectorTransmitterPtr = SPtr<VectorTransmitter>;
public:
D3Q27ETCFOffVectorConnector(SPtr<Block3D> block,
VectorTransmitterPtr senderEvenEvenSW, VectorTransmitterPtr receiverEvenEvenSW,
@@ -1708,7 +1708,7 @@ void D3Q27ETCFOffVectorConnector< VectorTransmitter>::getLocalMinMax(int& minX1,
}
//////////////////////////////////////////////////////////////////////////
template< typename VectorTransmitter >
-void D3Q27ETCFOffVectorConnector< VectorTransmitter>::getLocalMinMax(int& minX1, int& minX2, int& minX3, int& maxX1, int& maxX2, int& maxX3, CFconnectorType connType)
+void D3Q27ETCFOffVectorConnector< VectorTransmitter>::getLocalMinMax(int& minX1, int& minX2, int& minX3, int& maxX1, int& maxX2, int& maxX3, CFconnectorType /*connType*/)
{
using namespace D3Q27System;
int TminX1 = minX1; int TminX2 = minX2; int TminX3 = minX3; int TmaxX1 = maxX1; int TmaxX2 = maxX2; int TmaxX3 = maxX3;
diff --git a/src/cpu/VirtualFluidsCore/Connectors/D3Q27ETFCOffVectorConnector.h b/src/cpu/VirtualFluidsCore/Connectors/D3Q27ETFCOffVectorConnector.h
index 9817caad70d7238eed1ae70d5fa567d689d3ce20..14acb11e53250b3510074dc3181b92e2bc76f517 100644
--- a/src/cpu/VirtualFluidsCore/Connectors/D3Q27ETFCOffVectorConnector.h
+++ b/src/cpu/VirtualFluidsCore/Connectors/D3Q27ETFCOffVectorConnector.h
@@ -38,8 +38,8 @@ class D3Q27ETFCOffVectorConnector : public Block3DConnector
public:
protected:
- typedef typename VectorTransmitter::value_type vector_type;
- typedef SPtr< VectorTransmitter > VectorTransmitterPtr;
+ using vector_type = typename VectorTransmitter::value_type;
+ using VectorTransmitterPtr = SPtr<VectorTransmitter>;
public:
D3Q27ETFCOffVectorConnector(SPtr<Block3D> block, VectorTransmitterPtr sender, VectorTransmitterPtr receiver, int sendDir,
InterpolationProcessorPtr iprocessor, CFconnectorType connType);
@@ -1212,7 +1212,7 @@ void D3Q27ETFCOffVectorConnector< VectorTransmitter>::getLocalMinMax(int& minX1,
}
//////////////////////////////////////////////////////////////////////////
template< typename VectorTransmitter >
-void D3Q27ETFCOffVectorConnector< VectorTransmitter>::getLocalMinMax(int& minX1, int& minX2, int& minX3, int& maxX1, int& maxX2, int& maxX3, CFconnectorType connType)
+void D3Q27ETFCOffVectorConnector< VectorTransmitter>::getLocalMinMax(int& minX1, int& minX2, int& minX3, int& maxX1, int& maxX2, int& maxX3, CFconnectorType /*connType*/)
{
using namespace D3Q27System;
int TminX1 = minX1; int TminX2 = minX2; int TminX3 = minX3; int TmaxX1 = maxX1; int TmaxX2 = maxX2; int TmaxX3 = maxX3;
diff --git a/src/cpu/VirtualFluidsCore/Connectors/FineToCoarseNodeSetBlock3DConnector.h b/src/cpu/VirtualFluidsCore/Connectors/FineToCoarseNodeSetBlock3DConnector.h
index 4d470fd620c190f2cfed2c338a589033c55a02fa..0c10e7778392513f379b07236d280407880cc6ce 100644
--- a/src/cpu/VirtualFluidsCore/Connectors/FineToCoarseNodeSetBlock3DConnector.h
+++ b/src/cpu/VirtualFluidsCore/Connectors/FineToCoarseNodeSetBlock3DConnector.h
@@ -33,8 +33,8 @@ public:
void fillSendVectors() override;
void distributeReceiveVectors() override;
protected:
- typedef std::vector< int > INodeVector;
- typedef std::vector < INodeVector > INodeSet;
+ using INodeVector = std::vector<int>;
+ using INodeSet = std::vector<INodeVector>;
INodeSet iNodeSetSender;
INodeSet iNodeSetReceiver;
diff --git a/src/cpu/VirtualFluidsCore/Connectors/TransmitterType.h b/src/cpu/VirtualFluidsCore/Connectors/TransmitterType.h
index 851854dffa54f074c8c2a303841b1139589b84c3..27300328c3be08a9a2e9f038f07bf68de916dc20 100644
--- a/src/cpu/VirtualFluidsCore/Connectors/TransmitterType.h
+++ b/src/cpu/VirtualFluidsCore/Connectors/TransmitterType.h
@@ -8,9 +8,9 @@
#include <PointerDefinitions.h>
-typedef TbTransmitter< CbVector< LBMReal > > VectorTransmitter;
-typedef VectorTransmitter::value_type vector_type;
-typedef SPtr< TbTransmitter< CbVector< LBMReal > > > VectorTransmitterPtr;
+using VectorTransmitter = TbTransmitter<CbVector<LBMReal> >;
+using vector_type = VectorTransmitter::value_type;
+using VectorTransmitterPtr = SPtr<TbTransmitter<CbVector<LBMReal> > >;
#endif // TransmitterType_h__
diff --git a/src/cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSoA.cpp b/src/cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSoA.cpp
index a27563d9be2a0ee18b47ca331d93191d939e0440..cf6a46c8a951323da0f82611fdfddb4db509d91a 100644
--- a/src/cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSoA.cpp
+++ b/src/cpu/VirtualFluidsCore/Data/D3Q27EsoTwist3DSoA.cpp
@@ -507,7 +507,7 @@ void D3Q27EsoTwist3DSoA::setDistributionInvForDirection(LBMReal f, size_t x1, si
//}
}
//////////////////////////////////////////////////////////////////////////
-LBMReal D3Q27EsoTwist3DSoA::getDistributionInvForDirection(size_t x1, size_t x2, size_t x3, int direction)
+LBMReal D3Q27EsoTwist3DSoA::getDistributionInvForDirection(size_t /*x1*/, size_t /*x2*/, size_t /*x3*/, int /*direction*/)
{
//switch (direction)
//{
diff --git a/src/cpu/VirtualFluidsCore/Data/VoidData3D.h b/src/cpu/VirtualFluidsCore/Data/VoidData3D.h
index 3462d2102f94f58da6e82f8e3944bcc4fe971f0d..7d5e08be5fe3c867b1d1138d5368128ab4c5211c 100644
--- a/src/cpu/VirtualFluidsCore/Data/VoidData3D.h
+++ b/src/cpu/VirtualFluidsCore/Data/VoidData3D.h
@@ -8,7 +8,7 @@ class VoidData3D : public EsoTwist3D
{
public:
VoidData3D() {};
- VoidData3D (size_t nx1, size_t nx2, size_t nx3, LBMReal value)
+ VoidData3D (size_t nx1, size_t nx2, size_t nx3, LBMReal /*value*/)
{
this->NX1 = nx1;
this->NX2 = nx2;
@@ -24,10 +24,10 @@ public:
void setDistributionInv(const LBMReal* const f, size_t x1, size_t x2, size_t x3) override {}
void setDistributionForDirection(const LBMReal* const f, size_t x1, size_t x2, size_t x3, unsigned long int direction) override {}
void setDistributionForDirection(LBMReal f, size_t x1, size_t x2, size_t x3, int direction) override {}
- LBMReal getDistributionInvForDirection(size_t x1, size_t x2, size_t x3, int direction) override {return 0.0;}
+ LBMReal getDistributionInvForDirection(size_t /*x1*/, size_t /*x2*/, size_t /*x3*/, int /*direction*/) override {return 0.0;}
void setDistributionInvForDirection(const LBMReal* const f, size_t x1, size_t x2, size_t x3, unsigned long int direction) override {}
void setDistributionInvForDirection(LBMReal f, size_t x1, size_t x2, size_t x3, unsigned long int direction) override {}
- LBMReal getDistributionForDirection(size_t x1, size_t x2, size_t x3, int direction) override {return 0.0;}
+ LBMReal getDistributionForDirection(size_t /*x1*/, size_t /*x2*/, size_t /*x3*/, int /*direction*/) override {return 0.0;}
void swap() override {}
protected:
private:
diff --git a/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.cpp b/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.cpp
index 77f91b95c9410e739140b97fe58d25692a22f728..cf4dff230dfeb2cbab0b584709e2334347f160d2 100644
--- a/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.cpp
+++ b/src/cpu/VirtualFluidsCore/Interactors/D3Q27TriFaceMeshInteractor.cpp
@@ -35,7 +35,7 @@ D3Q27TriFaceMeshInteractor::D3Q27TriFaceMeshInteractor()
this->stressMode = STRESSNORMAL;
}
//////////////////////////////////////////////////////////////////////////
-D3Q27TriFaceMeshInteractor::D3Q27TriFaceMeshInteractor(SPtr<Grid3D> grid, std::string name)
+D3Q27TriFaceMeshInteractor::D3Q27TriFaceMeshInteractor(SPtr<Grid3D> /*grid*/, std::string /*name*/)
{
this->stressMode = STRESSNORMAL;
}
@@ -1744,7 +1744,7 @@ string D3Q27TriFaceMeshInteractor::toString()
return ss.str();
}
//////////////////////////////////////////////////////////////////////////
-void D3Q27TriFaceMeshInteractor::reinitWithStoredQs( const double& timeStep )
+void D3Q27TriFaceMeshInteractor::reinitWithStoredQs( const double& /*timeStep*/ )
{
//alle solid Bloecke wieder solid setzen
std::vector<SPtr<Block3D>>& solidBlocks = this->getSolidBlockSet();
@@ -1825,7 +1825,7 @@ void D3Q27TriFaceMeshInteractor::reinitWithStoredQs( const double& timeStep )
}
}
//////////////////////////////////////////////////////////////////////////
-void D3Q27TriFaceMeshInteractor::updateInteractor( const double& timestep/*=0*/ )
+void D3Q27TriFaceMeshInteractor::updateInteractor( const double& /*timestep*//*=0*/ )
{
UB_THROW( UbException("D3Q27TriFaceMeshInteractor::updateInteractor - toDo") );
}
diff --git a/src/cpu/VirtualFluidsCore/LBM/BGKLBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/BGKLBMKernel.cpp
index 5735fa5d4122128a0853decebf6e37ce816e8dd1..c6b130bdd52e3f88dadac3a3fe8be3d8c9973e98 100644
--- a/src/cpu/VirtualFluidsCore/LBM/BGKLBMKernel.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/BGKLBMKernel.cpp
@@ -39,7 +39,7 @@ SPtr<LBMKernel> BGKLBMKernel::clone()
return kernel;
}
//////////////////////////////////////////////////////////////////////////
-void BGKLBMKernel::calculate(int step)
+void BGKLBMKernel::calculate(int /*step*/)
{
using namespace D3Q27System;
using namespace UbMath;
diff --git a/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetInterpolationProcessor.cpp b/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetInterpolationProcessor.cpp
index aedd7b2706303a3ad91f50a209943135663646e9..013303f8aed2f72f981649a415fafe7ba1cad959 100644
--- a/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetInterpolationProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/CompressibleOffsetInterpolationProcessor.cpp
@@ -464,7 +464,7 @@ void CompressibleOffsetInterpolationProcessor::calcInterpolatedCoefficiets(const
yz_TNW = 0.0625*eps_new *(( bxyz + cxyz)/(72.*o));
}
//////////////////////////////////////////////////////////////////////////
-void CompressibleOffsetInterpolationProcessor::calcInterpolatedNodeCF(LBMReal* f, LBMReal omega, LBMReal x, LBMReal y, LBMReal z, LBMReal press, LBMReal xs, LBMReal ys, LBMReal zs)
+void CompressibleOffsetInterpolationProcessor::calcInterpolatedNodeCF(LBMReal* f, LBMReal /*omega*/, LBMReal /*x*/, LBMReal /*y*/, LBMReal /*z*/, LBMReal press, LBMReal xs, LBMReal ys, LBMReal zs)
{
using namespace D3Q27System;
diff --git a/src/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.cpp b/src/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.cpp
index 3d4409ee3de320dbd38d4cda7726fbb08d5bbf3e..4183c509bd095997c4603a7150c75ae76cdc3dd1 100644
--- a/src/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.cpp
@@ -536,7 +536,7 @@ void IncompressibleOffsetInterpolationProcessor::calcInterpolatedCoefficiets(con
yz_TNW = 0.0625*eps_new *(( bxyz + cxyz)/(72.*o));
}
//////////////////////////////////////////////////////////////////////////
-void IncompressibleOffsetInterpolationProcessor::calcInterpolatedNode(LBMReal* f, LBMReal omega, LBMReal x, LBMReal y, LBMReal z, LBMReal press, LBMReal xs, LBMReal ys, LBMReal zs)
+void IncompressibleOffsetInterpolationProcessor::calcInterpolatedNode(LBMReal* f, LBMReal /*omega*/, LBMReal /*x*/, LBMReal /*y*/, LBMReal /*z*/, LBMReal press, LBMReal xs, LBMReal ys, LBMReal zs)
{
using namespace D3Q27System;
diff --git a/src/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.h b/src/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.h
index e4017e5b9892dd693bb026e6ea0ab60b700c5eaa..079cae864f9bfec9f6168095f288280ea3f8e151 100644
--- a/src/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.h
+++ b/src/cpu/VirtualFluidsCore/LBM/IncompressibleOffsetInterpolationProcessor.h
@@ -10,7 +10,7 @@
//////////////////////////////////////////////////////////////////////////
class IncompressibleOffsetInterpolationProcessor;
-typedef SPtr<IncompressibleOffsetInterpolationProcessor> D3Q27IncompressibleOffsetInterpolationProcessorPtr;
+using D3Q27IncompressibleOffsetInterpolationProcessorPtr = SPtr<IncompressibleOffsetInterpolationProcessor>;
class IncompressibleOffsetInterpolationProcessor : public InterpolationProcessor
{
diff --git a/src/cpu/VirtualFluidsCore/LBM/InitDensityLBMKernel.cpp b/src/cpu/VirtualFluidsCore/LBM/InitDensityLBMKernel.cpp
index b866d9b1e48cae743650a0a335392f1d56043bb5..66667b9519241efe9988ade6003e96f5ee35d48f 100644
--- a/src/cpu/VirtualFluidsCore/LBM/InitDensityLBMKernel.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/InitDensityLBMKernel.cpp
@@ -854,7 +854,7 @@ double InitDensityLBMKernel::getCalculationTime()
-void InitDensityLBMKernel::calculate(int step)
+void InitDensityLBMKernel::calculate(int /*step*/)
{
using namespace D3Q27System;
diff --git a/src/cpu/VirtualFluidsCore/LBM/InterpolationHelper.cpp b/src/cpu/VirtualFluidsCore/LBM/InterpolationHelper.cpp
index 7a58d0dee4c76f627f57ea68acfdcddf92e35e5e..5cf4998490fa8e0120bb08b6c36b7d9daaa7fa6e 100644
--- a/src/cpu/VirtualFluidsCore/LBM/InterpolationHelper.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/InterpolationHelper.cpp
@@ -12,7 +12,7 @@ InterpolationHelper::~InterpolationHelper()
}
//////////////////////////////////////////////////////////////////////////
-void InterpolationHelper::interpolate8to1( D3Q27ICell& icellF, LBMReal* icellC, double x1, double x2, double x3, LBMReal omega )
+void InterpolationHelper::interpolate8to1( D3Q27ICell& icellF, LBMReal* icellC, double /*x1*/, double /*x2*/, double /*x3*/, LBMReal omega )
{
iProcessor->calcInterpolatedCoefficiets(icellF, omega, 1.0);
iProcessor->calcInterpolatedNodeFC(icellC, omega);
diff --git a/src/cpu/VirtualFluidsCore/LBM/InterpolationHelper.h b/src/cpu/VirtualFluidsCore/LBM/InterpolationHelper.h
index c6e95803f8938188892938f335f3896a647e3789..56cedd8f7ad5e7a666618731f43d5f76627d80e3 100644
--- a/src/cpu/VirtualFluidsCore/LBM/InterpolationHelper.h
+++ b/src/cpu/VirtualFluidsCore/LBM/InterpolationHelper.h
@@ -4,7 +4,7 @@
#include "InterpolationProcessor.h"
class InterpolationHelper;
-typedef SPtr<InterpolationHelper> InterpolationHelperPtr;
+using InterpolationHelperPtr = SPtr<InterpolationHelper>;
class InterpolationHelper
{
diff --git a/src/cpu/VirtualFluidsCore/LBM/InterpolationProcessor.h b/src/cpu/VirtualFluidsCore/LBM/InterpolationProcessor.h
index 06e2efd2df018beca946f4f48d8d7d19597750f6..fb9ade9aa43ea24384710ace3a0ded9fffbdda69 100644
--- a/src/cpu/VirtualFluidsCore/LBM/InterpolationProcessor.h
+++ b/src/cpu/VirtualFluidsCore/LBM/InterpolationProcessor.h
@@ -21,7 +21,7 @@ struct D3Q27ICell
};
class InterpolationProcessor;
-typedef SPtr<InterpolationProcessor> InterpolationProcessorPtr;
+using InterpolationProcessorPtr = SPtr<InterpolationProcessor>;
#include "InterpolationHelper.h"
diff --git a/src/cpu/VirtualFluidsCore/LBM/LBMKernelETD3Q27BGK.cpp b/src/cpu/VirtualFluidsCore/LBM/LBMKernelETD3Q27BGK.cpp
index 3560fd8336c36aae87c2bfa8acf92777089bf93c..0fbd8a95b84b0922af40ae818de2cfc7b74f5504 100644
--- a/src/cpu/VirtualFluidsCore/LBM/LBMKernelETD3Q27BGK.cpp
+++ b/src/cpu/VirtualFluidsCore/LBM/LBMKernelETD3Q27BGK.cpp
@@ -41,7 +41,7 @@ SPtr<LBMKernel> LBMKernelETD3Q27BGK::clone()
return kernel;
}
//////////////////////////////////////////////////////////////////////////
-void LBMKernelETD3Q27BGK::calculate(int step)
+void LBMKernelETD3Q27BGK::calculate(int /*step*/)
{
using namespace D3Q27System;
diff --git a/src/cpu/VirtualFluidsCore/LBM/LBMUnitConverter.h b/src/cpu/VirtualFluidsCore/LBM/LBMUnitConverter.h
index 7e1e31f145ff816fbd1ba201e61f5590f02b60c7..89514acd6b4e6ee2221fea85e805c5679192ce20 100644
--- a/src/cpu/VirtualFluidsCore/LBM/LBMUnitConverter.h
+++ b/src/cpu/VirtualFluidsCore/LBM/LBMUnitConverter.h
@@ -58,7 +58,7 @@ public:
}
- LBMUnitConverter(int dummy, double uReal, double uLB, double nuReal, double nuLB)
+ LBMUnitConverter(int /*dummy*/, double uReal, double uLB, double nuReal, double nuLB)
{
factorVelocityLbToW = uReal/uLB;
factorViscosityLbToW = nuReal/nuLB;
diff --git a/src/cpu/VirtualFluidsCore/Parallel/MPICommunicator.cpp b/src/cpu/VirtualFluidsCore/Parallel/MPICommunicator.cpp
index b8a81e7ee2613a355498b3d805efde4c7a50193b..0c785fc3da54cae00043ab2a830a9fc42860ce14 100644
--- a/src/cpu/VirtualFluidsCore/Parallel/MPICommunicator.cpp
+++ b/src/cpu/VirtualFluidsCore/Parallel/MPICommunicator.cpp
@@ -107,7 +107,7 @@ int MPICommunicator::getProcessID()
return PID;
}
//////////////////////////////////////////////////////////////////////////
-int MPICommunicator::getProcessID(int bundle, int rank)
+int MPICommunicator::getProcessID(int /*bundle*/, int /*rank*/)
{
return PID;
}
@@ -147,7 +147,7 @@ int MPICommunicator::getProcessRoot()
return 0;
}
//////////////////////////////////////////////////////////////////////////
-int MPICommunicator::getNumberOfProcessesInBundle(int bundle)
+int MPICommunicator::getNumberOfProcessesInBundle(int /*bundle*/)
{
return numprocs;
}
diff --git a/src/cpu/VirtualFluidsCore/Parallel/NullCommunicator.cpp b/src/cpu/VirtualFluidsCore/Parallel/NullCommunicator.cpp
index 384f39b3d42338174c73bd0bb182e28e17f32f50..520206d48817828f51d901035f8d1b0f81dc7a7c 100644
--- a/src/cpu/VirtualFluidsCore/Parallel/NullCommunicator.cpp
+++ b/src/cpu/VirtualFluidsCore/Parallel/NullCommunicator.cpp
@@ -80,12 +80,12 @@ int NullCommunicator::getProcessRoot()
return 0;
}
//////////////////////////////////////////////////////////////////////////
-std::vector<std::string> NullCommunicator::gather(const std::string& str)
+std::vector<std::string> NullCommunicator::gather(const std::string& /*str*/)
{
return std::vector<std::string>();
}
//////////////////////////////////////////////////////////////////////////
-std::vector<double> NullCommunicator::gatherDoubles(std::vector<double>& values)
+std::vector<double> NullCommunicator::gatherDoubles(std::vector<double>& /*values*/)
{
return std::vector<double>();
}
diff --git a/src/cpu/VirtualFluidsCore/Utilities/CheckpointConverter.cpp b/src/cpu/VirtualFluidsCore/Utilities/CheckpointConverter.cpp
index 9bf7278bcc6720541a13f082171524ed7125f581..2c1d31e0ea2e44726e1724d418e15d824f0dc916 100644
--- a/src/cpu/VirtualFluidsCore/Utilities/CheckpointConverter.cpp
+++ b/src/cpu/VirtualFluidsCore/Utilities/CheckpointConverter.cpp
@@ -403,7 +403,7 @@ void CheckpointConverter::convertDataSet(int step, int procCount)
}
-void CheckpointConverter::convert___Array(int step, int procCount, std::string filenameR, std::string filenameW)
+void CheckpointConverter::convert___Array(int /*step*/, int procCount, std::string filenameR, std::string filenameW)
{
double start, finish;
if (comm->isRoot()) start = MPI_Wtime();
diff --git a/src/cpu/VirtualFluidsCore/Visitors/CreateTransmittersHelper.h b/src/cpu/VirtualFluidsCore/Visitors/CreateTransmittersHelper.h
index 820807a2f09518c25647d7f72c2eca8241526d05..d339bdfb41e43ee3ae159b3141e4e2f67c1bcc1d 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/CreateTransmittersHelper.h
+++ b/src/cpu/VirtualFluidsCore/Visitors/CreateTransmittersHelper.h
@@ -21,8 +21,8 @@ public:
//! Switch between MPI and BOND Transmitters
enum TransmitterType {MPI, BOND, MPI2BOND};
public:
- typedef CbVector <LBMReal> DataType;
- typedef SPtr< TbTransmitter< DataType > > TransmitterPtr;
+ using DataType = CbVector<LBMReal>;
+ using TransmitterPtr = SPtr<TbTransmitter<DataType> >;
public:
CreateTransmittersHelper();
void createTransmitters(const SPtr<Block3D> sblock, const SPtr<Block3D> tblock, int dir, IBlock ib,
diff --git a/src/cpu/VirtualFluidsCore/Visitors/SetConnectorsBlockVisitor.cpp b/src/cpu/VirtualFluidsCore/Visitors/SetConnectorsBlockVisitor.cpp
index 52496aaf49cda98151480cea79024931caaf36e3..c6f1f9608a34ea25e9d3ebd524050a9ff60b4930 100644
--- a/src/cpu/VirtualFluidsCore/Visitors/SetConnectorsBlockVisitor.cpp
+++ b/src/cpu/VirtualFluidsCore/Visitors/SetConnectorsBlockVisitor.cpp
@@ -132,7 +132,7 @@ void SetConnectorsBlockVisitor::setSameLevelConnectors(SPtr<Grid3D> grid, SPtr<B
UBLOG(logDEBUG5, "D3Q27SetConnectorsBlockVisitor::setSameLevelConnectors() - end");
}
//////////////////////////////////////////////////////////////////////////
-void SetConnectorsBlockVisitor::setRemoteConnectors(SPtr<Block3D> sblock, SPtr<Block3D> tblock, int dir, bool fullConnector)
+void SetConnectorsBlockVisitor::setRemoteConnectors(SPtr<Block3D> sblock, SPtr<Block3D> tblock, int dir, bool /*fullConnector*/)
{
UBLOG(logDEBUG5, "D3Q27SetConnectorsBlockVisitor::setRemoteConnectors() - start");
CreateTransmittersHelper helper;