diff options
32 files changed, 205 insertions, 117 deletions
diff --git a/Carpet/Carpet/interface.ccl b/Carpet/Carpet/interface.ccl index facf8c8f0..6166bf58c 100644 --- a/Carpet/Carpet/interface.ccl +++ b/Carpet/Carpet/interface.ccl @@ -1,5 +1,5 @@ # Interface definition for thorn Carpet -# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/interface.ccl,v 1.4 2001/07/12 06:11:04 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/interface.ccl,v 1.5 2003/06/18 18:28:07 schnetter Exp $ implements: driver @@ -7,3 +7,16 @@ inherits: CarpetLib include header: carpet_public.hh in carpet.hh include header: carpet_public.h in carpet.h + +uses include header: defs.hh +uses include header: dist.hh + +uses include header: bbox.hh +uses include header: bboxset.hh +uses include header: vect.hh + +uses include header: dh.hh +uses include header: gf.hh +uses include header: ggf.hh +uses include header: gh.hh +uses include header: th.hh diff --git a/Carpet/Carpet/src/CallFunction.cc b/Carpet/Carpet/src/CallFunction.cc index d16675e53..85b3957c3 100644 --- a/Carpet/Carpet/src/CallFunction.cc +++ b/Carpet/Carpet/src/CallFunction.cc @@ -6,12 +6,12 @@ #include "cctk.h" #include "cctki_GHExtensions.h" -#include "Carpet/CarpetLib/src/gh.hh" +#include "gh.hh" #include "carpet.hh" extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/CallFunction.cc,v 1.9 2003/06/18 18:24:27 schnetter Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/CallFunction.cc,v 1.10 2003/06/18 18:28:07 schnetter Exp $"; CCTK_FILEVERSION(Carpet_Carpet_CallFunction_cc); } diff --git a/Carpet/Carpet/src/Checksum.cc b/Carpet/Carpet/src/Checksum.cc index ad3972a35..b45f5b6e6 100644 --- a/Carpet/Carpet/src/Checksum.cc +++ b/Carpet/Carpet/src/Checksum.cc @@ -4,12 +4,12 @@ #include "cctk.h" #include "cctk_Parameters.h" -#include "Carpet/CarpetLib/src/gh.hh" +#include "gh.hh" #include "carpet.hh" extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Checksum.cc,v 1.9 2003/06/18 18:24:27 schnetter Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Checksum.cc,v 1.10 2003/06/18 18:28:07 schnetter Exp $"; CCTK_FILEVERSION(Carpet_Carpet_Checksum_cc); } diff --git a/Carpet/Carpet/src/Comm.cc b/Carpet/Carpet/src/Comm.cc index f893b3c71..c91296962 100644 --- a/Carpet/Carpet/src/Comm.cc +++ b/Carpet/Carpet/src/Comm.cc @@ -4,13 +4,13 @@ #include "cctk.h" #include "cctk_Parameters.h" -#include "Carpet/CarpetLib/src/ggf.hh" -#include "Carpet/CarpetLib/src/gh.hh" +#include "ggf.hh" +#include "gh.hh" #include "carpet.hh" extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Comm.cc,v 1.17 2003/06/18 18:24:27 schnetter Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Comm.cc,v 1.18 2003/06/18 18:28:07 schnetter Exp $"; CCTK_FILEVERSION(Carpet_Carpet_Comm_cc); } diff --git a/Carpet/Carpet/src/Cycle.cc b/Carpet/Carpet/src/Cycle.cc index ad3b48af2..170fe6dc9 100644 --- a/Carpet/Carpet/src/Cycle.cc +++ b/Carpet/Carpet/src/Cycle.cc @@ -3,13 +3,13 @@ #include "cctk.h" -#include "Carpet/CarpetLib/src/ggf.hh" -#include "Carpet/CarpetLib/src/gh.hh" +#include "ggf.hh" +#include "gh.hh" #include "carpet.hh" extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Cycle.cc,v 1.13 2003/05/23 23:51:17 schnetter Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Cycle.cc,v 1.14 2003/06/18 18:28:07 schnetter Exp $"; CCTK_FILEVERSION(Carpet_Carpet_Cycle_cc); } diff --git a/Carpet/Carpet/src/Evolve.cc b/Carpet/Carpet/src/Evolve.cc index ebf6f4a66..245293bbb 100644 --- a/Carpet/Carpet/src/Evolve.cc +++ b/Carpet/Carpet/src/Evolve.cc @@ -12,13 +12,13 @@ # include <unistd.h> #endif -#include "Carpet/CarpetLib/src/dist.hh" -#include "Carpet/CarpetLib/src/th.hh" +#include "dist.hh" +#include "th.hh" #include "carpet.hh" extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Evolve.cc,v 1.22 2003/06/18 18:24:27 schnetter Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Evolve.cc,v 1.23 2003/06/18 18:28:07 schnetter Exp $"; CCTK_FILEVERSION(Carpet_Carpet_Evolve_cc); } diff --git a/Carpet/Carpet/src/Recompose.cc b/Carpet/Carpet/src/Recompose.cc index 5a05f434d..d0bb0ab7a 100644 --- a/Carpet/Carpet/src/Recompose.cc +++ b/Carpet/Carpet/src/Recompose.cc @@ -17,16 +17,16 @@ #include "CactusBase/IOUtil/src/ioGH.h" -#include "Carpet/CarpetLib/src/bbox.hh" -#include "Carpet/CarpetLib/src/bboxset.hh" -#include "Carpet/CarpetLib/src/defs.hh" -#include "Carpet/CarpetLib/src/gh.hh" -#include "Carpet/CarpetLib/src/vect.hh" +#include "bbox.hh" +#include "bboxset.hh" +#include "defs.hh" +#include "gh.hh" +#include "vect.hh" #include "carpet.hh" extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Recompose.cc,v 1.40 2003/05/12 16:24:25 schnetter Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Recompose.cc,v 1.41 2003/06/18 18:28:07 schnetter Exp $"; CCTK_FILEVERSION(Carpet_Carpet_Recompose_cc); } diff --git a/Carpet/Carpet/src/Restrict.cc b/Carpet/Carpet/src/Restrict.cc index 810174f18..ae463f1be 100644 --- a/Carpet/Carpet/src/Restrict.cc +++ b/Carpet/Carpet/src/Restrict.cc @@ -4,13 +4,13 @@ #include "cctk.h" -#include "Carpet/CarpetLib/src/ggf.hh" -#include "Carpet/CarpetLib/src/gh.hh" +#include "ggf.hh" +#include "gh.hh" #include "carpet.hh" extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Restrict.cc,v 1.16 2003/06/18 18:24:27 schnetter Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Restrict.cc,v 1.17 2003/06/18 18:28:07 schnetter Exp $"; CCTK_FILEVERSION(Carpet_Carpet_Restrict_cc); } diff --git a/Carpet/Carpet/src/SetupGH.cc b/Carpet/Carpet/src/SetupGH.cc index 809a1e43a..aeb5247bf 100644 --- a/Carpet/Carpet/src/SetupGH.cc +++ b/Carpet/Carpet/src/SetupGH.cc @@ -9,17 +9,17 @@ #include "cctk.h" #include "cctk_Parameters.h" -#include "Carpet/CarpetLib/src/bbox.hh" -#include "Carpet/CarpetLib/src/defs.hh" -#include "Carpet/CarpetLib/src/dist.hh" -#include "Carpet/CarpetLib/src/ggf.hh" -#include "Carpet/CarpetLib/src/gh.hh" -#include "Carpet/CarpetLib/src/vect.hh" +#include "bbox.hh" +#include "defs.hh" +#include "dist.hh" +#include "ggf.hh" +#include "gh.hh" +#include "vect.hh" #include "carpet.hh" extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/SetupGH.cc,v 1.46 2003/06/18 18:24:27 schnetter Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/SetupGH.cc,v 1.47 2003/06/18 18:28:07 schnetter Exp $"; CCTK_FILEVERSION(Carpet_Carpet_SetupGH_cc); } diff --git a/Carpet/Carpet/src/Shutdown.cc b/Carpet/Carpet/src/Shutdown.cc index 24e41a912..1db1afff6 100644 --- a/Carpet/Carpet/src/Shutdown.cc +++ b/Carpet/Carpet/src/Shutdown.cc @@ -5,12 +5,12 @@ #include "cctk.h" #include "cctk_Parameters.h" -#include "Carpet/CarpetLib/src/dist.hh" +#include "dist.hh" #include "carpet.hh" extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Shutdown.cc,v 1.10 2003/06/18 18:24:27 schnetter Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Shutdown.cc,v 1.11 2003/06/18 18:28:07 schnetter Exp $"; CCTK_FILEVERSION(Carpet_Carpet_Shutdown_cc); } diff --git a/Carpet/Carpet/src/Storage.cc b/Carpet/Carpet/src/Storage.cc index ef2477333..3763f20ab 100644 --- a/Carpet/Carpet/src/Storage.cc +++ b/Carpet/Carpet/src/Storage.cc @@ -4,13 +4,13 @@ #include "cctk.h" #include "cctk_Parameters.h" -#include "Carpet/CarpetLib/src/dh.hh" -#include "Carpet/CarpetLib/src/gf.hh" +#include "dh.hh" +#include "gf.hh" #include "carpet.hh" extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Storage.cc,v 1.21 2003/06/18 18:24:27 schnetter Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Storage.cc,v 1.22 2003/06/18 18:28:07 schnetter Exp $"; CCTK_FILEVERSION(Carpet_Carpet_Storage_cc); } diff --git a/Carpet/Carpet/src/carpet.hh b/Carpet/Carpet/src/carpet.hh index bce4c0a27..1110dc608 100644 --- a/Carpet/Carpet/src/carpet.hh +++ b/Carpet/Carpet/src/carpet.hh @@ -1,9 +1,9 @@ -// $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/carpet.hh,v 1.22 2003/05/02 14:22:32 schnetter Exp $ +// $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/carpet.hh,v 1.23 2003/06/18 18:28:07 schnetter Exp $ #ifndef CARPET_HH #define CARPET_HH -#include "Carpet/CarpetLib/src/gh.hh" +#include "gh.hh" #include "carpet_public.hh" diff --git a/Carpet/Carpet/src/carpet_public.hh b/Carpet/Carpet/src/carpet_public.hh index 11aa9390b..10989325a 100644 --- a/Carpet/Carpet/src/carpet_public.hh +++ b/Carpet/Carpet/src/carpet_public.hh @@ -1,4 +1,4 @@ -// $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/carpet_public.hh,v 1.29 2003/06/18 18:24:28 schnetter Exp $ +// $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/carpet_public.hh,v 1.30 2003/06/18 18:28:07 schnetter Exp $ // It is assumed that the number of components of all arrays is equal // to the number of components of the grid functions, and that their @@ -13,11 +13,11 @@ #include "cctk.h" #include "cctk_Schedule.h" -#include "Carpet/CarpetLib/src/dh.hh" -#include "Carpet/CarpetLib/src/gf.hh" -#include "Carpet/CarpetLib/src/ggf.hh" -#include "Carpet/CarpetLib/src/gh.hh" -#include "Carpet/CarpetLib/src/th.hh" +#include "dh.hh" +#include "gf.hh" +#include "ggf.hh" +#include "gh.hh" +#include "th.hh" #include "carpet_public.h" diff --git a/Carpet/Carpet/src/helpers.cc b/Carpet/Carpet/src/helpers.cc index 430966caf..bdb26ec37 100644 --- a/Carpet/Carpet/src/helpers.cc +++ b/Carpet/Carpet/src/helpers.cc @@ -8,14 +8,14 @@ #include "cctk_FortranString.h" #include "cctk_Parameters.h" -#include "Carpet/CarpetLib/src/defs.hh" -#include "Carpet/CarpetLib/src/dist.hh" -#include "Carpet/CarpetLib/src/ggf.hh" +#include "defs.hh" +#include "dist.hh" +#include "ggf.hh" #include "carpet.hh" extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/helpers.cc,v 1.36 2003/06/18 18:24:28 schnetter Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/helpers.cc,v 1.37 2003/06/18 18:28:07 schnetter Exp $"; CCTK_FILEVERSION(Carpet_Carpet_helpers_cc); } diff --git a/Carpet/Carpet/src/variables.cc b/Carpet/Carpet/src/variables.cc index 886146a10..09037bdd9 100644 --- a/Carpet/Carpet/src/variables.cc +++ b/Carpet/Carpet/src/variables.cc @@ -1,12 +1,12 @@ #include <vector> -#include "Carpet/CarpetLib/src/dh.hh" -#include "Carpet/CarpetLib/src/gh.hh" -#include "Carpet/CarpetLib/src/th.hh" +#include "dh.hh" +#include "gh.hh" +#include "th.hh" #include "carpet.hh" extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/variables.cc,v 1.15 2003/06/18 18:24:28 schnetter Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/variables.cc,v 1.16 2003/06/18 18:28:07 schnetter Exp $"; CCTK_FILEVERSION(Carpet_Carpet_variables_cc); } diff --git a/Carpet/CarpetIOASCII/interface.ccl b/Carpet/CarpetIOASCII/interface.ccl index 0562b0057..831ab1d68 100644 --- a/Carpet/CarpetIOASCII/interface.ccl +++ b/Carpet/CarpetIOASCII/interface.ccl @@ -1,8 +1,18 @@ # Interface definition for thorn CarpetIOASCII -# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOASCII/interface.ccl,v 1.4 2001/07/12 06:11:06 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOASCII/interface.ccl,v 1.5 2003/06/18 18:28:07 schnetter Exp $ implements: IOASCII inherits: CarpetLib driver Hyperslab uses include header: carpet.hh + +uses include header: dist.hh + +uses include header: vect.hh + +uses include header: data.hh +uses include header: gdata.hh + +uses include header: gf.hh +uses include header: ggf.hh diff --git a/Carpet/CarpetIOASCII/src/ioascii.cc b/Carpet/CarpetIOASCII/src/ioascii.cc index 247705e62..67cea2237 100644 --- a/Carpet/CarpetIOASCII/src/ioascii.cc +++ b/Carpet/CarpetIOASCII/src/ioascii.cc @@ -18,19 +18,19 @@ #include "CactusBase/IOUtil/src/ioGH.h" -#include "Carpet/CarpetLib/src/data.hh" -#include "Carpet/CarpetLib/src/dist.hh" -#include "Carpet/CarpetLib/src/gdata.hh" -#include "Carpet/CarpetLib/src/gf.hh" -#include "Carpet/CarpetLib/src/ggf.hh" -#include "Carpet/CarpetLib/src/vect.hh" +#include "data.hh" +#include "dist.hh" +#include "gdata.hh" +#include "gf.hh" +#include "ggf.hh" +#include "vect.hh" #include "carpet.hh" #include "ioascii.hh" extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOASCII/src/ioascii.cc,v 1.49 2003/06/18 18:24:28 schnetter Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOASCII/src/ioascii.cc,v 1.50 2003/06/18 18:28:07 schnetter Exp $"; CCTK_FILEVERSION(Carpet_CarpetIOASCII_ioascii_cc); } diff --git a/Carpet/CarpetInterp/interface.ccl b/Carpet/CarpetInterp/interface.ccl index 409979d5e..5f49c3ce8 100644 --- a/Carpet/CarpetInterp/interface.ccl +++ b/Carpet/CarpetInterp/interface.ccl @@ -1,6 +1,13 @@ # Interface definition for thorn CarpetInterp -# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetInterp/interface.ccl,v 1.2 2003/04/30 12:37:31 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetInterp/interface.ccl,v 1.3 2003/06/18 18:28:07 schnetter Exp $ implements: interp inherits: CarpetLib driver LocalInterp + +uses include header: carpet.hh + +uses include header: bbox.hh +uses include header: vect.hh + +uses include header: data.hh diff --git a/Carpet/CarpetInterp/src/interp.cc b/Carpet/CarpetInterp/src/interp.cc index c38bcc99f..dfc66577e 100644 --- a/Carpet/CarpetInterp/src/interp.cc +++ b/Carpet/CarpetInterp/src/interp.cc @@ -1,4 +1,4 @@ -// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetInterp/src/interp.cc,v 1.10 2003/06/18 18:24:28 schnetter Exp $ +// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetInterp/src/interp.cc,v 1.11 2003/06/18 18:28:07 schnetter Exp $ #include <assert.h> #include <math.h> @@ -10,16 +10,16 @@ #include "cctk.h" -#include "Carpet/CarpetLib/src/bbox.hh" -#include "Carpet/CarpetLib/src/data.hh" -#include "Carpet/CarpetLib/src/vect.hh" +#include "bbox.hh" +#include "data.hh" +#include "vect.hh" -#include "Carpet/Carpet/src/carpet.hh" +#include "carpet.hh" #include "interp.hh" extern "C" { - static char const * const rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetInterp/src/interp.cc,v 1.10 2003/06/18 18:24:28 schnetter Exp $"; + static char const * const rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetInterp/src/interp.cc,v 1.11 2003/06/18 18:28:07 schnetter Exp $"; CCTK_FILEVERSION(Carpet_CarpetInterp_interp_cc); } diff --git a/Carpet/CarpetLib/interface.ccl b/Carpet/CarpetLib/interface.ccl index 76828e737..b2c8cbde0 100644 --- a/Carpet/CarpetLib/interface.ccl +++ b/Carpet/CarpetLib/interface.ccl @@ -1,4 +1,20 @@ # Interface definition for thorn CarpetLib -# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/interface.ccl,v 1.2 2001/03/05 14:30:39 eschnett Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/interface.ccl,v 1.3 2003/06/18 18:28:07 schnetter Exp $ implements: CarpetLib + +includes header: defs.hh in defs.hh +includes header: dist.hh in dist.hh + +includes header: bbox.hh in bbox.hh +includes header: bboxset.hh in bboxset.hh +includes header: vect.hh in vect.hh + +includes header: data.hh in data.hh +includes header: gdata.hh in gdata.hh + +includes header: dh.hh in dh.hh +includes header: gf.hh in gf.hh +includes header: ggf.hh in ggf.hh +includes header: gh.hh in gh.hh +includes header: th.hh in th.hh diff --git a/Carpet/CarpetReduce/interface.ccl b/Carpet/CarpetReduce/interface.ccl index f479b5272..55c46f2d9 100644 --- a/Carpet/CarpetReduce/interface.ccl +++ b/Carpet/CarpetReduce/interface.ccl @@ -1,6 +1,12 @@ # Interface definition for thorn CarpetReduce -# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetReduce/interface.ccl,v 1.1 2001/12/11 13:08:56 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetReduce/interface.ccl,v 1.2 2003/06/18 18:28:07 schnetter Exp $ implements: reduce inherits: CarpetLib driver + +uses include header: carpet.hh + +uses include header: dist.hh + +uses include header: vect.hh diff --git a/Carpet/CarpetReduce/src/reduce.cc b/Carpet/CarpetReduce/src/reduce.cc index 3996385f1..ade35bdbd 100644 --- a/Carpet/CarpetReduce/src/reduce.cc +++ b/Carpet/CarpetReduce/src/reduce.cc @@ -1,4 +1,4 @@ -// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetReduce/src/reduce.cc,v 1.24 2003/06/18 18:24:28 schnetter Exp $ +// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetReduce/src/reduce.cc,v 1.25 2003/06/18 18:28:07 schnetter Exp $ #include <assert.h> #include <float.h> @@ -14,15 +14,15 @@ #include "cctk.h" -#include "Carpet/CarpetLib/src/dist.hh" -#include "Carpet/CarpetLib/src/vect.hh" +#include "dist.hh" +#include "vect.hh" -#include "Carpet/Carpet/src/carpet.hh" +#include "carpet.hh" #include "reduce.hh" extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetReduce/src/reduce.cc,v 1.24 2003/06/18 18:24:28 schnetter Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetReduce/src/reduce.cc,v 1.25 2003/06/18 18:28:07 schnetter Exp $"; CCTK_FILEVERSION(Carpet_CarpetReduce_reduce_cc); } diff --git a/Carpet/CarpetRegrid/interface.ccl b/Carpet/CarpetRegrid/interface.ccl index e7cd4978a..64166f788 100644 --- a/Carpet/CarpetRegrid/interface.ccl +++ b/Carpet/CarpetRegrid/interface.ccl @@ -1,8 +1,17 @@ # Interface definition for thorn CarpetRegrid -# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/interface.ccl,v 1.1 2001/12/14 16:34:38 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/interface.ccl,v 1.2 2003/06/18 18:28:07 schnetter Exp $ implements: CarpetRegrid inherits: CarpetLib driver uses include header: carpet.hh + +uses include header: defs.hh + +uses include header: bbox.hh +uses include header: bboxset.hh +uses include header: vect.hh + +uses include header: gf.hh +uses include header: gh.hh diff --git a/Carpet/CarpetRegrid/src/regrid.cc b/Carpet/CarpetRegrid/src/regrid.cc index f0403b0ba..50d8611a2 100644 --- a/Carpet/CarpetRegrid/src/regrid.cc +++ b/Carpet/CarpetRegrid/src/regrid.cc @@ -13,18 +13,18 @@ #include "cctk.h" #include "cctk_Parameters.h" -#include "Carpet/CarpetLib/src/bbox.hh" -#include "Carpet/CarpetLib/src/bboxset.hh" -#include "Carpet/CarpetLib/src/defs.hh" -#include "Carpet/CarpetLib/src/gh.hh" -#include "Carpet/CarpetLib/src/gf.hh" -#include "Carpet/CarpetLib/src/vect.hh" +#include "bbox.hh" +#include "bboxset.hh" +#include "defs.hh" +#include "gh.hh" +#include "gf.hh" +#include "vect.hh" #include "carpet.hh" #include "regrid.hh" extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/regrid.cc,v 1.23 2003/05/23 23:52:47 schnetter Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/regrid.cc,v 1.24 2003/06/18 18:28:07 schnetter Exp $"; CCTK_FILEVERSION(Carpet_CarpetRegrid_regrid_cc); } diff --git a/Carpet/CarpetRegrid/src/regrid.hh b/Carpet/CarpetRegrid/src/regrid.hh index 08663417c..05fcfc402 100644 --- a/Carpet/CarpetRegrid/src/regrid.hh +++ b/Carpet/CarpetRegrid/src/regrid.hh @@ -1,4 +1,4 @@ -// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/regrid.hh,v 1.8 2003/04/30 12:37:56 schnetter Exp $ +// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/regrid.hh,v 1.9 2003/06/18 18:28:07 schnetter Exp $ #ifndef CARPETREGRID_HH #define CARPETREGRID_HH @@ -7,8 +7,8 @@ #include "cctk.h" -#include "Carpet/CarpetLib/src/gf.hh" -#include "Carpet/CarpetLib/src/gh.hh" +#include "gf.hh" +#include "gh.hh" #include "carpet.hh" diff --git a/Carpet/CarpetSlab/interface.ccl b/Carpet/CarpetSlab/interface.ccl index 21754a3bb..f955b8c31 100644 --- a/Carpet/CarpetSlab/interface.ccl +++ b/Carpet/CarpetSlab/interface.ccl @@ -1,8 +1,20 @@ # Interface definition for thorn CarpetSlab -# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetSlab/interface.ccl,v 1.4 2002/10/24 21:11:53 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetSlab/interface.ccl,v 1.5 2003/06/18 18:28:08 schnetter Exp $ implements: Hyperslab inherits: CarpetLib driver includes header: slab.h in Hyperslab.h + +uses include header: carpet.hh + +uses include header: bbox.hh +uses include header: bboxset.hh +uses include header: vect.hh + +uses include header: gdata.hh + +uses include header: dh.hh +uses include header: ggf.hh +uses include header: gh.hh diff --git a/Carpet/CarpetSlab/src/slab.cc b/Carpet/CarpetSlab/src/slab.cc index 6f522d671..3803c72d1 100644 --- a/Carpet/CarpetSlab/src/slab.cc +++ b/Carpet/CarpetSlab/src/slab.cc @@ -1,4 +1,4 @@ -// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetSlab/src/slab.cc,v 1.9 2003/06/18 18:24:28 schnetter Exp $ +// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetSlab/src/slab.cc,v 1.10 2003/06/18 18:28:08 schnetter Exp $ #include <assert.h> #include <stdlib.h> @@ -8,20 +8,20 @@ #include "cctk.h" -#include "Carpet/CarpetLib/src/bbox.hh" -#include "Carpet/CarpetLib/src/bboxset.hh" -#include "Carpet/CarpetLib/src/dh.hh" -#include "Carpet/CarpetLib/src/gdata.hh" -#include "Carpet/CarpetLib/src/gh.hh" -#include "Carpet/CarpetLib/src/ggf.hh" -#include "Carpet/CarpetLib/src/vect.hh" +#include "bbox.hh" +#include "bboxset.hh" +#include "dh.hh" +#include "gdata.hh" +#include "gh.hh" +#include "ggf.hh" +#include "vect.hh" -#include "Carpet/Carpet/src/carpet.hh" +#include "carpet.hh" #include "slab.hh" extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetSlab/src/slab.cc,v 1.9 2003/06/18 18:24:28 schnetter Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetSlab/src/slab.cc,v 1.10 2003/06/18 18:28:08 schnetter Exp $"; CCTK_FILEVERSION(Carpet_CarpetSlab_slab_cc); } diff --git a/CarpetAttic/CarpetIOFlexIO/interface.ccl b/CarpetAttic/CarpetIOFlexIO/interface.ccl index 2f3fe51e0..21cb215fa 100644 --- a/CarpetAttic/CarpetIOFlexIO/interface.ccl +++ b/CarpetAttic/CarpetIOFlexIO/interface.ccl @@ -1,8 +1,16 @@ # Interface definition for thorn CarpetIOFlexIO -# $Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIO/interface.ccl,v 1.3 2001/07/12 06:11:06 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIO/interface.ccl,v 1.4 2003/06/18 18:28:07 schnetter Exp $ implements: IOFlexIO inherits: CarpetLib driver Hyperslab uses include header: carpet.hh + +uses include header: bbox.hh +uses include header: vect.hh + +uses include header: data.hh +uses include header: gdata.hh + +uses include header: ggf.hh diff --git a/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc b/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc index b58557176..f6b596666 100644 --- a/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc +++ b/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc @@ -23,18 +23,18 @@ #include "CactusBase/IOUtil/src/ioGH.h" -#include "Carpet/CarpetLib/src/bbox.hh" -#include "Carpet/CarpetLib/src/data.hh" -#include "Carpet/CarpetLib/src/gdata.hh" -#include "Carpet/CarpetLib/src/ggf.hh" -#include "Carpet/CarpetLib/src/vect.hh" +#include "bbox.hh" +#include "data.hh" +#include "gdata.hh" +#include "ggf.hh" +#include "vect.hh" #include "carpet.hh" #include "ioflexio.hh" extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc,v 1.26 2003/06/18 18:24:28 schnetter Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc,v 1.27 2003/06/18 18:28:07 schnetter Exp $"; CCTK_FILEVERSION(Carpet_CarpetIOFlexIO_ioflexio_cc); } diff --git a/CarpetAttic/CarpetIOFlexIOCheckpoint/interface.ccl b/CarpetAttic/CarpetIOFlexIOCheckpoint/interface.ccl index 6944ca62a..48f2fee82 100644 --- a/CarpetAttic/CarpetIOFlexIOCheckpoint/interface.ccl +++ b/CarpetAttic/CarpetIOFlexIOCheckpoint/interface.ccl @@ -1,8 +1,16 @@ # Interface definition for thorn CarpetIOFlexIO -# $Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIOCheckpoint/interface.ccl,v 1.1 2003/05/16 14:02:18 hawke Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIOCheckpoint/interface.ccl,v 1.2 2003/06/18 18:28:07 schnetter Exp $ implements: IOFlexIO inherits: CarpetLib driver Hyperslab uses include header: carpet.hh + +uses include header: bbox.hh +uses include header: vect.hh + +uses include header: data.hh +uses include header: gdata.hh + +uses include header: ggf.hh diff --git a/CarpetAttic/CarpetIOFlexIOCheckpoint/src/checkpointrestart.cc b/CarpetAttic/CarpetIOFlexIOCheckpoint/src/checkpointrestart.cc index 3c928787f..93b08ef47 100644 --- a/CarpetAttic/CarpetIOFlexIOCheckpoint/src/checkpointrestart.cc +++ b/CarpetAttic/CarpetIOFlexIOCheckpoint/src/checkpointrestart.cc @@ -32,23 +32,22 @@ #include "CactusBase/IOUtil/src/ioGH.h" - -#include "Carpet/CarpetLib/src/bbox.hh" -#include "Carpet/CarpetLib/src/data.hh" -#include "Carpet/CarpetLib/src/gdata.hh" -#include "Carpet/CarpetLib/src/ggf.hh" -#include "Carpet/CarpetLib/src/vect.hh" -#include "CactusBase/IOUtil/src/ioGH.h" #include "CactusBase/IOUtil/src/ioutil_CheckpointRecovery.h" #include "CactusBase/IOUtil/src/ioutil_Utils.h" +#include "bbox.hh" +#include "data.hh" +#include "gdata.hh" +#include "ggf.hh" +#include "vect.hh" + //#include "StoreNamedData.h" #include "carpet.hh" #include "ioflexio.hh" extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIOCheckpoint/src/checkpointrestart.cc,v 1.3 2003/06/18 18:24:28 schnetter Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIOCheckpoint/src/checkpointrestart.cc,v 1.4 2003/06/18 18:28:07 schnetter Exp $"; CCTK_FILEVERSION(Carpet_CarpetIOFlexIO_checkpointrestart_cc); } diff --git a/CarpetAttic/CarpetIOFlexIOCheckpoint/src/ioflexio.cc b/CarpetAttic/CarpetIOFlexIOCheckpoint/src/ioflexio.cc index 0806e1ea0..fa572180d 100644 --- a/CarpetAttic/CarpetIOFlexIOCheckpoint/src/ioflexio.cc +++ b/CarpetAttic/CarpetIOFlexIOCheckpoint/src/ioflexio.cc @@ -32,18 +32,18 @@ #include "CactusBase/IOUtil/src/ioGH.h" -#include "Carpet/CarpetLib/src/bbox.hh" -#include "Carpet/CarpetLib/src/data.hh" -#include "Carpet/CarpetLib/src/gdata.hh" -#include "Carpet/CarpetLib/src/ggf.hh" -#include "Carpet/CarpetLib/src/vect.hh" +#include "bbox.hh" +#include "data.hh" +#include "gdata.hh" +#include "ggf.hh" +#include "vect.hh" #include "carpet.hh" #include "ioflexio.hh" extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIOCheckpoint/src/ioflexio.cc,v 1.2 2003/06/18 18:24:28 schnetter Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIOCheckpoint/src/ioflexio.cc,v 1.3 2003/06/18 18:28:07 schnetter Exp $"; CCTK_FILEVERSION(Carpet_CarpetIOFlexIO_ioflexio_cc); } |