From 17f60d6e497d01a9e90fd3e68b9944b9b3be3b3d Mon Sep 17 00:00:00 2001
From: Robert Kloefkorn <robertk@cisl-canaveral.scd.ucar.edu>
Date: Thu, 1 Nov 2012 17:18:45 -0600
Subject: [PATCH] some cleanup and minor changes.
---
src/serial/gitter_sti.cc | 9 +++++++--
src/serial/gitter_sti.h | 11 +++++++----
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/serial/gitter_sti.cc b/src/serial/gitter_sti.cc
index 55884b9a3..573ac7f9d 100644
--- a/src/serial/gitter_sti.cc
+++ b/src/serial/gitter_sti.cc
@@ -330,7 +330,7 @@ bool Gitter :: markForConformingClosure()
return needConformingClosure;
}
-void Gitter :: markEdgeCoarsening ()
+bool Gitter :: markEdgeCoarsening ()
{
if( conformingClosureNeeded() )
{
@@ -355,7 +355,9 @@ void Gitter :: markEdgeCoarsening ()
// mark coarsening will unset some edge flags
i.item().markEdgeCoarsening();
}
+ return true ;
}
+ return false ;
}
void Gitter :: resetEdgeCoarsenFlags ()
@@ -368,7 +370,10 @@ void Gitter :: resetEdgeCoarsenFlags ()
// reset coarsening flag for all edges
for( edges->first(); ! edges->done(); edges->next() )
- edges->item().resetLockFlag();
+ {
+ edges->item().resetCoarsenFlag();
+ // edges->item().resetLockFlag();
+ }
delete edges ;
}
}
diff --git a/src/serial/gitter_sti.h b/src/serial/gitter_sti.h
index 63106d447..8cdbcd874 100644
--- a/src/serial/gitter_sti.h
+++ b/src/serial/gitter_sti.h
@@ -535,7 +535,7 @@ public :
// return true if edge should not be coarsened
bool noCoarsen () const
{
- return isSet( flagNoCoarsen ) || isSet( flagLock ) ;
+ return isSet( flagNoCoarsen );
}
};
@@ -2138,7 +2138,7 @@ protected :
virtual bool refine () ;
// returns true if conforming closure is still needed
virtual bool markForConformingClosure () ;
- virtual void markEdgeCoarsening () ;
+ virtual bool markEdgeCoarsening () ;
virtual void coarse () ;
void doCoarse () ;
void resetEdgeCoarsenFlags () ;
@@ -2922,14 +2922,17 @@ inline Gitter :: Geometric :: hedge1 :: hedge1 (myvertex_t * a, myvertex_t * b)
inline Gitter :: Geometric :: hedge1 :: ~hedge1 () {
assert (ref ? (cerr << "**WARNING hedge1::refcount was " << ref << endl, 1) : 1) ;
- assert ( ref == 0 );
+ if( ref != 0 )
+ {
+ cout << int(this->bndId()) << " bnd id " << endl;
+ assert ( ref == 0 );
+ }
v0->ref -- ;
v1->ref -- ;
return ;
}
inline int Gitter :: Geometric :: hedge1 :: postRefinement () {
- //lockEdgeAgainstCoarsening();
return 0 ;
}
--
GitLab