diff --git a/dune/alugrid/3d/entity_imp.cc b/dune/alugrid/3d/entity_imp.cc index 7ae0d34a33b9da7fa928d1bc8afeb7658f71a0cb..ca9585bc3885732294d1c3ed4beaf1da773bd7b5 100644 --- a/dune/alugrid/3d/entity_imp.cc +++ b/dune/alugrid/3d/entity_imp.cc @@ -173,6 +173,7 @@ namespace Dune { // this method should only be called if a father exists alugrid_assert ( item_->up() ); + /* // get child number const int child = item_->nChild(); @@ -180,9 +181,11 @@ namespace Dune { // this can only be true for tetrahedral elements if( (GridImp::elementType == tetra) && (item_->up()->getrule() != ImplTraits::refine_element_t) ) { + */ static LocalGeometryImpl geom; geom.buildGeomInFather( father()->geometry(), geometry() ); return LocalGeometry( geom ); + /* } else { @@ -191,6 +194,7 @@ namespace Dune { // get geometryInFather storage from grid and return childs geom return LocalGeometry( grid().nonConformingGeometryInFatherStorage()[ child ] ); } + */ } //********* begin method subIndex ******************** diff --git a/dune/alugrid/3d/grid.hh b/dune/alugrid/3d/grid.hh index ea7cf9ac526469a1614eca254c505cad229c707a..e85963a1530c03fa205b9dc204fd074e758d636e 100644 --- a/dune/alugrid/3d/grid.hh +++ b/dune/alugrid/3d/grid.hh @@ -1120,9 +1120,9 @@ namespace Dune // geometry in father storage typedef ALULocalGeometryStorage< const ThisType, typename Traits::template Codim< 0 >::LocalGeometryImpl, 8 > GeometryInFatherStorage ; // return geometryInFather for non-conforming grids - const GeometryInFatherStorage& nonConformingGeometryInFatherStorage() const { return nonConformingGeoInFatherStorage_; } + //const GeometryInFatherStorage& nonConformingGeometryInFatherStorage() const { return nonConformingGeoInFatherStorage_; } // initialize geometry types and return correct geometryInFather storage - const GeometryInFatherStorage& makeGeometries(); + //const GeometryInFatherStorage& makeGeometries(); public: const GridObjectFactoryType &factory () const { return factory_; } @@ -1226,7 +1226,7 @@ namespace Dune const ALUGridRefinementType refinementType_ ; // local geometry storage for geometries in father - const GeometryInFatherStorage& nonConformingGeoInFatherStorage_ ; + //const GeometryInFatherStorage& nonConformingGeoInFatherStorage_ ; }; // end class ALU3dGrid diff --git a/dune/alugrid/3d/grid_inline.hh b/dune/alugrid/3d/grid_inline.hh index 5d062836d5dd5d525ca1b18b00300e0c07b0908f..e5e2f12a4c9b26ead1c33768df37c0dad2376a09 100644 --- a/dune/alugrid/3d/grid_inline.hh +++ b/dune/alugrid/3d/grid_inline.hh @@ -41,7 +41,7 @@ namespace Dune , vertexProjection_( (bndPrj || bndVec) ? new ALUGridBoundaryProjectionType( *this ) : 0 ) , communications_( new Communications( mpiComm ) ) , refinementType_( refinementType ) - , nonConformingGeoInFatherStorage_( makeGeometries() ) + //, nonConformingGeoInFatherStorage_( makeGeometries() ) { // check macro grid file for keyword checkMacroGridFile( macroTriangFilename ); @@ -59,6 +59,7 @@ namespace Dune } // end constructor + /* template< int actualDim, int actualDimw, ALU3dGridElementType elType, class Comm > const typename ALU3dGrid< actualDim, actualDimw, elType, Comm >::GeometryInFatherStorage& ALU3dGrid< actualDim, actualDimw, elType, Comm >::makeGeometries() @@ -88,6 +89,7 @@ namespace Dune // true == non-conforming return GeometryInFatherStorage :: storage( geomTypes_[ 0 ][ 0 ], true ); } + */ template< int actualDim, int actualDimw, ALU3dGridElementType elType, class Comm >