Commit 51a2674f authored by Nils Kohl's avatar Nils Kohl 🌝
Browse files

Fixing warnings and trying to fix syntax error in msvc.

parent a9505c0f
Pipeline #38940 failed with stages
in 116 minutes and 7 seconds
......@@ -955,7 +955,7 @@ void DGDiffusionForm_Example::integrateFacetCoupling2D( const std::vector< Eigen
elMat( 2, 0 ) = a_2_0;
elMat( 2, 1 ) = a_2_1;
elMat( 2, 2 ) = a_2_2;
};
}
void DGDiffusionForm_Example::integrateFacetCoupling3D( const std::vector< Eigen::Matrix< real_t, 3, 1 > >& coordsElementInner,
const std::vector< Eigen::Matrix< real_t, 3, 1 > >& coordsElementOuter,
......
......@@ -257,10 +257,15 @@ class DGFunction final : public Function< DGFunction< ValueType > >
DoFType flag ) const;
/// @}
void copyFrom( const DGFunction< ValueType >& other, const uint_t& level ) const
void copyFrom( const DGFunction< ValueType >& other,
const uint_t& level,
const std::map< PrimitiveID::IDType, uint_t >& localPrimitiveIDsToRank,
const std::map< PrimitiveID::IDType, uint_t >& otherPrimitiveIDsToRank ) const
{
WALBERLA_UNUSED( other );
WALBERLA_UNUSED( level );
WALBERLA_UNUSED( localPrimitiveIDsToRank );
WALBERLA_UNUSED( otherPrimitiveIDsToRank );
WALBERLA_ABORT( "DGFunction::copyFrom() not implemented." );
}
......
......@@ -64,6 +64,7 @@ void VolumeDoFFunction< ValueType >::allocateMemory()
// Allocating ghost-layer memory only where necessary.
for ( const auto& [localFaceID, npid] : cell->getIndirectNeighborCellIDsOverFaces() )
{
WALBERLA_UNUSED( npid );
FunctionMemory< ValueType >* functionGLMemory = cell->template getData( cellGhostLayerDataIDs_[localFaceID] );
for ( uint_t level = minLevel_; level <= maxLevel_; level++ )
......@@ -111,6 +112,8 @@ void VolumeDoFFunction< ValueType >::allocateMemory()
// Allocating ghost-layer memory only where necessary.
for ( const auto& [localEdgeID, npid] : face->getIndirectNeighborFaceIDsOverEdges() )
{
WALBERLA_UNUSED( npid );
FunctionMemory< ValueType >* functionGLMemory = face->template getData( faceGhostLayerDataIDs_[localEdgeID] );
for ( uint_t level = minLevel_; level <= maxLevel_; level++ )
......
......@@ -111,7 +111,7 @@ class VolumeDoFFunction : public Function< VolumeDoFFunction< ValueType > >
{
WALBERLA_CHECK( storage_->cellExistsLocally( primitiveID ),
"Cannot read/write DoF since macro-cell does not exists (locally)." );
auto fmem = storage_->getCell( primitiveID )->template getData( cellInnerDataID_ );
FunctionMemory< ValueType >* fmem = storage_->getCell( primitiveID )->getData( cellInnerDataID_ );
WALBERLA_CHECK( fmem->hasLevel( level ), "Memory was not allocated for level " << level << "." );
auto data = fmem->getPointer( level );
return data;
......@@ -120,7 +120,7 @@ class VolumeDoFFunction : public Function< VolumeDoFFunction< ValueType > >
{
WALBERLA_CHECK( storage_->faceExistsLocally( primitiveID ),
"Cannot read/write DoF since macro-face does not exists (locally)." );
auto fmem = storage_->getFace( primitiveID )->template getData( faceInnerDataID_ );
FunctionMemory< ValueType >* fmem = storage_->getFace( primitiveID )->getData( faceInnerDataID_ );
WALBERLA_CHECK( fmem->hasLevel( level ), "Memory was not allocated for level " << level << "." );
auto data = fmem->getPointer( level );
return data;
......@@ -139,8 +139,7 @@ class VolumeDoFFunction : public Function< VolumeDoFFunction< ValueType > >
{
WALBERLA_CHECK( storage_->cellExistsLocally( primitiveID ),
"Cannot read/write DoF since macro-cell does not exists (locally)." );
FunctionMemory< ValueType >* fmem =
storage_->getCell( primitiveID )->template getData( cellGhostLayerDataIDs_.at( glId ) );
FunctionMemory< ValueType >* fmem = storage_->getCell( primitiveID )->getData( cellGhostLayerDataIDs_.at( glId ) );
WALBERLA_CHECK( fmem->hasLevel( level ), "Memory was not allocated for level " << level << "." );
ValueType* data = fmem->getPointer( level );
return data;
......@@ -149,8 +148,7 @@ class VolumeDoFFunction : public Function< VolumeDoFFunction< ValueType > >
{
WALBERLA_CHECK( storage_->faceExistsLocally( primitiveID ),
"Cannot read/write DoF since macro-face does not exists (locally)." );
FunctionMemory< ValueType >* fmem =
storage_->getFace( primitiveID )->template getData( faceGhostLayerDataIDs_.at( glId ) );
FunctionMemory< ValueType >* fmem = storage_->getFace( primitiveID )->getData( faceGhostLayerDataIDs_.at( glId ) );
WALBERLA_CHECK( fmem->hasLevel( level ), "Memory was not allocated for level " << level << "." );
ValueType* data = fmem->getPointer( level );
return data;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment