Commit 564bc9ea authored by Dominik Thoennes's avatar Dominik Thoennes
Browse files

Merge branch 'intel-20-fix' into 'master'

Intel 20 fix

See merge request !506
parents bacf4afb 84f55a6a
Pipeline #39459 failed with stages
in 107 minutes and 29 seconds
......@@ -20,6 +20,8 @@
#include "hyteg/dgfunctionspace/DGFunction.hpp"
#include <utility>
#include "core/DataTypes.h"
#include "core/mpi/MPIWrapper.h"
#include "core/mpi/Reduce.h"
......@@ -47,13 +49,13 @@ DGFunction< ValueType >::DGFunction( const std::string&
, minLevel_( minLevel )
, maxLevel_( maxLevel )
, basis_( basis )
, boundaryCondition_( boundaryCondition )
, boundaryCondition_( std::move( boundaryCondition ) )
{
uint_t dim;
if ( storage->hasGlobalCells() )
{
dim = 3;
for ( auto pid : storage->getCellIDs() )
for ( const auto& pid : storage->getCellIDs() )
{
polyDegreesPerPrimitive_[pid] = initialPolyDegree;
}
......@@ -61,7 +63,7 @@ DGFunction< ValueType >::DGFunction( const std::string&
else
{
dim = 2;
for ( auto pid : storage->getFaceIDs() )
for ( const auto& pid : storage->getFaceIDs() )
{
polyDegreesPerPrimitive_[pid] = initialPolyDegree;
}
......@@ -189,17 +191,17 @@ void DGFunction< ValueType >::evaluateOnMicroElement( const Point3D& coo
{
// 2D
WALBERLA_ASSERT( !storage_->hasGlobalCells() );
WALBERLA_ASSERT( !storage_->hasGlobalCells() )
Point2D coordinates2D( { coordinates[0], coordinates[1] } );
WALBERLA_ASSERT( storage_->faceExistsLocally( faceID ) );
WALBERLA_ASSERT( storage_->faceExistsLocally( faceID ) )
const Face& face = *storage_->getFace( faceID );
const auto polyDegree = polyDegreesPerPrimitive_.at( faceID );
const auto ndofs = uint_c( basis_->numDoFsPerElement( 2, polyDegree ) );
Eigen::Matrix< real_t, 2, 1 > affineCoordinates( { coordinates[0], coordinates[1] } );
Eigen::Matrix< real_t, 2, 1 > affineCoordinates( coordinates[0], coordinates[1] );
std::array< Eigen::Matrix< real_t, 2, 1 >, 3 > affineElementVertices;
auto vertexIndices = facedof::macroface::getMicroVerticesFromMicroFace( elementIndex, faceType );
......@@ -244,15 +246,15 @@ void DGFunction< ValueType >::evaluateOnMicroElement( const Point3D& coo
{
// 2D
WALBERLA_ASSERT( storage_->hasGlobalCells() );
WALBERLA_ASSERT( storage_->hasGlobalCells() )
WALBERLA_ASSERT( storage_->cellExistsLocally( cellID ) );
WALBERLA_ASSERT( storage_->cellExistsLocally( cellID ) )
const Cell& cell = *storage_->getCell( cellID );
const auto polyDegree = polyDegreesPerPrimitive_.at( cellID );
const auto ndofs = uint_c( basis_->numDoFsPerElement( 3, polyDegree ) );
Eigen::Matrix< real_t, 3, 1 > affineCoordinates( { coordinates[0], coordinates[1], coordinates[2] } );
Eigen::Matrix< real_t, 3, 1 > affineCoordinates( coordinates[0], coordinates[1], coordinates[2] );
std::array< Eigen::Matrix< real_t, 3, 1 >, 4 > affineElementVertices;
auto vertexIndices = celldof::macrocell::getMicroVerticesFromMicroCell( elementIndex, cellType );
......
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