Begin to clean up inheritance and requires relationships

darcs-hash:20040504200954-07bb3-cd9f17c981ce37247fa2122858b10b46425f678a.gz

8 files changed, 30 insertions, 16 deletions

diff --git a/Carpet/Carpet/interface.ccl b/Carpet/Carpet/interface.ccl
index 79bf01f29..36b99dc69 100644
--- a/Carpet/Carpet/interface.ccl
+++ b/Carpet/Carpet/interface.ccl
@@ -1,7 +1,9 @@
 # Interface definition for thorn Carpet
-# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/interface.ccl,v 1.11 2004/04/18 13:29:43 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/interface.ccl,v 1.12 2004/05/04 22:09:54 schnetter Exp $
 
-implements: Driver
+IMPLEMENTS: Driver
+
+INHERITS: IOUtil CarpetLib
 
 include header: carpet_public.hh in carpet.hh
 include header: carpet_public.h in carpet.h
diff --git a/Carpet/CarpetIOASCII/interface.ccl b/Carpet/CarpetIOASCII/interface.ccl
index a7376c5c5..c90d95369 100644
--- a/Carpet/CarpetIOASCII/interface.ccl
+++ b/Carpet/CarpetIOASCII/interface.ccl
@@ -1,7 +1,9 @@
 # Interface definition for thorn CarpetIOASCII
-# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOASCII/interface.ccl,v 1.9 2004/02/18 15:12:29 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOASCII/interface.ccl,v 1.10 2004/05/04 22:09:54 schnetter Exp $
 
-implements: IOASCII
+IMPLEMENTS: IOASCII
+
+INHERITS: Carpet CarpetLib IOUtil
 
 uses include header: carpet.hh
 
diff --git a/Carpet/CarpetIOHDF5/interface.ccl b/Carpet/CarpetIOHDF5/interface.ccl
index 51a6ec8a3..ffcdb65b1 100644
--- a/Carpet/CarpetIOHDF5/interface.ccl
+++ b/Carpet/CarpetIOHDF5/interface.ccl
@@ -1,7 +1,9 @@
 # Interface definition for thorn CarpetIOHDF5
-# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOHDF5/interface.ccl,v 1.1 2004/03/03 09:44:59 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOHDF5/interface.ccl,v 1.2 2004/05/04 22:09:54 schnetter Exp $
 
-implements: IOHDF5
+IMPLEMENTS: IOHDF5
+
+INHERITS: Carpet CarpetLib IOUtil
 
 uses include header: carpet.hh
 
diff --git a/Carpet/CarpetInterp/interface.ccl b/Carpet/CarpetInterp/interface.ccl
index 1935089bb..d48f1f77a 100644
--- a/Carpet/CarpetInterp/interface.ccl
+++ b/Carpet/CarpetInterp/interface.ccl
@@ -1,7 +1,9 @@
 # Interface definition for thorn CarpetInterp
-# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetInterp/interface.ccl,v 1.4 2003/09/04 16:23:22 tradke Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetInterp/interface.ccl,v 1.5 2004/05/04 22:09:54 schnetter Exp $
 
-implements: interp
+IMPLEMENTS: interp
+
+INHERITS: Carpet CarpetLib
 
 uses include header: carpet.hh
 
diff --git a/Carpet/CarpetLib/interface.ccl b/Carpet/CarpetLib/interface.ccl
index 717c5ec06..593228e75 100644
--- a/Carpet/CarpetLib/interface.ccl
+++ b/Carpet/CarpetLib/interface.ccl
@@ -1,7 +1,7 @@
 # Interface definition for thorn CarpetLib
-# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/interface.ccl,v 1.4 2004/01/25 14:57:29 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/interface.ccl,v 1.5 2004/05/04 22:09:54 schnetter Exp $
 
-implements: CarpetLib
+IMPLEMENTS: CarpetLib
 
 includes header: defs.hh in defs.hh
 includes header: dist.hh in dist.hh
diff --git a/Carpet/CarpetReduce/interface.ccl b/Carpet/CarpetReduce/interface.ccl
index c780cb5ca..7e8e259f9 100644
--- a/Carpet/CarpetReduce/interface.ccl
+++ b/Carpet/CarpetReduce/interface.ccl
@@ -1,7 +1,9 @@
 # Interface definition for thorn CarpetReduce
-# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetReduce/interface.ccl,v 1.3 2003/09/04 16:23:22 tradke Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetReduce/interface.ccl,v 1.4 2004/05/04 22:09:54 schnetter Exp $
 
-implements: reduce
+IMPLEMENTS: reduce
+
+INHERITS: Carpet CarpetLib
 
 uses include header: carpet.hh
 
diff --git a/Carpet/CarpetRegrid/interface.ccl b/Carpet/CarpetRegrid/interface.ccl
index 133e3a12b..93e9f7ab6 100644
--- a/Carpet/CarpetRegrid/interface.ccl
+++ b/Carpet/CarpetRegrid/interface.ccl
@@ -1,7 +1,9 @@
 # Interface definition for thorn CarpetRegrid
-# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/interface.ccl,v 1.9 2004/04/28 15:44:59 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/interface.ccl,v 1.10 2004/05/04 22:09:54 schnetter Exp $
 
-implements: CarpetRegrid
+IMPLEMENTS: CarpetRegrid
+
+INHERITS: Carpet CarpetLib
 
 uses include header: carpet.hh
 
diff --git a/Carpet/CarpetSlab/interface.ccl b/Carpet/CarpetSlab/interface.ccl
index 9b60e9ba8..e62a4055e 100644
--- a/Carpet/CarpetSlab/interface.ccl
+++ b/Carpet/CarpetSlab/interface.ccl
@@ -1,7 +1,9 @@
 # Interface definition for thorn CarpetSlab
-# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetSlab/interface.ccl,v 1.8 2004/01/22 13:31:07 tradke Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetSlab/interface.ccl,v 1.9 2004/05/04 22:09:54 schnetter Exp $
 
-implements: Hyperslab
+IMPLEMENTS: Hyperslab
+
+INHERITS: Carpet CarpetLib
 
 includes header: slab.h in Hyperslab.h