put gitter_mgb.cc into the library

dune/alugrid/src/serial/gitter_mgb.h

@@ -5,22 +5,31 @@
 #ifndef GITTER_MGB_H_INCLUDED
 #define GITTER_MGB_H_INCLUDED
 
+#include <list>
+#include <map>
+#include <utility>
+
 #include "key.h"
 #include "gitter_sti.h"
 #include "ghost_info.h"
 
-template < class RandomAccessIterator > inline int cyclicReorder (RandomAccessIterator begin, RandomAccessIterator end) {
-  RandomAccessIterator middle = min_element (begin,end) ;
-  int pos = middle == begin ? 0 : (rotate (begin,middle,end), (end - middle)) ;
-  if (*(begin + 1) < *(end - 1)) return pos ;
-  else {
-    reverse (begin,end) ;
-    rotate (begin,end - 1,end) ;
-    return - pos - 1 ;
+template< class RandomAccessIterator > inline int cyclicReorder (RandomAccessIterator begin, RandomAccessIterator end)
+{
+  RandomAccessIterator middle = std::min_element( begin,end );
+  int pos = (middle == begin ? 0 : (std::rotate( begin, middle, end ), end - middle));
+  if( *(begin + 1) < *(end - 1) )
+    return pos;
+  else
+  {
+    std::reverse( begin, end );
+    std::rotate( begin, end - 1, end );
+    return -pos - 1;
   }
 }
 
-class MacroGridBuilder : protected Gitter :: Geometric {
+class MacroGridBuilder
+: protected Gitter::Geometric
+{
   
   protected:  
   // stores a hface3 and the other point needed to build a tetra  
@@ -108,23 +117,23 @@ class MacroGridBuilder : protected Gitter :: Geometric {
   };
 
   protected :
-    enum ElementRawID {TETRA_RAW=4, HEXA_RAW=8, PERIODIC3_RAW=33, PERIODIC4_RAW=44} ; 
+    enum ElementRawID {TETRA_RAW=4, HEXA_RAW=8, PERIODIC3_RAW=33, PERIODIC4_RAW=44}; 
   protected :
-    typedef long    vertexKey_t ;
-    typedef pair < int, int >   edgeKey_t ;
-    typedef Key3 < int >  faceKey_t ;
-    typedef Key4 < int >  elementKey_t ;
-
-    typedef map < vertexKey_t , VertexGeo *, less < vertexKey_t > >     vertexMap_t ;
-    typedef map < edgeKey_t,    hedge1_GEO *, less < edgeKey_t > >      edgeMap_t ;
-    typedef map < faceKey_t,    void *, less < faceKey_t > >            faceMap_t ;
-    typedef map < elementKey_t, void *, less < elementKey_t > >         elementMap_t ;
+    typedef long    vertexKey_t;
+    typedef std::pair< int, int >   edgeKey_t;
+    typedef Key3 < int >  faceKey_t;
+    typedef Key4 < int >  elementKey_t;
+
+    typedef std::map< vertexKey_t, VertexGeo * > vertexMap_t;
+    typedef std::map< edgeKey_t, hedge1_GEO * > edgeMap_t;
+    typedef std::map< faceKey_t, void * > faceMap_t;
+    typedef std::map< elementKey_t, void * > elementMap_t;
   
-    typedef map < faceKey_t, Hbnd3IntStorage* , less < faceKey_t > > hbnd3intMap_t ;
-    typedef map < faceKey_t, Hbnd4IntStorage* , less < faceKey_t > > hbnd4intMap_t ;
+    typedef std::map< faceKey_t, Hbnd3IntStorage* > hbnd3intMap_t;
+    typedef std::map< faceKey_t, Hbnd4IntStorage* > hbnd4intMap_t;
     
-    vertexMap_t  _vertexMap ;
-    edgeMap_t    _edgeMap ;
+    vertexMap_t  _vertexMap;
+    edgeMap_t    _edgeMap;
     
     faceMap_t    _face4Map, _face3Map, _hbnd3Map, _hbnd4Map;
     
@@ -132,77 +141,77 @@ class MacroGridBuilder : protected Gitter :: Geometric {
     hbnd3intMap_t _hbnd3Int;
     hbnd4intMap_t _hbnd4Int; 
     
-    elementMap_t _hexaMap, _tetraMap, _periodic3Map, _periodic4Map ;
+    elementMap_t _hexaMap, _tetraMap, _periodic3Map, _periodic4Map;
 
-    inline BuilderIF & myBuilder () ;
-    inline const BuilderIF & myBuilder () const ;
-    void removeElement (const elementKey_t &, const bool ) ;
+    inline BuilderIF & myBuilder ();
+    inline const BuilderIF & myBuilder () const;
+    void removeElement (const elementKey_t &, const bool );
   public :
-    virtual pair < VertexGeo *, bool >     InsertUniqueVertex (double, double, double, int) ;
-    virtual pair < hedge1_GEO *, bool >    InsertUniqueHedge (int,int) ;
-    virtual pair < hedge1_GEO *, bool >    InsertUniqueHedge1 (int a, int b) { return InsertUniqueHedge( a, b); }
-    virtual pair < hface3_GEO *, bool >    InsertUniqueHface3 (int (&v)[3]) { return InsertUniqueHface( v ); }
-    virtual pair < hface4_GEO *, bool >    InsertUniqueHface4 (int (&v)[4]) { return InsertUniqueHface( v ); }
-    virtual pair < hface3_GEO *, bool >    InsertUniqueHface (int (&)[3]) ;
-    virtual pair < hface4_GEO *, bool >    InsertUniqueHface (int (&)[4]) ;
-
-    virtual pair < tetra_GEO *, bool >     InsertUniqueTetra (int (&v)[4] ) { return InsertUniqueTetra( v, 0 ); } 
-    virtual pair < tetra_GEO *, bool >     InsertUniqueTetra (int (&)[4], int) ;
-    virtual pair < hexa_GEO *, bool >      InsertUniqueHexa (int (&)[8]) ;
-
-    virtual pair < periodic3_GEO *, bool > InsertUniquePeriodic (int (&)[6], const Gitter :: hbndseg :: bnd_t (&)[2]) ;
-    virtual pair < periodic4_GEO *, bool > InsertUniquePeriodic (int (&)[8], const Gitter :: hbndseg :: bnd_t (&)[2]) ;
-    virtual pair < periodic3_GEO *, bool > 
-    InsertUniquePeriodic3 (int (&v)[6], const Gitter :: hbndseg :: bnd_t (&bnd)[2]) { return InsertUniquePeriodic( v, bnd ); }
-    virtual pair < periodic4_GEO *, bool > 
-    InsertUniquePeriodic4 (int (&v)[8], const Gitter :: hbndseg :: bnd_t (&bnd)[2]) { return InsertUniquePeriodic( v, bnd ); }
+    virtual std::pair< VertexGeo *, bool >     InsertUniqueVertex (double, double, double, int);
+    virtual std::pair< hedge1_GEO *, bool >    InsertUniqueHedge (int,int);
+    virtual std::pair< hedge1_GEO *, bool >    InsertUniqueHedge1 (int a, int b) { return InsertUniqueHedge( a, b); }
+    virtual std::pair< hface3_GEO *, bool >    InsertUniqueHface3 (int (&v)[3]) { return InsertUniqueHface( v ); }
+    virtual std::pair< hface4_GEO *, bool >    InsertUniqueHface4 (int (&v)[4]) { return InsertUniqueHface( v ); }
+    virtual std::pair< hface3_GEO *, bool >    InsertUniqueHface (int (&)[3]);
+    virtual std::pair< hface4_GEO *, bool >    InsertUniqueHface (int (&)[4]);
+
+    virtual std::pair< tetra_GEO *, bool >     InsertUniqueTetra (int (&v)[4] ) { return InsertUniqueTetra( v, 0 ); } 
+    virtual std::pair< tetra_GEO *, bool >     InsertUniqueTetra (int (&)[4], int);
+    virtual std::pair< hexa_GEO *, bool >      InsertUniqueHexa (int (&)[8]);
+
+    virtual std::pair< periodic3_GEO *, bool > InsertUniquePeriodic (int (&)[6], const Gitter::hbndseg::bnd_t (&)[2]);
+    virtual std::pair< periodic4_GEO *, bool > InsertUniquePeriodic (int (&)[8], const Gitter::hbndseg::bnd_t (&)[2]);
+    virtual std::pair< periodic3_GEO *, bool > 
+    InsertUniquePeriodic3 (int (&v)[6], const Gitter::hbndseg::bnd_t (&bnd)[2]) { return InsertUniquePeriodic( v, bnd ); }
+    virtual std::pair< periodic4_GEO *, bool > 
+    InsertUniquePeriodic4 (int (&v)[8], const Gitter::hbndseg::bnd_t (&bnd)[2]) { return InsertUniquePeriodic( v, bnd ); }
     
     // old version setting default boundary ids 
-    pair < periodic3_GEO *, bool > InsertUniquePeriodic3 (int (&v)[6] ) 
+    std::pair< periodic3_GEO *, bool > InsertUniquePeriodic3 (int (&v)[6] ) 
     {
-      Gitter :: hbndseg :: bnd_t bnd[ 2 ] = 
-        { Gitter :: hbndseg :: periodic, Gitter :: hbndseg :: periodic };
+      Gitter::hbndseg::bnd_t bnd[ 2 ] = 
+        { Gitter::hbndseg::periodic, Gitter::hbndseg::periodic };
       return InsertUniquePeriodic( v, bnd );
     }
 
     // old version setting default boundary ids 
-    pair < periodic4_GEO *, bool > InsertUniquePeriodic4 (int (&v)[8] )
+    std::pair< periodic4_GEO *, bool > InsertUniquePeriodic4 (int (&v)[8] )
     {
-      Gitter :: hbndseg :: bnd_t bnd[ 2 ] = 
-        { Gitter :: hbndseg :: periodic, Gitter :: hbndseg :: periodic };
+      Gitter::hbndseg::bnd_t bnd[ 2 ] = 
+        { Gitter::hbndseg::periodic, Gitter::hbndseg::periodic };
       return InsertUniquePeriodic( v, bnd );
     }
     
-    virtual bool InsertUniqueHbnd3 (int (&)[3], Gitter :: hbndseg :: bnd_t, int) ;
-    virtual bool InsertUniqueHbnd4 (int (&)[4], Gitter :: hbndseg :: bnd_t, int) ;
+    virtual bool InsertUniqueHbnd3 (int (&)[3], Gitter::hbndseg::bnd_t, int);
+    virtual bool InsertUniqueHbnd4 (int (&)[4], Gitter::hbndseg::bnd_t, int);
 
-    virtual bool InsertUniqueHbnd3 (int (&v)[3], Gitter :: hbndseg :: bnd_t bt )
+    virtual bool InsertUniqueHbnd3 (int (&v)[3], Gitter::hbndseg::bnd_t bt )
     {
       // ldbVertexIndex = -1
       return InsertUniqueHbnd3( v, bt, int(-1) );
     }
-    virtual bool InsertUniqueHbnd4 (int (&v)[4], Gitter :: hbndseg :: bnd_t bt) 
+    virtual bool InsertUniqueHbnd4 (int (&v)[4], Gitter::hbndseg::bnd_t bt) 
     {
       // ldbVertexIndex = -1
       return InsertUniqueHbnd4( v, bt, int(-1) );
     }
 
   public :
-    static bool debugOption (int) ;
+    static bool debugOption (int);
 
-    static void generateRawHexaImage (istream &, ostream &) ;
-    static void generateRawHexaImage (ObjectStream&, ostream &) ;
+    static void generateRawHexaImage ( std::istream &, std::ostream & );
+    static void generateRawHexaImage ( ObjectStream&, std::ostream & );
 
-    static void generateRawTetraImage (istream &, ostream &) ;
-    static void generateRawTetraImage (ObjectStream&, ostream &) ;
+    static void generateRawTetraImage ( std::istream &, std::ostream & );
+    static void generateRawTetraImage ( ObjectStream &, std::ostream & );
 
-    static void cubeHexaGrid (int, ostream &) ;
-    MacroGridBuilder (BuilderIF &, const bool init = true) ;
+    static void cubeHexaGrid ( int, std::ostream & );
+    MacroGridBuilder (BuilderIF &, const bool init = true);
     // deprecated 
-    MacroGridBuilder (BuilderIF &, ProjectVertex* ) ;
-    virtual ~MacroGridBuilder () ;
-    void inflateMacroGrid (istream &) ;
-    void backupMacroGrid (ostream &) ;
+    MacroGridBuilder (BuilderIF &, ProjectVertex* );
+    virtual ~MacroGridBuilder ();
+    void inflateMacroGrid ( std::istream & );
+    void backupMacroGrid ( std::ostream & );
 
     // former constructor 
     void initialize ();
@@ -213,23 +222,22 @@ class MacroGridBuilder : protected Gitter :: Geometric {
     bool _finalized;
 
     // generate raw image of macro grid 
-    template <class istream_t> 
-    static void generateRawImage (istream_t &, ostream &, 
-                                  const ElementRawID, const ElementRawID ) ;
+    template<class istream_t> 
+    static void generateRawImage ( istream_t &, std::ostream &, const ElementRawID, const ElementRawID );
 
     // insert all tetra from elemMap into tetraList 
-    void tetraMapToList( elementMap_t& elemMap, list< tetra_GEO* >& elemList, const bool setIndex  );
+    void tetraMapToList( elementMap_t& elemMap, std::list< tetra_GEO* >& elemList, const bool setIndex  );
     // insert all hexa from elemMap into hexaList 
-    void hexaMapToList( elementMap_t& elemMap, list< hexa_GEO* >& elemList, const bool setIndex  );
+    void hexaMapToList( elementMap_t& elemMap, std::list< hexa_GEO* >& elemList, const bool setIndex  );
 
   private :
     // insert all element from elemMap into elemList 
-    template <class elem_GEO>
-    void elementMapToList( elementMap_t& elemMap, list< elem_GEO* >& elemList, const bool setIndex  );
+    template<class elem_GEO>
+    void elementMapToList( elementMap_t& elemMap, std::list< elem_GEO* >& elemList, const bool setIndex  );
 
   private:  
-    BuilderIF & _mgb ;
-} ;
+    BuilderIF & _mgb;
+};
 
 
 //
@@ -240,20 +248,20 @@ class MacroGridBuilder : protected Gitter :: Geometric {
 //    #    #   ##  #          #    #   ##  #
 //    #    #    #  ######     #    #    #  ######
 //
-inline Gitter :: Geometric :: BuilderIF & MacroGridBuilder :: myBuilder () {
-  return _mgb ;
+inline Gitter::Geometric::BuilderIF & MacroGridBuilder::myBuilder () {
+  return _mgb;
 }
 
-inline const Gitter :: Geometric :: BuilderIF & MacroGridBuilder :: myBuilder () const {
-  return _mgb ;
+inline const Gitter::Geometric::BuilderIF & MacroGridBuilder::myBuilder () const {
+  return _mgb;
 }
 
-inline bool MacroGridBuilder :: debugOption (int level) {
-  return (getenv ("VERBOSE_MGB") ? ( atoi (getenv ("VERBOSE_MGB")) > level ? true : (level == 0)) : false) ;
+inline bool MacroGridBuilder::debugOption (int level) {
+  return (getenv ("VERBOSE_MGB") ? ( atoi (getenv ("VERBOSE_MGB")) > level ? true : (level == 0)) : false);
 }
 
 //- Hbnd3IntStorage 
-inline MacroGridBuilder :: Hbnd3IntStorage :: 
+inline MacroGridBuilder::Hbnd3IntStorage::
 Hbnd3IntStorage( hface3_GEO * f, int tw, int ldbVertexIndex, const tetra_GEO * tetra, int fce)
  : _ptr(new MacroGhostInfoTetra(tetra,fce))
  , _first(f) , _second(tw), _ldbVertexIndex( ldbVertexIndex )
@@ -261,7 +269,7 @@ Hbnd3IntStorage( hface3_GEO * f, int tw, int ldbVertexIndex, const tetra_GEO * t
   assert( _ldbVertexIndex >= 0 );
 }
     
-inline MacroGridBuilder :: Hbnd3IntStorage :: 
+inline MacroGridBuilder::Hbnd3IntStorage::
 Hbnd3IntStorage( hface3_GEO * f, int tw, int ldbVertexIndex, MacroGhostInfoTetra *p)
  : _ptr(p) , _first(f) , _second(tw), _ldbVertexIndex( ldbVertexIndex )
 {
@@ -269,7 +277,7 @@ Hbnd3IntStorage( hface3_GEO * f, int tw, int ldbVertexIndex, MacroGhostInfoTetra
   assert( _ptr );
 }
     
-inline MacroGridBuilder :: Hbnd3IntStorage :: 
+inline MacroGridBuilder::Hbnd3IntStorage::
 Hbnd3IntStorage( hface3_GEO * f, int tw, int ldbVertexIndex )
  : _ptr(0), _first(f) , _second(tw), _ldbVertexIndex( ldbVertexIndex )
 {
@@ -278,7 +286,7 @@ Hbnd3IntStorage( hface3_GEO * f, int tw, int ldbVertexIndex )
   // assert( _ldbVertexIndex >= 0 );
 }
 
-inline MacroGridBuilder :: Hbnd3IntStorage :: ~Hbnd3IntStorage () 
+inline MacroGridBuilder::Hbnd3IntStorage::~Hbnd3IntStorage () 
 {
   if( _ptr ) 
   {
@@ -287,12 +295,12 @@ inline MacroGridBuilder :: Hbnd3IntStorage :: ~Hbnd3IntStorage ()
   }
 }
 
-inline MacroGhostInfoTetra* MacroGridBuilder :: Hbnd3IntStorage :: ghInfo ()
+inline MacroGhostInfoTetra* MacroGridBuilder::Hbnd3IntStorage::ghInfo ()
 { 
   return _ptr;
 }
 
-inline MacroGhostInfoTetra* MacroGridBuilder :: Hbnd3IntStorage :: release ()
+inline MacroGhostInfoTetra* MacroGridBuilder::Hbnd3IntStorage::release ()
 { 
   MacroGhostInfoTetra* p = _ptr;
   _ptr = 0;
@@ -300,7 +308,7 @@ inline MacroGhostInfoTetra* MacroGridBuilder :: Hbnd3IntStorage :: release ()
 }
 
 //- Hbnd4IntStorage 
-inline MacroGridBuilder :: Hbnd4IntStorage :: 
+inline MacroGridBuilder::Hbnd4IntStorage::
 Hbnd4IntStorage( hface4_GEO * f, int tw, int ldbVertexIndex, const hexa_GEO * hexa, int fce)
  : _ptr( new MacroGhostInfoHexa(hexa,fce) ), _first(f) , _second(tw), _ldbVertexIndex( ldbVertexIndex )  
 {
@@ -308,7 +316,7 @@ Hbnd4IntStorage( hface4_GEO * f, int tw, int ldbVertexIndex, const hexa_GEO * he
 }
     
 // hface4 storage
-inline MacroGridBuilder :: Hbnd4IntStorage :: 
+inline MacroGridBuilder::Hbnd4IntStorage::
 Hbnd4IntStorage( hface4_GEO * f, int tw, int ldbVertexIndex, MacroGhostInfoHexa* p)
  : _ptr(p) , _first(f) , _second(tw), _ldbVertexIndex( ldbVertexIndex )
 { 
@@ -316,7 +324,7 @@ Hbnd4IntStorage( hface4_GEO * f, int tw, int ldbVertexIndex, MacroGhostInfoHexa*
   assert( _ptr ); 
 }
     
-inline MacroGridBuilder :: Hbnd4IntStorage :: 
+inline MacroGridBuilder::Hbnd4IntStorage::
 Hbnd4IntStorage( hface4_GEO * f, int tw, int ldbVertexIndex )
  : _ptr(0) , _first(f) , _second(tw), _ldbVertexIndex( ldbVertexIndex )
 {
@@ -325,7 +333,7 @@ Hbnd4IntStorage( hface4_GEO * f, int tw, int ldbVertexIndex )
   // assert( _ldbVertexIndex >= 0 );
 }
 
-inline MacroGridBuilder :: Hbnd4IntStorage :: ~Hbnd4IntStorage () 
+inline MacroGridBuilder::Hbnd4IntStorage::~Hbnd4IntStorage () 
 {
   if( _ptr ) 
   {
@@ -334,12 +342,12 @@ inline MacroGridBuilder :: Hbnd4IntStorage :: ~Hbnd4IntStorage ()
   }
 }
 
-inline MacroGhostInfoHexa* MacroGridBuilder :: Hbnd4IntStorage :: ghInfo() 
+inline MacroGhostInfoHexa* MacroGridBuilder::Hbnd4IntStorage::ghInfo() 
 { 
-  return _ptr ;
+  return _ptr;
 }
 
-inline MacroGhostInfoHexa* MacroGridBuilder :: Hbnd4IntStorage :: release() 
+inline MacroGhostInfoHexa* MacroGridBuilder::Hbnd4IntStorage::release() 
 { 
   MacroGhostInfoHexa* p = _ptr;
   _ptr = 0;

lib/Makefile.am

@@ -3,6 +3,7 @@ lib_LTLIBRARIES = libalugrid_serial.la libdunealugrid.la
 libalugrid_serial_la_SOURCES = \
 	$(top_srcdir)/dune/alugrid/src/serial/gitter_geo.cc \
 	$(top_srcdir)/dune/alugrid/src/serial/gitter_hexa_top.cc \
+	$(top_srcdir)/dune/alugrid/src/serial/gitter_mgb.cc \
 	$(top_srcdir)/dune/alugrid/src/serial/gitter_sti.cc \
 	$(top_srcdir)/dune/alugrid/src/serial/gitter_tetra_top.cc \
 	$(top_srcdir)/dune/alugrid/src/serial/myalloc.cc