diff options
author | schnetter <> | 2002-03-26 12:22:00 +0000 |
---|---|---|
committer | schnetter <> | 2002-03-26 12:22:00 +0000 |
commit | 6608429cdf7fe663b485204b292b163979c6dce2 (patch) | |
tree | f190e1eaf9419401d6c7ac9535ff65f2790500f2 | |
parent | 6597a97dd2dbee2fec4a83dc831af3a0db072017 (diff) |
Added CCTK_FILEVERSION macros.
darcs-hash:20020326122225-07bb3-0c7746df97fb64f00918be1bee33191fb9d44b0b.gz
-rw-r--r-- | Carpet/Carpet/src/CallFunction.cc | 4 | ||||
-rw-r--r-- | Carpet/Carpet/src/CarpetParamCheck.cc | 4 | ||||
-rw-r--r-- | Carpet/Carpet/src/CarpetStartup.cc | 4 | ||||
-rw-r--r-- | Carpet/Carpet/src/Checksum.cc | 4 | ||||
-rw-r--r-- | Carpet/Carpet/src/Comm.cc | 4 | ||||
-rw-r--r-- | Carpet/Carpet/src/Cycle.cc | 4 | ||||
-rw-r--r-- | Carpet/Carpet/src/Evolve.cc | 4 | ||||
-rw-r--r-- | Carpet/Carpet/src/Initialise.cc | 4 | ||||
-rw-r--r-- | Carpet/Carpet/src/Poison.cc | 4 | ||||
-rw-r--r-- | Carpet/Carpet/src/Recompose.cc | 4 | ||||
-rw-r--r-- | Carpet/Carpet/src/Restrict.cc | 4 | ||||
-rw-r--r-- | Carpet/Carpet/src/SetupGH.cc | 4 | ||||
-rw-r--r-- | Carpet/Carpet/src/Shutdown.cc | 4 | ||||
-rw-r--r-- | Carpet/Carpet/src/Storage.cc | 4 | ||||
-rw-r--r-- | Carpet/Carpet/src/helpers.cc | 4 | ||||
-rw-r--r-- | Carpet/Carpet/src/variables.cc | 4 | ||||
-rw-r--r-- | Carpet/CarpetIOASCII/src/ioascii.cc | 5 | ||||
-rw-r--r-- | Carpet/CarpetReduce/src/reduce.cc | 6 | ||||
-rw-r--r-- | Carpet/CarpetRegrid/src/regrid.cc | 32 | ||||
-rw-r--r-- | Carpet/CarpetSlab/src/carpetslab.cc | 6 | ||||
-rw-r--r-- | CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc | 4 |
21 files changed, 93 insertions, 24 deletions
diff --git a/Carpet/Carpet/src/CallFunction.cc b/Carpet/Carpet/src/CallFunction.cc index bedb71c05..1b09e89b6 100644 --- a/Carpet/Carpet/src/CallFunction.cc +++ b/Carpet/Carpet/src/CallFunction.cc @@ -8,7 +8,9 @@ #include "carpet.hh" -static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/CallFunction.cc,v 1.2 2002/01/02 17:14:08 schnetter Exp $"; +static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/CallFunction.cc,v 1.3 2002/03/26 13:22:25 schnetter Exp $"; + +CCTK_FILEVERSION(Carpet_CallFunction_cc) diff --git a/Carpet/Carpet/src/CarpetParamCheck.cc b/Carpet/Carpet/src/CarpetParamCheck.cc index 82bbac64f..14a6264ef 100644 --- a/Carpet/Carpet/src/CarpetParamCheck.cc +++ b/Carpet/Carpet/src/CarpetParamCheck.cc @@ -8,7 +8,9 @@ #include "carpet.hh" -static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/CarpetParamCheck.cc,v 1.3 2002/03/23 20:20:54 schnetter Exp $"; +static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/CarpetParamCheck.cc,v 1.4 2002/03/26 13:22:26 schnetter Exp $"; + +CCTK_FILEVERSION(Carpet_CarpetParamCheck_cc) diff --git a/Carpet/Carpet/src/CarpetStartup.cc b/Carpet/Carpet/src/CarpetStartup.cc index dd3a47ff8..9b5b37505 100644 --- a/Carpet/Carpet/src/CarpetStartup.cc +++ b/Carpet/Carpet/src/CarpetStartup.cc @@ -5,7 +5,9 @@ #include "carpet.hh" -static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/CarpetStartup.cc,v 1.2 2001/07/09 09:00:04 schnetter Exp $"; +static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/CarpetStartup.cc,v 1.3 2002/03/26 13:22:26 schnetter Exp $"; + +CCTK_FILEVERSION(Carpet_CarpetStartup_cc) diff --git a/Carpet/Carpet/src/Checksum.cc b/Carpet/Carpet/src/Checksum.cc index fc03c7893..17027c812 100644 --- a/Carpet/Carpet/src/Checksum.cc +++ b/Carpet/Carpet/src/Checksum.cc @@ -8,7 +8,9 @@ #include "carpet.hh" -static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Checksum.cc,v 1.5 2002/01/02 17:14:08 schnetter Exp $"; +static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Checksum.cc,v 1.6 2002/03/26 13:22:26 schnetter Exp $"; + +CCTK_FILEVERSION(Carpet_Checksum_cc) diff --git a/Carpet/Carpet/src/Comm.cc b/Carpet/Carpet/src/Comm.cc index 5fc0b056b..7fb9183d0 100644 --- a/Carpet/Carpet/src/Comm.cc +++ b/Carpet/Carpet/src/Comm.cc @@ -9,7 +9,9 @@ #include "carpet.hh" -static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Comm.cc,v 1.7 2002/01/09 17:45:39 schnetter Exp $"; +static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Comm.cc,v 1.8 2002/03/26 13:22:26 schnetter Exp $"; + +CCTK_FILEVERSION(Carpet_Comm_cc) diff --git a/Carpet/Carpet/src/Cycle.cc b/Carpet/Carpet/src/Cycle.cc index 2b7f2bf86..25aa4cf1a 100644 --- a/Carpet/Carpet/src/Cycle.cc +++ b/Carpet/Carpet/src/Cycle.cc @@ -8,7 +8,9 @@ #include "carpet.hh" -static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Cycle.cc,v 1.4 2001/11/05 17:53:01 schnetter Exp $"; +static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Cycle.cc,v 1.5 2002/03/26 13:22:26 schnetter Exp $"; + +CCTK_FILEVERSION(Carpet_Cycle_cc) diff --git a/Carpet/Carpet/src/Evolve.cc b/Carpet/Carpet/src/Evolve.cc index d2e4ca5d1..7a46df5e4 100644 --- a/Carpet/Carpet/src/Evolve.cc +++ b/Carpet/Carpet/src/Evolve.cc @@ -9,7 +9,9 @@ #include "carpet.hh" -static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Evolve.cc,v 1.9 2002/01/11 17:19:45 schnetter Exp $"; +static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Evolve.cc,v 1.10 2002/03/26 13:22:26 schnetter Exp $"; + +CCTK_FILEVERSION(Carpet_Evolve_cc) diff --git a/Carpet/Carpet/src/Initialise.cc b/Carpet/Carpet/src/Initialise.cc index 36a44aa03..005a12991 100644 --- a/Carpet/Carpet/src/Initialise.cc +++ b/Carpet/Carpet/src/Initialise.cc @@ -9,7 +9,9 @@ #include "carpet.hh" -static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Initialise.cc,v 1.8 2002/01/14 16:40:45 schnetter Exp $"; +static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Initialise.cc,v 1.9 2002/03/26 13:22:27 schnetter Exp $"; + +CCTK_FILEVERSION(Carpet_Initialise_cc) diff --git a/Carpet/Carpet/src/Poison.cc b/Carpet/Carpet/src/Poison.cc index b211bb3a3..2d876be7c 100644 --- a/Carpet/Carpet/src/Poison.cc +++ b/Carpet/Carpet/src/Poison.cc @@ -7,7 +7,9 @@ #include "carpet.hh" -static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Poison.cc,v 1.5 2002/01/02 17:14:08 schnetter Exp $"; +static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Poison.cc,v 1.6 2002/03/26 13:22:27 schnetter Exp $"; + +CCTK_FILEVERSION(Carpet_Poison_cc) diff --git a/Carpet/Carpet/src/Recompose.cc b/Carpet/Carpet/src/Recompose.cc index 78e569d49..ee0a443a6 100644 --- a/Carpet/Carpet/src/Recompose.cc +++ b/Carpet/Carpet/src/Recompose.cc @@ -21,7 +21,9 @@ #include "carpet.hh" -static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Recompose.cc,v 1.22 2002/03/23 20:20:54 schnetter Exp $"; +static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Recompose.cc,v 1.23 2002/03/26 13:22:27 schnetter Exp $"; + +CCTK_FILEVERSION(Carpet_Recompose_cc) diff --git a/Carpet/Carpet/src/Restrict.cc b/Carpet/Carpet/src/Restrict.cc index 7dfa8b372..a10187ec4 100644 --- a/Carpet/Carpet/src/Restrict.cc +++ b/Carpet/Carpet/src/Restrict.cc @@ -8,7 +8,9 @@ #include "carpet.hh" -static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Restrict.cc,v 1.6 2002/01/09 17:45:39 schnetter Exp $"; +static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Restrict.cc,v 1.7 2002/03/26 13:22:27 schnetter Exp $"; + +CCTK_FILEVERSION(Carpet_Restrict_cc) diff --git a/Carpet/Carpet/src/SetupGH.cc b/Carpet/Carpet/src/SetupGH.cc index e6a960ce6..80c4514a1 100644 --- a/Carpet/Carpet/src/SetupGH.cc +++ b/Carpet/Carpet/src/SetupGH.cc @@ -15,7 +15,9 @@ #include "carpet.hh" -static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/SetupGH.cc,v 1.25 2002/03/23 20:20:55 schnetter Exp $"; +static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/SetupGH.cc,v 1.26 2002/03/26 13:22:27 schnetter Exp $"; + +CCTK_FILEVERSION(Carpet_SetupGH_cc) diff --git a/Carpet/Carpet/src/Shutdown.cc b/Carpet/Carpet/src/Shutdown.cc index 78b6e5bc3..aa2dc05b5 100644 --- a/Carpet/Carpet/src/Shutdown.cc +++ b/Carpet/Carpet/src/Shutdown.cc @@ -9,7 +9,9 @@ #include "carpet.hh" -static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Shutdown.cc,v 1.5 2002/01/09 21:15:10 schnetter Exp $"; +static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Shutdown.cc,v 1.6 2002/03/26 13:22:27 schnetter Exp $"; + +CCTK_FILEVERSION(Carpet_Shutdown_cc) diff --git a/Carpet/Carpet/src/Storage.cc b/Carpet/Carpet/src/Storage.cc index 7c9584216..36fde6994 100644 --- a/Carpet/Carpet/src/Storage.cc +++ b/Carpet/Carpet/src/Storage.cc @@ -9,7 +9,9 @@ #include "carpet.hh" -static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Storage.cc,v 1.9 2002/03/23 20:20:55 schnetter Exp $"; +static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Storage.cc,v 1.10 2002/03/26 13:22:27 schnetter Exp $"; + +CCTK_FILEVERSION(Carpet_Storage_cc) diff --git a/Carpet/Carpet/src/helpers.cc b/Carpet/Carpet/src/helpers.cc index a2046a198..0bcb92dd0 100644 --- a/Carpet/Carpet/src/helpers.cc +++ b/Carpet/Carpet/src/helpers.cc @@ -12,7 +12,9 @@ #include "carpet.hh" -static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/helpers.cc,v 1.19 2002/03/11 13:17:11 schnetter Exp $"; +static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/helpers.cc,v 1.20 2002/03/26 13:22:28 schnetter Exp $"; + +CCTK_FILEVERSION(Carpet_helpers_cc) diff --git a/Carpet/Carpet/src/variables.cc b/Carpet/Carpet/src/variables.cc index 23c637099..c2d5d9bc6 100644 --- a/Carpet/Carpet/src/variables.cc +++ b/Carpet/Carpet/src/variables.cc @@ -5,7 +5,9 @@ #include "carpet.hh" -static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/variables.cc,v 1.6 2002/01/09 21:15:11 schnetter Exp $"; +static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/variables.cc,v 1.7 2002/03/26 13:22:28 schnetter Exp $"; + +CCTK_FILEVERSION(Carpet_variables_cc) diff --git a/Carpet/CarpetIOASCII/src/ioascii.cc b/Carpet/CarpetIOASCII/src/ioascii.cc index 27d760e81..03d427da1 100644 --- a/Carpet/CarpetIOASCII/src/ioascii.cc +++ b/Carpet/CarpetIOASCII/src/ioascii.cc @@ -1,6 +1,7 @@ #include <alloca.h> #include <assert.h> #include <limits.h> +#include <math.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -27,7 +28,9 @@ #include "ioascii.hh" -static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOASCII/src/ioascii.cc,v 1.29 2002/01/11 17:19:46 schnetter Exp $"; +static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOASCII/src/ioascii.cc,v 1.30 2002/03/26 13:22:28 schnetter Exp $"; + +CCTK_FILEVERSION(CarpetIOASCII_ioascii_cc) diff --git a/Carpet/CarpetReduce/src/reduce.cc b/Carpet/CarpetReduce/src/reduce.cc index d6b408bd3..41b4a50e0 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.6 2002/03/11 15:09:41 schnetter Exp $ +// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetReduce/src/reduce.cc,v 1.7 2002/03/26 13:22:30 schnetter Exp $ #include <assert.h> #include <limits.h> @@ -17,7 +17,9 @@ #include "reduce.hh" -static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetReduce/src/reduce.cc,v 1.6 2002/03/11 15:09:41 schnetter Exp $"; +static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetReduce/src/reduce.cc,v 1.7 2002/03/26 13:22:30 schnetter Exp $"; + +CCTK_FILEVERSION(CarpetReduce_reduce_cc) diff --git a/Carpet/CarpetRegrid/src/regrid.cc b/Carpet/CarpetRegrid/src/regrid.cc index 0e53e6d6b..80ec139fa 100644 --- a/Carpet/CarpetRegrid/src/regrid.cc +++ b/Carpet/CarpetRegrid/src/regrid.cc @@ -22,9 +22,13 @@ #include "carpet.hh" #include "regrid.hh" -static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/regrid.cc,v 1.12 2002/03/23 20:20:57 schnetter Exp $"; +static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/regrid.cc,v 1.13 2002/03/26 13:22:31 schnetter Exp $"; -CCTK_FILEVERSION(Carpet_regrid_cc) +CCTK_FILEVERSION(CarpetRegrid_regrid_cc) + + + +#undef AUTOMATIC_BOUNDARIES @@ -170,7 +174,11 @@ namespace CarpetRegrid { abort(); } +#ifdef AUTOMATIC_BOUNDARIES + assert (obl.size() == 0); +#else assert (bbl.size() == obl.size()); +#endif // transform bbox list into bbox vector vector<ibbox> bbs; @@ -180,6 +188,23 @@ namespace CarpetRegrid { ++it) { bbs.push_back (*it); } +#ifdef AUTOMATIC_BOUNDARIES + vector<bvect> obs; + obs.resize (bbs.size()); + for (int c=0; c<(int)bbs.size(); ++c) { + ivect extlo = hh->baseextent.lower(); + ivect extup = hh->baseextent.upper(); + ivect str = bbs[c].stride(); + for (int d=0; d<dim; ++d) { + // Decide what is an outer boundary. + // Allow it to be one grid point to the interior. + assert (bbs[c].lower()[d] >= extlo[d]); + obs[c][d][0] = bbs[c].lower()[d] <= extlo[d] + str[d]; + assert (bbs[c].upper()[d] <= extup[d]); + obs[c][d][1] = bbs[c].upper()[d] >= extup[d] - str[d]; + } + } +#else vector<bvect> obs; obs.reserve (obl.size()); for (list<bvect>::const_iterator it = obl.begin(); @@ -187,6 +212,9 @@ namespace CarpetRegrid { ++it) { obs.push_back (*it); } +#endif + + // TODO: ensure nesting properties diff --git a/Carpet/CarpetSlab/src/carpetslab.cc b/Carpet/CarpetSlab/src/carpetslab.cc index a2999ad6c..ab7da921f 100644 --- a/Carpet/CarpetSlab/src/carpetslab.cc +++ b/Carpet/CarpetSlab/src/carpetslab.cc @@ -1,4 +1,4 @@ -// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetSlab/src/Attic/carpetslab.cc,v 1.12 2002/03/23 20:20:58 schnetter Exp $ +// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetSlab/src/Attic/carpetslab.cc,v 1.13 2002/03/26 13:22:32 schnetter Exp $ #include <alloca.h> #include <assert.h> @@ -19,7 +19,9 @@ #include "carpetslab.hh" -static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetSlab/src/Attic/carpetslab.cc,v 1.12 2002/03/23 20:20:58 schnetter Exp $"; +static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetSlab/src/Attic/carpetslab.cc,v 1.13 2002/03/26 13:22:32 schnetter Exp $"; + +CCTK_FILEVERSION(CarpetSlab_carpetslab_cc) diff --git a/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc b/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc index bf9610059..8d564964c 100644 --- a/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc +++ b/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc @@ -33,7 +33,9 @@ #include "ioflexio.hh" -static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc,v 1.15 2002/01/14 14:59:26 schnetter Exp $"; +static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc,v 1.16 2002/03/26 13:22:29 schnetter Exp $"; + +CCTK_FILEVERSION(CarpetIOFlexIO_ioflexio_cc) |