diff options
Diffstat (limited to 'Carpet/CarpetSlab')
| -rw-r--r-- | Carpet/CarpetSlab/src/GetHyperslab.cc | 16 | ||||
| -rw-r--r-- | Carpet/CarpetSlab/src/slab.cc | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/Carpet/CarpetSlab/src/GetHyperslab.cc b/Carpet/CarpetSlab/src/GetHyperslab.cc index c84691e6e..c22e0b1b4 100644 --- a/Carpet/CarpetSlab/src/GetHyperslab.cc +++ b/Carpet/CarpetSlab/src/GetHyperslab.cc @@ -107,9 +107,9 @@ namespace CarpetSlab { // } // Get insider information about variable - const gh<dim>* myhh; - const dh<dim>* mydd; - const ggf<dim>* myff; + const gh* myhh; + const dh* mydd; + const ggf* myff; assert (group < (int)arrdata.size()); myhh = arrdata.at(group).at(m).hh; assert (myhh); @@ -141,7 +141,7 @@ namespace CarpetSlab { } // Get sample data - const gdata<dim>* mydata; + const gdata* mydata; mydata = (*myff)(tl, rl, 0, 0); // Stride of data in memory @@ -171,13 +171,13 @@ namespace CarpetSlab { // Create collector data object void* myhdata = rank==collect_proc ? hdata : 0; - gdata<dim>* const alldata = mydata->make_typed(-1); + gdata* const alldata = mydata->make_typed(-1); alldata->allocate (hextent, collect_proc, myhdata); // Done with the temporary stuff mydata = 0; - for (comm_state<dim> state; !state.done(); state.step()) { + for (comm_state state; !state.done(); state.step()) { // Loop over all components, copying data from them BEGIN_LOCAL_COMPONENT_LOOP (cgh, gp.grouptype) { @@ -207,8 +207,8 @@ namespace CarpetSlab { // Copy result to all processors if (dest_proc == -1) { - vector<gdata<dim>*> tmpdata(CCTK_nProcs(cgh)); - vector<comm_state<dim> > state; + vector<gdata*> tmpdata(CCTK_nProcs(cgh)); + vector<comm_state> state; for (int proc=0; proc<CCTK_nProcs(cgh); ++proc) { if (proc != collect_proc) { diff --git a/Carpet/CarpetSlab/src/slab.cc b/Carpet/CarpetSlab/src/slab.cc index ad111617a..9ca04ae6a 100644 --- a/Carpet/CarpetSlab/src/slab.cc +++ b/Carpet/CarpetSlab/src/slab.cc @@ -131,9 +131,9 @@ namespace CarpetSlab { } // Get insider information about variable - const gh<dim>* myhh; - const dh<dim>* mydd; - const ggf<dim>* myff; + const gh* myhh; + const dh* mydd; + const ggf* myff; assert (group < (int)arrdata.size()); myhh = arrdata.at(group).at(m).hh; assert (myhh); @@ -173,7 +173,7 @@ namespace CarpetSlab { } // Get sample data - const gdata<dim>* mydata; + const gdata* mydata; mydata = (*myff)(tl, rl, 0, 0); // Stride of data in memory @@ -203,13 +203,13 @@ namespace CarpetSlab { // Create collector data object void* myhdata = rank==collect_proc ? hdata : 0; - gdata<dim>* const alldata = mydata->make_typed(-1); + gdata* const alldata = mydata->make_typed(-1); alldata->allocate (hextent, collect_proc, myhdata); // Done with the temporary stuff mydata = 0; - for (comm_state<dim> state; !state.done(); state.step()) { + for (comm_state state; !state.done(); state.step()) { // Loop over all components, copying data from them BEGIN_LOCAL_COMPONENT_LOOP (cgh, gp.grouptype) { @@ -239,8 +239,8 @@ namespace CarpetSlab { // Copy result to all processors if (dest_proc == -1) { - vector<gdata<dim>*> tmpdata(CCTK_nProcs(cgh)); - vector<comm_state<dim> > state; + vector<gdata*> tmpdata(CCTK_nProcs(cgh)); + vector<comm_state> state; for (int proc=0; proc<CCTK_nProcs(cgh); ++proc) { if (proc != collect_proc) { |