Commit b43f898b authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Merge branch 'master' into mhfem 

* master: (34 commits)
  Fixing compilation with nvcc.
  Fixing C++11 flag in CMakeLists.
  Refactoring tnlFunction.
  Refactoring system for function types.
  Debuging mesh.
  Renaming Ellpack network to indexed multimap.
  Implementing superentity indecis storage in storage network (=indexed multimap)
  Fixing missing superentities of vertices.
  Inserting the Ellpack network to the mesh.
  Renaming Ellpack graph to Ellpack network.
  Adding sparse Ellpack graph.
  Refactoring mesh entity.
  Refactoring the mesh.
  Refactoring the mesh.
  Refactoring the mesh.
  Refactoring the mesh.
  Refactoring the mesh.
  Refactoring the mesh.
  Refactoring the mesh.
  Fixing mesh config validator. Adding mesh simplex.
  ...
parents 54bf2923 e3eb673f

CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -144,11 +144,11 @@ if( WITH_CUDA STREQUAL "yes" ) 
        endif( NOT WITH_CUSPARSE STREQUAL "no" )

   

    else( CUDA_FOUND )

      AddCompilerFlag( "-std=gnu++0x" )         

      AddCompilerFlag( "-std=c++11" )         

    endif( CUDA_FOUND )

else( WITH_CUDA STREQUAL "yes" )

   #AddCompilerFlag( "-std=gnu++0x -ftree-vectorizer-verbose=1" )       

   AddCompilerFlag( "-std=gnu++0x" )       

   AddCompilerFlag( "-std=c++11" )       

endif( WITH_CUDA STREQUAL "yes" )    



####

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