diff options
| author | cott <> | 2003-12-03 15:02:00 +0000 |
|---|---|---|
| committer | cott <> | 2003-12-03 15:02:00 +0000 |
| commit | 8b970795c0d42a103c9e0c649b19e10f5dbb179e (patch) | |
| tree | 8013f319e317442e73cc7207ae4c31ad542edabc /CarpetAttic | |
| parent | cce8074a9661db4089ca4af2635a3f6af275d796 (diff) | |
Minor changes. Code compiles now (last revision didn't). Don't try recovery. Checkpointing
Minor changes. Code compiles now (last revision didn't). Don't try recovery. Checkpointing
fails for grid arrays and grid scalers : /
darcs-hash:20031203150251-19929-6ebdc1ceb6529e57955393dcc54ec582626af807.gz
Diffstat (limited to 'CarpetAttic')
| -rw-r--r-- | CarpetAttic/CarpetIOFlexIOCheckpoint/src/checkpointrestart.cc | 15 | ||||
| -rw-r--r-- | CarpetAttic/CarpetIOFlexIOCheckpoint/src/ioflexio.cc | 5 |
2 files changed, 17 insertions, 3 deletions
diff --git a/CarpetAttic/CarpetIOFlexIOCheckpoint/src/checkpointrestart.cc b/CarpetAttic/CarpetIOFlexIOCheckpoint/src/checkpointrestart.cc index b9f8e9fac..6940a0a12 100644 --- a/CarpetAttic/CarpetIOFlexIOCheckpoint/src/checkpointrestart.cc +++ b/CarpetAttic/CarpetIOFlexIOCheckpoint/src/checkpointrestart.cc @@ -48,7 +48,7 @@ #include "ioflexio.hh" extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIOCheckpoint/src/checkpointrestart.cc,v 1.12 2003/12/01 13:15:21 cott Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIOCheckpoint/src/checkpointrestart.cc,v 1.13 2003/12/03 16:02:51 cott Exp $"; CCTK_FILEVERSION(Carpet_CarpetIOFlexIO_checkpointrestart_cc); } @@ -429,14 +429,25 @@ int CarpetIOFlexIO_Recover (cGH* cgh, const char *basefilename, int called_from) */ CCTK_REAL startdata = 666.66; - writer->write(FLEXIO_REAL,0,0,&startdata); + int rank=1; + int dim[1]={1}; + writer->write(FLEXIO_REAL,rank,dim,&startdata); /* now dump parameters */ + if (verbose) + { + CCTK_VInfo (CCTK_THORNSTRING, "Dumping Parameters'"); + } DumpParams (cgh, 1, writer); /* and now dump GH extentions */ + if (verbose) + { + CCTK_VInfo (CCTK_THORNSTRING, "Dumping GHExtensions"); + } + DumpGHExtensions(cgh,writer); } diff --git a/CarpetAttic/CarpetIOFlexIOCheckpoint/src/ioflexio.cc b/CarpetAttic/CarpetIOFlexIOCheckpoint/src/ioflexio.cc index 0da2dfb16..240f1fe2b 100644 --- a/CarpetAttic/CarpetIOFlexIOCheckpoint/src/ioflexio.cc +++ b/CarpetAttic/CarpetIOFlexIOCheckpoint/src/ioflexio.cc @@ -45,7 +45,7 @@ extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIOCheckpoint/src/ioflexio.cc,v 1.11 2003/12/01 13:15:21 cott Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIOCheckpoint/src/ioflexio.cc,v 1.12 2003/12/03 16:02:51 cott Exp $"; CCTK_FILEVERSION(Carpet_CarpetIOFlexIO_ioflexio_cc); } @@ -167,6 +167,7 @@ namespace CarpetIOFlexIO { const int grouptype = CCTK_GroupTypeI(group); assert (! ( (grouptype != CCTK_GF) && reflevel>0)); + // if(grouptype == CCTK_SCALAR || grouptype == CCTK_ARRAY) return 0; if (CCTK_MyProc(cgh)==0) { @@ -290,6 +291,8 @@ namespace CarpetIOFlexIO { origin[d] = (ext.lower() / ext.stride())[d]; dims[d] = (ext.shape() / ext.stride())[d]; } + CCTK_VInfo (CCTK_THORNSTRING, "boguscheck"); + CCTK_VInfo (CCTK_THORNSTRING, "boguscheck2, dim0: %d dim1: %d dim2: %d",dims[0],dims[1],dims[2]); amrwriter->write (origin, dims, (void*)tmp->storage()); // dump attributes |