aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortradke <>2003-09-04 14:23:00 +0000
committertradke <>2003-09-04 14:23:00 +0000
commita89e0bb3beb18555c40f5b31f231857143faa8ac (patch)
treeb28489f40f488d6567c67f7ccfc2a08a2ee97080
parentc7bc3b132f8f8b59134814bbfb49cf35be740170 (diff)
Carpet infrastructure thorns now require the thorns they depend upon
(CarpetLib, Carpet, FlexIO) to be compiled in and activated via the "Requires thorns: ..." attribute in the configuration.ccl files. No need to inherit from those thorns/implementations anymore. darcs-hash:20030904142321-1d9bf-309be01f0950d97b8cb45d041d44edce01aff2a5.gz
Diffstat
-rw-r--r--Carpet/Carpet/configuration.ccl12
-rw-r--r--Carpet/Carpet/interface.ccl4
-rw-r--r--Carpet/CarpetIOASCII/configuration.ccl6
-rw-r--r--Carpet/CarpetIOASCII/interface.ccl4
-rw-r--r--Carpet/CarpetInterp/configuration.ccl6
-rw-r--r--Carpet/CarpetInterp/interface.ccl4
-rw-r--r--Carpet/CarpetReduce/configuration.ccl6
-rw-r--r--Carpet/CarpetReduce/interface.ccl4
-rw-r--r--Carpet/CarpetRegrid/configuration.ccl6
-rw-r--r--Carpet/CarpetRegrid/interface.ccl4
-rw-r--r--Carpet/CarpetSlab/configuration.ccl6
-rw-r--r--Carpet/CarpetSlab/interface.ccl4
-rw-r--r--CarpetAttic/CarpetIOFlexIO/configuration.ccl4
-rw-r--r--CarpetAttic/CarpetIOFlexIO/interface.ccl6
-rw-r--r--CarpetAttic/CarpetIOFlexIOCheckpoint/configuration.ccl4
-rw-r--r--CarpetAttic/CarpetIOFlexIOCheckpoint/interface.ccl6
-rw-r--r--CarpetExtra/CarpetIOSer/configuration.ccl4
-rw-r--r--CarpetExtra/CarpetIOSer/interface.ccl4
18 files changed, 28 insertions, 66 deletions
diff --git a/Carpet/Carpet/configuration.ccl b/Carpet/Carpet/configuration.ccl
index 3880e348b..6285422cb 100644
--- a/Carpet/Carpet/configuration.ccl
+++ b/Carpet/Carpet/configuration.ccl
@@ -1,12 +1,4 @@
# Configuration definitions for thorn Carpet
-# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/configuration.ccl,v 1.5 2004/06/08 21:09:25 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/configuration.ccl,v 1.1 2003/09/04 16:23:21 tradke Exp $
-PROVIDES Carpet
-{
- SCRIPT
- LANG
-}
-
-REQUIRES IOUtil CarpetLib
-
-REQUIRES THORNS: IOUtil CarpetLib
+Requires Thorns: CarpetLib
diff --git a/Carpet/Carpet/interface.ccl b/Carpet/Carpet/interface.ccl
index 6166bf58c..bb906378a 100644
--- a/Carpet/Carpet/interface.ccl
+++ b/Carpet/Carpet/interface.ccl
@@ -1,10 +1,8 @@
# Interface definition for thorn Carpet
-# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/interface.ccl,v 1.5 2003/06/18 18:28:07 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/interface.ccl,v 1.6 2003/09/04 16:23:21 tradke Exp $
implements: driver
-inherits: CarpetLib
-
include header: carpet_public.hh in carpet.hh
include header: carpet_public.h in carpet.h
diff --git a/Carpet/CarpetIOASCII/configuration.ccl b/Carpet/CarpetIOASCII/configuration.ccl
index 06e1c135d..590a36474 100644
--- a/Carpet/CarpetIOASCII/configuration.ccl
+++ b/Carpet/CarpetIOASCII/configuration.ccl
@@ -1,6 +1,4 @@
# Configuration definitions for thorn CarpetIOASCII
-# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOASCII/configuration.ccl,v 1.4 2004/06/08 21:09:25 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOASCII/configuration.ccl,v 1.1 2003/09/04 16:23:21 tradke Exp $
-REQUIRES Carpet CarpetLib IOUtil
-
-REQUIRES THORNS: Carpet CarpetLib IOUtil
+Requires Thorns: Carpet CarpetLib
diff --git a/Carpet/CarpetIOASCII/interface.ccl b/Carpet/CarpetIOASCII/interface.ccl
index 796d8839c..f76c83a95 100644
--- a/Carpet/CarpetIOASCII/interface.ccl
+++ b/Carpet/CarpetIOASCII/interface.ccl
@@ -1,10 +1,8 @@
# Interface definition for thorn CarpetIOASCII
-# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOASCII/interface.ccl,v 1.6 2003/08/14 17:22:54 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOASCII/interface.ccl,v 1.7 2003/09/04 16:23:21 tradke Exp $
implements: IOASCII
-inherits: CarpetLib driver
-
uses include header: carpet.hh
uses include header: dist.hh
diff --git a/Carpet/CarpetInterp/configuration.ccl b/Carpet/CarpetInterp/configuration.ccl
index b96f6d5f0..694c62395 100644
--- a/Carpet/CarpetInterp/configuration.ccl
+++ b/Carpet/CarpetInterp/configuration.ccl
@@ -1,6 +1,4 @@
# Configuration definitions for thorn CarpetInterp
-# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetInterp/configuration.ccl,v 1.3 2004/06/08 21:09:25 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetInterp/configuration.ccl,v 1.1 2003/09/04 16:23:22 tradke Exp $
-REQUIRES Carpet CarpetLib
-
-REQUIRES THORNS: Carpet CarpetLib
+Requires Thorns: Carpet CarpetLib
diff --git a/Carpet/CarpetInterp/interface.ccl b/Carpet/CarpetInterp/interface.ccl
index 5f49c3ce8..1935089bb 100644
--- a/Carpet/CarpetInterp/interface.ccl
+++ b/Carpet/CarpetInterp/interface.ccl
@@ -1,10 +1,8 @@
# Interface definition for thorn CarpetInterp
-# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetInterp/interface.ccl,v 1.3 2003/06/18 18:28:07 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetInterp/interface.ccl,v 1.4 2003/09/04 16:23:22 tradke Exp $
implements: interp
-inherits: CarpetLib driver LocalInterp
-
uses include header: carpet.hh
uses include header: bbox.hh
diff --git a/Carpet/CarpetReduce/configuration.ccl b/Carpet/CarpetReduce/configuration.ccl
index b24240084..4fe957dc9 100644
--- a/Carpet/CarpetReduce/configuration.ccl
+++ b/Carpet/CarpetReduce/configuration.ccl
@@ -1,6 +1,4 @@
# Configuration definitions for thorn CarpetReduce
-# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetReduce/configuration.ccl,v 1.3 2004/06/08 21:09:25 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetReduce/configuration.ccl,v 1.1 2003/09/04 16:23:22 tradke Exp $
-REQUIRES Carpet CarpetLib
-
-REQUIRES THORNS: Carpet CarpetLib
+Requires Thorns: Carpet CarpetLib
diff --git a/Carpet/CarpetReduce/interface.ccl b/Carpet/CarpetReduce/interface.ccl
index 55c46f2d9..c780cb5ca 100644
--- a/Carpet/CarpetReduce/interface.ccl
+++ b/Carpet/CarpetReduce/interface.ccl
@@ -1,10 +1,8 @@
# Interface definition for thorn CarpetReduce
-# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetReduce/interface.ccl,v 1.2 2003/06/18 18:28:07 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetReduce/interface.ccl,v 1.3 2003/09/04 16:23:22 tradke Exp $
implements: reduce
-inherits: CarpetLib driver
-
uses include header: carpet.hh
uses include header: dist.hh
diff --git a/Carpet/CarpetRegrid/configuration.ccl b/Carpet/CarpetRegrid/configuration.ccl
index be06ddeb1..c8c72bcef 100644
--- a/Carpet/CarpetRegrid/configuration.ccl
+++ b/Carpet/CarpetRegrid/configuration.ccl
@@ -1,6 +1,4 @@
# Configuration definitions for thorn CarpetRegrid
-# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/configuration.ccl,v 1.3 2004/06/08 21:09:25 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/configuration.ccl,v 1.1 2003/09/04 16:23:22 tradke Exp $
-REQUIRES Carpet CarpetLib
-
-REQUIRES THORNS: Carpet CarpetLib
+Requires Thorns: Carpet CarpetLib
diff --git a/Carpet/CarpetRegrid/interface.ccl b/Carpet/CarpetRegrid/interface.ccl
index 64166f788..4c2504112 100644
--- a/Carpet/CarpetRegrid/interface.ccl
+++ b/Carpet/CarpetRegrid/interface.ccl
@@ -1,10 +1,8 @@
# Interface definition for thorn CarpetRegrid
-# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/interface.ccl,v 1.2 2003/06/18 18:28:07 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/interface.ccl,v 1.3 2003/09/04 16:23:22 tradke Exp $
implements: CarpetRegrid
-inherits: CarpetLib driver
-
uses include header: carpet.hh
uses include header: defs.hh
diff --git a/Carpet/CarpetSlab/configuration.ccl b/Carpet/CarpetSlab/configuration.ccl
index 8ff27ef27..b3286150b 100644
--- a/Carpet/CarpetSlab/configuration.ccl
+++ b/Carpet/CarpetSlab/configuration.ccl
@@ -1,6 +1,4 @@
# Configuration definitions for thorn CarpetSlab
-# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetSlab/configuration.ccl,v 1.5 2004/06/08 21:09:25 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetSlab/configuration.ccl,v 1.1 2003/09/04 16:23:22 tradke Exp $
-REQUIRES Carpet CarpetLib
-
-REQUIRES THORNS: Carpet CarpetLib
+Requires Thorns: Carpet CarpetLib
diff --git a/Carpet/CarpetSlab/interface.ccl b/Carpet/CarpetSlab/interface.ccl
index f955b8c31..96d182492 100644
--- a/Carpet/CarpetSlab/interface.ccl
+++ b/Carpet/CarpetSlab/interface.ccl
@@ -1,10 +1,8 @@
# Interface definition for thorn CarpetSlab
-# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetSlab/interface.ccl,v 1.5 2003/06/18 18:28:08 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetSlab/interface.ccl,v 1.6 2003/09/04 16:23:22 tradke Exp $
implements: Hyperslab
-inherits: CarpetLib driver
-
includes header: slab.h in Hyperslab.h
uses include header: carpet.hh
diff --git a/CarpetAttic/CarpetIOFlexIO/configuration.ccl b/CarpetAttic/CarpetIOFlexIO/configuration.ccl
index 01dc1a2cf..d6deb8227 100644
--- a/CarpetAttic/CarpetIOFlexIO/configuration.ccl
+++ b/CarpetAttic/CarpetIOFlexIO/configuration.ccl
@@ -1,4 +1,4 @@
# Configuration definitions for thorn CarpetIOFlexIO
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIO/configuration.ccl,v 1.2 2003/11/19 17:12:20 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIO/configuration.ccl,v 1.1 2003/09/04 16:23:21 tradke Exp $
-Requires Thorns: Carpet CarpetLib FlexIO IOUtil
+Requires Thorns: Carpet CarpetLib FlexIO
diff --git a/CarpetAttic/CarpetIOFlexIO/interface.ccl b/CarpetAttic/CarpetIOFlexIO/interface.ccl
index fade3f765..103a9b594 100644
--- a/CarpetAttic/CarpetIOFlexIO/interface.ccl
+++ b/CarpetAttic/CarpetIOFlexIO/interface.ccl
@@ -1,12 +1,8 @@
# Interface definition for thorn CarpetIOFlexIO
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIO/interface.ccl,v 1.8 2003/08/14 17:22:54 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIO/interface.ccl,v 1.9 2003/09/04 16:23:21 tradke Exp $
implements: IOFlexIO
-inherits: CarpetLib driver FlexIO
-
-
-
uses include header: carpet.hh
uses include header: bbox.hh
diff --git a/CarpetAttic/CarpetIOFlexIOCheckpoint/configuration.ccl b/CarpetAttic/CarpetIOFlexIOCheckpoint/configuration.ccl
index 7be774467..8cd4f59b5 100644
--- a/CarpetAttic/CarpetIOFlexIOCheckpoint/configuration.ccl
+++ b/CarpetAttic/CarpetIOFlexIOCheckpoint/configuration.ccl
@@ -1,4 +1,4 @@
-# Configuration definitions for thorn CarpetIOFlexIO
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIOCheckpoint/configuration.ccl,v 1.2 2003/09/17 13:47:00 cvs_anon Exp $
+# Configuration definitions for thorn CarpetIOFlexIOCheckpoint
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIOCheckpoint/configuration.ccl,v 1.1 2003/09/04 16:23:22 tradke Exp $
Requires Thorns: Carpet CarpetLib FlexIO
diff --git a/CarpetAttic/CarpetIOFlexIOCheckpoint/interface.ccl b/CarpetAttic/CarpetIOFlexIOCheckpoint/interface.ccl
index 66d5394e6..6e161d107 100644
--- a/CarpetAttic/CarpetIOFlexIOCheckpoint/interface.ccl
+++ b/CarpetAttic/CarpetIOFlexIOCheckpoint/interface.ccl
@@ -1,12 +1,8 @@
# Interface definition for thorn CarpetIOFlexIO
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIOCheckpoint/interface.ccl,v 1.4 2003/08/14 17:22:54 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIOCheckpoint/interface.ccl,v 1.5 2003/09/04 16:23:22 tradke Exp $
implements: IOFlexIO
-inherits: CarpetLib driver FlexIO
-
-
-
uses include header: carpet.hh
uses include header: bbox.hh
diff --git a/CarpetExtra/CarpetIOSer/configuration.ccl b/CarpetExtra/CarpetIOSer/configuration.ccl
index d66eba98d..d0bcb32b6 100644
--- a/CarpetExtra/CarpetIOSer/configuration.ccl
+++ b/CarpetExtra/CarpetIOSer/configuration.ccl
@@ -1,4 +1,4 @@
# Configuration definitions for thorn CarpetIOSer
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/CarpetIOSer/configuration.ccl,v 1.2 2004/04/18 14:10:30 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/CarpetIOSer/configuration.ccl,v 1.1 2003/09/04 16:23:22 tradke Exp $
-REQUIRES Carpet CarpetLib
+Requires Thorns: Carpet CarpetLib
diff --git a/CarpetExtra/CarpetIOSer/interface.ccl b/CarpetExtra/CarpetIOSer/interface.ccl
index b535e1686..733dcef51 100644
--- a/CarpetExtra/CarpetIOSer/interface.ccl
+++ b/CarpetExtra/CarpetIOSer/interface.ccl
@@ -1,8 +1,8 @@
# Interface definition for thorn CarpetIOSer
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/CarpetIOSer/interface.ccl,v 1.2 2003/08/14 17:22:54 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetExtra/CarpetIOSer/interface.ccl,v 1.3 2003/09/04 16:23:22 tradke Exp $
implements: IOSer
-inherits: CarpetLib driver Hyperslab
+inherits: Hyperslab
uses include header: carpet.hh
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-18 10:30:33 +0000