Commit a91981b8 authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

Merge branch 'mesh' 

Conflicts:
	src/mesh/layers/tnlMeshStorageLayer.h
	src/mesh/layers/tnlMeshSubentityStorageLayer.h
	src/mesh/layers/tnlMeshSuperentityStorageLayer.h
	src/mesh/tnlMesh.h
	tests/unit-tests/mesh/tnlMeshTester.h
parents 2eb674a3 83320af8

TODO

+7 −1
Original line number Diff line number Diff line 
TODO: Mesh

 * vsechny traits zkusit presunout do jednotneho MeshTraits, tj. temer MeshConfigTraits ale pojmenovat jako MeshTraits

 * omezit tnlDimesnionsTag - asi to ale nepujde

   - ale pozor na konstrukce jako BaseType::superentityIdsArray< SuperDimensionTag >( DimensionsTag ); ( v tnlMesh.h)

 * prejmenovat Tagy v topologies na Topology zrejme

 * zrusit tnlStorageTraits



TODO: v tnlMeshResolver se provadi preklad pro vsechny mozne sablonove parametry => prorezat



TODO: napsat FunctionDiscretizer pro jednotne rozhrani RightHandSide



TODO: doplnit mesh travelsals pro jine mesh entity nez cell

TODO: implementace maticovych resicu

      * Gaussova eliminace

      * SOR metoda

examples/heat-equation/tnl-heat-equation-eoc.h

+3 −3
Original line number Diff line number Diff line
@@ -28,10 +28,10 @@ 
#include <problems/tnlHeatEquationEocRhs.h>

#include <problems/tnlHeatEquationEocProblem.h>



//typedef tnlDefaultBuildConfigTag BuildConfig;

//typedef tnlDefaultBuildMeshConfig BuildConfig;

typedef tnlFastBuildConfig BuildConfig;



template< typename ConfigTag >

template< typename MeshConfig >

class heatEquationEocConfig

{

   public:
@@ -47,7 +47,7 @@ template< typename Real, 
          typename Device,

          typename Index,

          typename MeshType,

          typename ConfigTag,

          typename MeshConfig,

          typename SolverStarter >

class heatEquationSetter

{

examples/heat-equation/tnl-heat-equation.h

+3 −3
Original line number Diff line number Diff line
@@ -29,10 +29,10 @@ 
#include <functors/tnlConstantFunction.h>

#include <problems/tnlHeatEquationProblem.h>



//typedef tnlDefaultBuildConfigTag BuildConfig;

//typedef tnlDefaultBuildMeshConfig BuildConfig;

typedef tnlFastBuildConfig BuildConfig;



template< typename ConfigTag >

template< typename MeshConfig >

class heatEquationConfig

{

   public:
@@ -54,7 +54,7 @@ template< typename Real, 
          typename Device,

          typename Index,

          typename MeshType,

          typename ConfigTag,

          typename MeshConfig,

          typename SolverStarter >

class heatEquationSetter

{

src/core/CMakeLists.txt

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ ADD_SUBDIRECTORY( arrays ) 
ADD_SUBDIRECTORY( containers )

ADD_SUBDIRECTORY( cuda )

ADD_SUBDIRECTORY( vectors )

ADD_SUBDIRECTORY( multimaps )



set (headers tnlAssert.h               

             tnlConstants.h

src/core/arrays/tnlSharedArray_impl.h

+3 −2
Original line number Diff line number Diff line
@@ -120,8 +120,9 @@ void tnlSharedArray< Element, Device, Index > :: bind( Array& array, 
                                                       IndexType index,

                                                       IndexType size )

{

   tnlStaticAssert( Array::DeviceType::DeviceType == DeviceType::DeviceType,

                    "Attempt to bind arrays between different devices." );

   //tnlStaticAssert( Array::DeviceType::DeviceType == DeviceType::DeviceType,

   //                 "Attempt to bind arrays between different devices." );

   // TODO: fix this - it does nto work with tnlStaticArray

   this->data = &( array. getData()[ index ] );

   if( ! size )

      this->size = array. getSize();