diff options
Diffstat (limited to 'Carpet/CarpetIOHDF5')
| -rw-r--r-- | Carpet/CarpetIOHDF5/src/iohdf5.cc | 14 | ||||
| -rw-r--r-- | Carpet/CarpetIOHDF5/src/iohdf5chckpt_recover.cc | 10 |
2 files changed, 12 insertions, 12 deletions
diff --git a/Carpet/CarpetIOHDF5/src/iohdf5.cc b/Carpet/CarpetIOHDF5/src/iohdf5.cc index d0978bc0b..b7291a2c0 100644 --- a/Carpet/CarpetIOHDF5/src/iohdf5.cc +++ b/Carpet/CarpetIOHDF5/src/iohdf5.cc @@ -17,7 +17,7 @@ #include "cctk_Parameters.h" extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOHDF5/src/iohdf5.cc,v 1.21 2004/03/22 11:54:02 cott Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOHDF5/src/iohdf5.cc,v 1.22 2004/03/23 19:30:14 schnetter Exp $"; CCTK_FILEVERSION(Carpet_CarpetIOHDF5_iohdf5_cc); } @@ -313,7 +313,7 @@ namespace CarpetIOHDF5 { tmp->allocate (ext, 0); if ( !((cgdata.disttype == CCTK_DISTRIB_CONSTANT) && - (arrdata[group][Carpet::map].hh->processors[reflevel][component]!=0))) { + (arrdata.at(group).at(Carpet::map).hh->processors.at(reflevel).at(component)!=0))) { if (cgdata.disttype == CCTK_DISTRIB_CONSTANT) { assert(grouptype == CCTK_ARRAY || grouptype == CCTK_SCALAR); @@ -757,8 +757,8 @@ namespace CarpetIOHDF5 { if (h5verbose) cout << "CCTK_DISTRIB_CONSTANT: " << varname << endl; assert(grouptype == CCTK_ARRAY || grouptype == CCTK_SCALAR); if (grouptype == CCTK_SCALAR) { - lb[0] = arrdata[group][Carpet::map].hh->processors.at(rl).at(component); - ub[0] = arrdata[group][Carpet::map].hh->processors.at(rl).at(component); + lb[0] = arrdata.at(group).at(Carpet::map).hh->processors.at(rl).at(component); + ub[0] = arrdata.at(group).at(Carpet::map).hh->processors.at(rl).at(component); for(int i=1;i<dim;i++) { lb[i]=0; ub[i]=0; @@ -766,10 +766,10 @@ namespace CarpetIOHDF5 { } else { const int newlb = lb[gpdim-1] + (ub[gpdim-1]-lb[gpdim-1]+1)* - (arrdata[group][Carpet::map].hh->processors.at(rl).at(component)); + (arrdata.at(group).at(Carpet::map).hh->processors.at(rl).at(component)); const int newub = ub[gpdim-1] + (ub[gpdim-1]-lb[gpdim-1]+1)* - (arrdata[group][Carpet::map].hh->processors.at(rl).at(component)); + (arrdata.at(group).at(Carpet::map).hh->processors.at(rl).at(component)); lb[gpdim-1] = newlb; ub[gpdim-1] = newub; } @@ -813,7 +813,7 @@ namespace CarpetIOHDF5 { } END_COMPONENT_LOOP; if (called_from_recovery) { - arrdata[group][Carpet::map].tt->set_time(reflevel,mglevel, + arrdata.at(group).at(Carpet::map).tt->set_time(reflevel,mglevel, (CCTK_REAL) ((cctkGH->cctk_time - cctk_initial_time) / (delta_time * mglevelfact)) ); } diff --git a/Carpet/CarpetIOHDF5/src/iohdf5chckpt_recover.cc b/Carpet/CarpetIOHDF5/src/iohdf5chckpt_recover.cc index 35aa8dd6b..6a3a1e9af 100644 --- a/Carpet/CarpetIOHDF5/src/iohdf5chckpt_recover.cc +++ b/Carpet/CarpetIOHDF5/src/iohdf5chckpt_recover.cc @@ -18,7 +18,7 @@ #include "cctk_Version.h" extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOHDF5/src/iohdf5chckpt_recover.cc,v 1.17 2004/03/23 10:13:30 cott Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOHDF5/src/iohdf5chckpt_recover.cc,v 1.18 2004/03/23 19:30:14 schnetter Exp $"; CCTK_FILEVERSION(Carpet_CarpetIOHDF5_iohdf5chckpt_recover_cc); } @@ -189,7 +189,7 @@ namespace CarpetIOHDF5 { assert (attr>=0); atype = H5Aget_type (attr); assert (atype>=0); - herr = H5Aread (attr, atype, &leveltimes[lcv][0]); + herr = H5Aread (attr, atype, &leveltimes.at(lcv).at(0)); assert(!herr); herr = H5Aclose(attr); assert(!herr); @@ -212,13 +212,13 @@ namespace CarpetIOHDF5 { for(int i=0;i<numberofmgtimes;i++) { - mpierr = MPI_Bcast (&(leveltimes[i][0]), reflevels, CARPET_MPI_REAL, 0, MPI_COMM_WORLD); + mpierr = MPI_Bcast (&(leveltimes.at(i).at(0)), reflevels, CARPET_MPI_REAL, 0, MPI_COMM_WORLD); assert(!mpierr); } if (h5verbose) cout << "leveltimes: " << leveltimes << endl; - cctkGH->cctk_time = leveltimes[mglevel][reflevel]; + cctkGH->cctk_time = leveltimes.at(mglevel).at(reflevel); result += RecoverGHextensions(cctkGH,reader); @@ -803,7 +803,7 @@ namespace CarpetIOHDF5 { for(int i=0;i < numberofmgtimes;i++) { char buffer[100]; sprintf(buffer,"mgleveltimes %d",i); - WriteAttribute(dataset,buffer,(double *) &leveltimes[i][0], reflevels); + WriteAttribute(dataset,buffer,(double *) &leveltimes.at(i).at(0), reflevels); } herr = H5Dclose (dataset); |