diff --git a/src/basics/basics/container/CbVector.h b/src/basics/basics/container/CbVector.h index 49d39c30ccf26039129aea42811adf9313d0bedd..76df61df21bcfb0cc2cea68cb15314a0b4427ca4 100644 --- a/src/basics/basics/container/CbVector.h +++ b/src/basics/basics/container/CbVector.h @@ -81,8 +81,8 @@ public: /*==========================================================*/ CbVector( const size_type size, CbVectorAllocator<value_type>* const& allocator = new CbVectorAllocatorStd<value_type>, const value_type& value=value_type() ) : ptrData(NULL) - , dataSize(0) - , allocator(allocator) + , + allocator(allocator) { this->allocator->alloc(*this,size,value); } diff --git a/src/cpu/VirtualFluidsCore/Grid/Block3D.cpp b/src/cpu/VirtualFluidsCore/Grid/Block3D.cpp index 1f24b8ebc1de34162b9770785ee60c97c51ab266..d7eddebcfff804688368d5d178dce94c7176d97b 100644 --- a/src/cpu/VirtualFluidsCore/Grid/Block3D.cpp +++ b/src/cpu/VirtualFluidsCore/Grid/Block3D.cpp @@ -45,16 +45,10 @@ Block3D::Block3D() } ////////////////////////////////////////////////////////////////////////// Block3D::Block3D(int x1, int x2, int x3, int level) - : x1(x1), x2(x2), x3(x3) - ,active(true) - ,globalID(-1) - ,rank(0),part(0) - ,interpolationFlagCF(0) - ,interpolationFlagFC(0) - ,level(level) - ,bundle(0) - ,lrank(-1) - ,localID(-1) + : x1(x1), x2(x2), x3(x3), + rank(0),part(0), + level(level), bundle(0) + { globalID = counter++; } diff --git a/src/cpu/VirtualFluidsCore/Grid/Grid3D.cpp b/src/cpu/VirtualFluidsCore/Grid/Grid3D.cpp index 128c9d393a4f7573461ac124b1d3fe54a9e294e8..e0fdf7f5e154ce843a183edf33284b5acfc13a6c 100644 --- a/src/cpu/VirtualFluidsCore/Grid/Grid3D.cpp +++ b/src/cpu/VirtualFluidsCore/Grid/Grid3D.cpp @@ -55,33 +55,15 @@ Grid3D::Grid3D() levelSet.resize(Grid3DSystem::MAXLEVEL+1); } ////////////////////////////////////////////////////////////////////////// -Grid3D::Grid3D(SPtr<Communicator> comm) : - rank(0), - bundle(0), - orgDeltaX(1.0), - periodicX1(false), - periodicX2(false), - periodicX3(false), - timeStep(0.0), - blockNx1(0), - blockNx2(0), - blockNx3(0), - nx1(0), - nx2(0), - nx3(0) +Grid3D::Grid3D(SPtr<Communicator> comm) + { levelSet.resize(Grid3DSystem::MAXLEVEL+1); rank = comm->getProcessID(); } ////////////////////////////////////////////////////////////////////////// Grid3D::Grid3D(SPtr<Communicator> comm, int blockNx1, int blockNx2, int blockNx3, int gridNx1, int gridNx2, int gridNx3) : - rank(0), - bundle(0), - orgDeltaX(1.0), - periodicX1(false), - periodicX2(false), - periodicX3(false), - timeStep(0.0), + blockNx1(blockNx1), blockNx2(blockNx2), blockNx3(blockNx2),