diff options
| -rw-r--r-- | Carpet/Carpet/src/Recompose.cc | 4 | ||||
| -rw-r--r-- | Carpet/Carpet/src/SetupGH.cc | 8 | ||||
| -rw-r--r-- | Carpet/Carpet/src/Storage.cc | 7 | ||||
| -rw-r--r-- | Carpet/Carpet/src/carpet_public.hh | 3 |
4 files changed, 14 insertions, 8 deletions
diff --git a/Carpet/Carpet/src/Recompose.cc b/Carpet/Carpet/src/Recompose.cc index 4cc1b1439..a9a53097d 100644 --- a/Carpet/Carpet/src/Recompose.cc +++ b/Carpet/Carpet/src/Recompose.cc @@ -26,7 +26,7 @@ #include "carpet.hh" extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Recompose.cc,v 1.44 2003/08/27 11:00:43 schnetter Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Recompose.cc,v 1.45 2003/09/19 16:08:37 schnetter Exp $"; CCTK_FILEVERSION(Carpet_Carpet_Recompose_cc); } @@ -574,7 +574,7 @@ namespace Carpet { assert (ncomps > 0); vector<int> mysize(nslices); for (int c=0; c<nslices; ++c) { - mysize[c] = bbs[c].num_points(); + mysize[c] = bbs[c].size(); } vector<int> mynprocs(nslices); { diff --git a/Carpet/Carpet/src/SetupGH.cc b/Carpet/Carpet/src/SetupGH.cc index 0fd45e49d..89d73343e 100644 --- a/Carpet/Carpet/src/SetupGH.cc +++ b/Carpet/Carpet/src/SetupGH.cc @@ -20,7 +20,7 @@ #include "carpet.hh" extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/SetupGH.cc,v 1.52 2003/08/15 09:34:36 schnetter Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/SetupGH.cc,v 1.53 2003/09/19 16:08:37 schnetter Exp $"; CCTK_FILEVERSION(Carpet_Carpet_SetupGH_cc); } @@ -183,12 +183,12 @@ namespace Carpet { } // Sanity check // (if this fails, someone requested an insane amount of memory) - assert (all(npoints <= INT_MAX / maxreflevelfact)); + assert (all(npoints <= INT_MAX)); { int max = INT_MAX; for (int d=0; d<dim; ++d) { - assert (npoints[d] * maxreflevelfact <= max); - max /= npoints[d] * maxreflevelfact; + assert (npoints[d] <= max); + max /= npoints[d]; } } diff --git a/Carpet/Carpet/src/Storage.cc b/Carpet/Carpet/src/Storage.cc index 128abf2df..344be658a 100644 --- a/Carpet/Carpet/src/Storage.cc +++ b/Carpet/Carpet/src/Storage.cc @@ -10,7 +10,7 @@ #include "carpet.hh" extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Storage.cc,v 1.26 2003/08/10 21:59:51 schnetter Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Storage.cc,v 1.27 2003/09/19 16:08:37 schnetter Exp $"; CCTK_FILEVERSION(Carpet_Carpet_Storage_cc); } @@ -92,6 +92,8 @@ namespace Carpet { } } + // VGF: allocate + assert (arrdata[group].data.size()==0 || arrdata[group].data[0] == 0); assert ((int)arrdata[group].data.size() == CCTK_NumVarsInGroupI(group)); @@ -101,6 +103,7 @@ namespace Carpet { #define TYPECASE(N,T) \ case N: \ assert (! arrdata[group].data[var]); \ + /* VGF */ \ arrdata[group].data[var] = new gf<T,dim> \ (CCTK_VarName(n), *arrdata[group].tt, *arrdata[group].dd, \ tmin, tmax, my_prolongation_order_time); \ @@ -177,6 +180,8 @@ namespace Carpet { } } // for + // VGF: free + // storage was not disabled previously return 1; } diff --git a/Carpet/Carpet/src/carpet_public.hh b/Carpet/Carpet/src/carpet_public.hh index 4fa5fd32f..4f22311e3 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.35 2003/08/10 21:59:51 schnetter Exp $ +// $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/carpet_public.hh,v 1.36 2003/09/19 16:08:37 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 @@ -98,6 +98,7 @@ namespace Carpet { dh<dim>* dd; vector<ggf<dim>*> data; // [var] bool do_transfer; // prolongate and restrict + // VGF }; extern vector<arrdesc> arrdata; // [group] |