Skip to content
Snippets Groups Projects
Commit fb7c7850 authored by Robert K's avatar Robert K
Browse files

disable LocalGeometry Storage for now.

parent febea90c
No related branches found
No related tags found
No related merge requests found
...@@ -173,6 +173,7 @@ namespace Dune { ...@@ -173,6 +173,7 @@ namespace Dune {
// this method should only be called if a father exists // this method should only be called if a father exists
alugrid_assert ( item_->up() ); alugrid_assert ( item_->up() );
/*
// get child number // get child number
const int child = item_->nChild(); const int child = item_->nChild();
...@@ -180,9 +181,11 @@ namespace Dune { ...@@ -180,9 +181,11 @@ namespace Dune {
// this can only be true for tetrahedral elements // this can only be true for tetrahedral elements
if( (GridImp::elementType == tetra) && (item_->up()->getrule() != ImplTraits::refine_element_t) ) if( (GridImp::elementType == tetra) && (item_->up()->getrule() != ImplTraits::refine_element_t) )
{ {
*/
static LocalGeometryImpl geom; static LocalGeometryImpl geom;
geom.buildGeomInFather( father()->geometry(), geometry() ); geom.buildGeomInFather( father()->geometry(), geometry() );
return LocalGeometry( geom ); return LocalGeometry( geom );
/*
} }
else else
{ {
...@@ -191,6 +194,7 @@ namespace Dune { ...@@ -191,6 +194,7 @@ namespace Dune {
// get geometryInFather storage from grid and return childs geom // get geometryInFather storage from grid and return childs geom
return LocalGeometry( grid().nonConformingGeometryInFatherStorage()[ child ] ); return LocalGeometry( grid().nonConformingGeometryInFatherStorage()[ child ] );
} }
*/
} }
//********* begin method subIndex ******************** //********* begin method subIndex ********************
......
...@@ -1120,9 +1120,9 @@ namespace Dune ...@@ -1120,9 +1120,9 @@ namespace Dune
// geometry in father storage // geometry in father storage
typedef ALULocalGeometryStorage< const ThisType, typename Traits::template Codim< 0 >::LocalGeometryImpl, 8 > GeometryInFatherStorage ; typedef ALULocalGeometryStorage< const ThisType, typename Traits::template Codim< 0 >::LocalGeometryImpl, 8 > GeometryInFatherStorage ;
// return geometryInFather for non-conforming grids // 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 // initialize geometry types and return correct geometryInFather storage
const GeometryInFatherStorage& makeGeometries(); //const GeometryInFatherStorage& makeGeometries();
public: public:
const GridObjectFactoryType &factory () const { return factory_; } const GridObjectFactoryType &factory () const { return factory_; }
...@@ -1226,7 +1226,7 @@ namespace Dune ...@@ -1226,7 +1226,7 @@ namespace Dune
const ALUGridRefinementType refinementType_ ; const ALUGridRefinementType refinementType_ ;
// local geometry storage for geometries in father // local geometry storage for geometries in father
const GeometryInFatherStorage& nonConformingGeoInFatherStorage_ ; //const GeometryInFatherStorage& nonConformingGeoInFatherStorage_ ;
}; // end class ALU3dGrid }; // end class ALU3dGrid
......
...@@ -41,7 +41,7 @@ namespace Dune ...@@ -41,7 +41,7 @@ namespace Dune
, vertexProjection_( (bndPrj || bndVec) ? new ALUGridBoundaryProjectionType( *this ) : 0 ) , vertexProjection_( (bndPrj || bndVec) ? new ALUGridBoundaryProjectionType( *this ) : 0 )
, communications_( new Communications( mpiComm ) ) , communications_( new Communications( mpiComm ) )
, refinementType_( refinementType ) , refinementType_( refinementType )
, nonConformingGeoInFatherStorage_( makeGeometries() ) //, nonConformingGeoInFatherStorage_( makeGeometries() )
{ {
// check macro grid file for keyword // check macro grid file for keyword
checkMacroGridFile( macroTriangFilename ); checkMacroGridFile( macroTriangFilename );
...@@ -59,6 +59,7 @@ namespace Dune ...@@ -59,6 +59,7 @@ namespace Dune
} // end constructor } // end constructor
/*
template< int actualDim, int actualDimw, ALU3dGridElementType elType, class Comm > template< int actualDim, int actualDimw, ALU3dGridElementType elType, class Comm >
const typename ALU3dGrid< actualDim, actualDimw, elType, Comm >::GeometryInFatherStorage& const typename ALU3dGrid< actualDim, actualDimw, elType, Comm >::GeometryInFatherStorage&
ALU3dGrid< actualDim, actualDimw, elType, Comm >::makeGeometries() ALU3dGrid< actualDim, actualDimw, elType, Comm >::makeGeometries()
...@@ -88,6 +89,7 @@ namespace Dune ...@@ -88,6 +89,7 @@ namespace Dune
// true == non-conforming // true == non-conforming
return GeometryInFatherStorage :: storage( geomTypes_[ 0 ][ 0 ], true ); return GeometryInFatherStorage :: storage( geomTypes_[ 0 ][ 0 ], true );
} }
*/
template< int actualDim, int actualDimw, ALU3dGridElementType elType, class Comm > template< int actualDim, int actualDimw, ALU3dGridElementType elType, class Comm >
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment