From e67f906933cbb401af9661a2b00e731d3210ba63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Kl=C3=B6fkorn?=
<robertk@mathematik.uni-stuttgart.de>
Date: Wed, 11 May 2005 15:28:28 +0000
Subject: [PATCH] implemented Gitter pointer for hexa elements.
git-svn-id: https://dune.mathematik.uni-freiburg.de/svn/alugrid/trunk@260 0d966ed9-3843-0410-af09-ebfb50bd7c74
---
src/parallel/gitter_pll_impl.cc | 6 +++---
src/parallel/gitter_pll_impl.h | 4 +---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/parallel/gitter_pll_impl.cc b/src/parallel/gitter_pll_impl.cc
index 3a88cd7c5..148d08570 100644
--- a/src/parallel/gitter_pll_impl.cc
+++ b/src/parallel/gitter_pll_impl.cc
@@ -1350,8 +1350,8 @@ void GitterBasisPll :: ObjectsPll :: HexaEmptyPll :: detachPllXFromMacro () thro
GitterBasisPll :: ObjectsPll :: HexaEmptyPllMacro :: HexaEmptyPllMacro
(myhface4_t * f0, int t0, myhface4_t * f1, int t1, myhface4_t * f2, int t2,
- myhface4_t * f3, int t3, myhface4_t * f4, int t4, myhface4_t * f5, int t5, IndexManagerType & im)
- : GitterBasisPll :: ObjectsPll :: hexa_IMPL (0,f0,t0,f1,t1,f2,t2,f3,t3,f4,t4,f5,t5,im), _pllx (new mypllx_t (*this)) {
+ myhface4_t * f3, int t3, myhface4_t * f4, int t4, myhface4_t * f5, int t5, IndexManagerType & im, Gitter * gitter)
+ : GitterBasisPll :: ObjectsPll :: hexa_IMPL (0,f0,t0,f1,t1,f2,t2,f3,t3,f4,t4,f5,t5,im,gitter), _pllx (new mypllx_t (*this)) {
return ;
}
@@ -1453,7 +1453,7 @@ Gitter :: Geometric :: hface3_GEO * GitterBasisPll :: MacroGitterBasisPll :: ins
}
Gitter :: Geometric :: hexa_GEO * GitterBasisPll :: MacroGitterBasisPll :: insert_hexa (hface4_GEO *(&f)[6], int (&t)[6]) {
- return new ObjectsPll :: HexaEmptyPllMacro (f [0], t[0], f [1], t[1], f [2], t[2], f[3], t[3], f[4], t[4], f[5], t[5], indexManager(0) ) ;
+ return new ObjectsPll :: HexaEmptyPllMacro (f [0], t[0], f [1], t[1], f [2], t[2], f[3], t[3], f[4], t[4], f[5], t[5], indexManager(0), this->_myGrid ) ;
}
Gitter :: Geometric :: tetra_GEO * GitterBasisPll :: MacroGitterBasisPll :: insert_tetra (hface3_GEO *(&f)[4], int (&t)[4]) {
diff --git a/src/parallel/gitter_pll_impl.h b/src/parallel/gitter_pll_impl.h
index ccd9620e1..619ffb854 100644
--- a/src/parallel/gitter_pll_impl.h
+++ b/src/parallel/gitter_pll_impl.h
@@ -748,7 +748,7 @@ class GitterBasisPll : public Gitter :: Geometric, public GitterPll {
public :
typedef HexaPllBaseXMacro mypllx_t ;
HexaEmptyPllMacro (myhface4_t *,int,myhface4_t *,int,myhface4_t *,int,myhface4_t *,int,myhface4_t *,int,
- myhface4_t *,int, IndexManagerType & im) ;
+ myhface4_t *,int, IndexManagerType & im, Gitter * gitter ) ;
~HexaEmptyPllMacro () ;
virtual ElementPllXIF_t & accessPllX () throw (Parallel :: AccessPllException) ;
virtual const ElementPllXIF_t & accessPllX () const throw (Parallel :: AccessPllException) ;
@@ -812,8 +812,6 @@ class GitterBasisPll : public Gitter :: Geometric, public GitterPll {
IteratorSTI < hbndseg_STI > * iterator (const hbndseg_STI *) const ;
IteratorSTI < hbndseg_STI > * iterator (const IteratorSTI < hbndseg_STI > *) const ;
public :
- // Gitter is here a reference to the actual grid this macro grid
- // belongs to
MacroGitterBasisPll (Gitter * , istream &) ;
MacroGitterBasisPll (Gitter * ) ;
~MacroGitterBasisPll () ;
--
GitLab