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

Implementing the mesh initializer.

parent 92425442

src/core/tnlIndexedSet.h

+10 −3
Original line number Diff line number Diff line
@@ -44,9 +44,11 @@ class tnlIndexedSet 
   template< typename ArrayType >

   void toArray( ArrayType& array ) const;



   const Element& getElement( IndexType idx ) const;

   const Element& getElement( KeyType key ) const;



   Element& getElement( IndexType idx );

   Element& getElement( KeyType key );



   void print( ostream& str ) const;



   protected:
@@ -69,6 +71,11 @@ class tnlIndexedSet 


};



template< typename Element,

          typename Index,

          typename Key >

ostream& operator <<( ostream& str, tnlIndexedSet< Element, Index, Key >& set );



#include <implementation/core/tnlIndexedSet_impl.h>



#endif /* TNLINDEXEDSET_H_ */

src/implementation/core/arrays/tnlStaticArray_impl.h

+2 −0
Original line number Diff line number Diff line
@@ -197,7 +197,9 @@ template< int Size, typename Element > 
ostream& operator << ( ostream& str, const tnlStaticArray< Size, Element >& a )

{

   for( int i = 0; i < Size - 1; i ++ )

   {

      str << a[ i ] << ", ";

   }

   str << a[ Size - 1 ];

   return str;

};

src/implementation/core/tnlIndexedSet_impl.h

+29 −5
Original line number Diff line number Diff line
@@ -75,17 +75,41 @@ void tnlIndexedSet< Element, Index, Key >::toArray( ArrayType &array ) const 
template< typename Element,

          typename Index,

          typename Key >

const Element& tnlIndexedSet< Element, Index, Key >::getElement( IndexType idx ) const

const Element& tnlIndexedSet< Element, Index, Key >::getElement( KeyType key ) const

{

   return map[ idx ];

   return map[ key ];

}



template< typename Element,

          typename Index,

          typename Key >

Element& tnlIndexedSet< Element, Index, Key >::getElement( IndexType idx )

Element& tnlIndexedSet< Element, Index, Key >::getElement( KeyType key )

{

   return map[ idx ];

   return map[ key ];

}



template< typename Element,

          typename Index,

          typename Key >

void tnlIndexedSet< Element, Index, Key >::print( ostream& str ) const

{

   STDMapIteratorType iter = map.begin();

   str << iter->second.data;

   iter++;

   while( iter != map.end() )

   {

      str << ", " << iter->second.data;

      iter++;

   }

}



template< typename Element,

          typename Index,

          typename Key >

ostream& operator<<( ostream& str, tnlIndexedSet< Element, Index, Key >& set )

{

   set.print( str );

   return str;

}



#endif /* TNLINDEXEDSET_IMPL_H_ */

src/implementation/solvers/ode/tnlMersonSolver_impl.h

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ bool tnlMersonSolver< Problem > :: solve( DofVectorType& u ) 
         return true;

       }

      if( iteration == this -> getMaxIterationsNumber() ||

          isnan( residue ) )

          std::isnan( residue ) )

         return false;

   }

};

src/mesh/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -16,6 +16,6 @@ SET( headers tnlGrid.h 
             tnlMeshWriterNetgen.h

             tnlMeshInitializer.h

             tnlMeshEntityInitializer.h

             tnlMeshSuperentityInitializer.h )

             tnlMeshSuperentityInitializerLayer.h )



INSTALL( FILES ${headers} DESTINATION include/tnl-${tnlVersion}/mesh )
 
 No newline at end of file