diff options
| author | Erik Schnetter <schnetter@aei.mpg.de> | 2005-01-01 18:22:00 +0000 |
|---|---|---|
| committer | Erik Schnetter <schnetter@aei.mpg.de> | 2005-01-01 18:22:00 +0000 |
| commit | 2a38d7eb6a6db8b150a9f6fd5f1c844b8d0ef74a (patch) | |
| tree | 1c5e763b0ffee9744ee708d6016bdbd36b8f8312 /Carpet/Carpet/src/Storage.cc | |
| parent | 049cec8e042a508511fdb0f0948de63f84f9b8be (diff) | |
global: Turn CarpetLib templates into classes
Turn most of the templates in CarpetLib, which used to have the form
template<int D> class XXX
into classes, i.e., into something like
class XXX
by setting D to the new global integer constant dim, which in turn is set to 3.
The templates gf and data, which used to be of the form
template<typename T, int D> class XXX
are now of the form
template<typename T> class XXX
The templates vect, bbox, and bboxset remain templates.
This change simplifies the code somewhat.
darcs-hash:20050101182234-891bb-c3063528841f0d078b12cc506309ea27d8ce730d.gz
Diffstat (limited to 'Carpet/Carpet/src/Storage.cc')
| -rw-r--r-- | Carpet/Carpet/src/Storage.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Carpet/Carpet/src/Storage.cc b/Carpet/Carpet/src/Storage.cc index 79f9d3f30..9a07dee7b 100644 --- a/Carpet/Carpet/src/Storage.cc +++ b/Carpet/Carpet/src/Storage.cc @@ -85,7 +85,7 @@ namespace Carpet { for (int m=0; m<(int)arrdata.at(group).size(); ++m) { for (int var=0; var<CCTK_NumVarsInGroupI(group); ++var) { const int vectorindex = gp.vectorgroup ? var % vectorlength : 0; - ggf<dim>* vectorleader + ggf* vectorleader = (gp.vectorgroup && vectorindex>0 ? arrdata.at(group).at(m).data.at(var - vectorindex) : NULL); @@ -93,11 +93,11 @@ namespace Carpet { switch (CCTK_VarTypeI(n)) { #define TYPECASE(N,T) \ case N: \ - arrdata.at(group).at(m).data.at(var) = new gf<T,dim> \ + arrdata.at(group).at(m).data.at(var) = new gf<T> \ (n, groupdata.at(group).transport_operator, \ *arrdata.at(group).at(m).tt, *arrdata.at(group).at(m).dd, \ tmin, tmax, prolongation_order_time, \ - vectorlength, vectorindex, (gf<T,dim>*)vectorleader); \ + vectorlength, vectorindex, (gf<T>*)vectorleader); \ break; #include "typecase" #undef TYPECASE @@ -156,7 +156,7 @@ namespace Carpet { #define TYPECASE(N,T) \ case N: \ assert (arrdata.at(group).at(m).data.at(var)); \ - delete (gf<T,dim>*)arrdata.at(group).at(m).data.at(var); \ + delete (gf<T>*)arrdata.at(group).at(m).data.at(var); \ arrdata.at(group).at(m).data.at(var) = NULL; \ break; #include "typecase" |