From ea740d6943d91904e50c22bf40112b9f597c69e8 Mon Sep 17 00:00:00 2001
From: Erik Schnetter <schnetter@gmail.com>
Date: Tue, 6 Aug 2013 12:57:55 -0400
Subject: CarpetLib: Ensure that gh/dh/th destructors are called in the right
 order

---
 Carpet/CarpetLib/src/gh.cc | 2 ++
 Carpet/CarpetLib/src/gh.hh | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Carpet/CarpetLib/src/gh.cc b/Carpet/CarpetLib/src/gh.cc
index 5c13d0b6a..a82d66a09 100644
--- a/Carpet/CarpetLib/src/gh.cc
+++ b/Carpet/CarpetLib/src/gh.cc
@@ -77,6 +77,8 @@ gh (vector<ivect> const & reffacts_, centering const refcent_,
 gh::
 ~gh ()
 {
+  assert (dhs.empty());
+  assert (ths.empty());
   allgh.erase (this);
 }
 
diff --git a/Carpet/CarpetLib/src/gh.hh b/Carpet/CarpetLib/src/gh.hh
index 8c59c7073..c6462e51c 100644
--- a/Carpet/CarpetLib/src/gh.hh
+++ b/Carpet/CarpetLib/src/gh.hh
@@ -63,8 +63,8 @@ public:
   mregs regions;                // extents and properties of all grids
   mregs oldregions;             // extents and properties of all grids
   
-  set<th*> ths;                 // all time hierarchies
   set<dh*> dhs;                 // all data hierarchies
+  set<th*> ths;                 // all time hierarchies
   
 public:
   
-- 
cgit v1.2.3