Commit 6047d9bc authored by Vít Hanousek's avatar Vít Hanousek
Browse files

Merge branch 'develop' into mpi-explosive

parents dac69968 4bdcbb0d

src/TNL/Functions/FunctionAdapter.h

+4 −0
Original line number Diff line number Diff line
@@ -10,6 +10,10 @@ 


#pragma once



#include <TNL/Devices/CudaCallable.h>

#include <TNL/Config/ParameterContainer.h>

#include <TNL/Functions/Domain.h>



namespace TNL {

namespace Functions {

src/TNL/Meshes/Readers/VTKReader_libvtk.h

+11 −12
Original line number Diff line number Diff line
@@ -82,17 +82,16 @@ public: 
      TNL_ASSERT_EQ( this->verticesInEntities.at( this->meshDimension ), subvertices, "numbers of cell subvertices do not match" );



      using MeshBuilder = MeshBuilder< MeshType >;

      using VertexIndexType = typename MeshType::MeshTraitsType::template EntityTraits< 0 >::GlobalIndexType;

      using CellIndexType = typename MeshType::MeshTraitsType::template EntityTraits< MeshType::Config::meshDimension >::GlobalIndexType;

      using GlobalIndexType = typename MeshType::GlobalIndexType;



      const VertexIndexType numberOfPoints = this->pointsData.size();

      const CellIndexType numberOfCells = this->entityIdMappings.at( this->meshDimension ).size();

      const GlobalIndexType numberOfPoints = this->pointsData.size();

      const GlobalIndexType numberOfCells = this->entityIdMappings.at( this->meshDimension ).size();



      MeshBuilder meshBuilder;

      meshBuilder.setPointsCount( numberOfPoints );

      meshBuilder.setCellsCount( numberOfCells );



      for( VertexIndexType i = 0; i < numberOfPoints; i++ ) {

      for( GlobalIndexType i = 0; i < numberOfPoints; i++ ) {

         typename MeshType::PointType p;

         for( int j = 0; j < p.size; j++ )

            p[ j ] = this->pointsData.at( i )[ j ];
@@ -100,7 +99,7 @@ public: 
      }



      const auto& cellIdMap = this->entityIdMappings.at( this->meshDimension );

      for( CellIndexType i = 0; i < numberOfCells; i++ ) {

      for( GlobalIndexType i = 0; i < numberOfCells; i++ ) {

         const VTKIndexType vtkCellIndex = cellIdMap.at( i );

         const auto& vtkCellSeeds = this->entitySeeds.at( vtkCellIndex );

         using CellSeedType = typename MeshBuilder::CellSeedType;