diff options
author | allen <allen@ebee0441-1374-4afa-a3b5-247f3ba15b9a> | 2000-01-12 12:58:03 +0000 |
---|---|---|
committer | allen <allen@ebee0441-1374-4afa-a3b5-247f3ba15b9a> | 2000-01-12 12:58:03 +0000 |
commit | 3007a15d366242c1e200fb42e1d86d7c5df73a52 (patch) | |
tree | 4b79bf2a9db739b46c87fbcae5430fc0ac8aa276 /src | |
parent | b488e2d50488bbaef4b228f7bf68b88dc0555cea (diff) |
Adding USE_CCTK_PARAMETERS
Changing CCTK_GroupData to CCTK_OldGroupData
git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGHIO/IOFlexIO/trunk@71 ebee0441-1374-4afa-a3b5-247f3ba15b9a
Diffstat (limited to 'src')
-rw-r--r-- | src/DumpGH.c | 4 | ||||
-rw-r--r-- | src/DumpVar.c | 9 | ||||
-rw-r--r-- | src/GHExtension.c | 12 | ||||
-rw-r--r-- | src/Output2D.c | 9 | ||||
-rw-r--r-- | src/Output3D.c | 9 | ||||
-rw-r--r-- | src/RecoverGH.c | 3 | ||||
-rw-r--r-- | src/RestoreFile.c | 5 | ||||
-rw-r--r-- | src/Startup.c | 3 | ||||
-rw-r--r-- | src/Write2D.c | 3 | ||||
-rw-r--r-- | src/Write3D.c | 12 |
10 files changed, 67 insertions, 2 deletions
diff --git a/src/DumpGH.c b/src/DumpGH.c index 74af4b1..a53af2a 100644 --- a/src/DumpGH.c +++ b/src/DumpGH.c @@ -52,6 +52,7 @@ void IOFlexIO_ConditionallyDumpGH (cGH *GH) } IOFlexIO_DumpGH (GH, CP_EVOLUTION_DATA); } + USE_CCTK_PARAMETERS } @@ -273,7 +274,6 @@ void IOFlexIO_DumpGH (cGH *GH, int called_from) int old_out_single; ioGH *ioUtilGH; flexioGH *myGH; - int total_time_handle, write_time_handle; static char **dumpfnames = NULL; /* dump filename ring buffer */ static int findex = 0; /* index into ring buffer */ @@ -459,4 +459,6 @@ void IOFlexIO_DumpGH (cGH *GH, int called_from) "-----------\n"); } + USE_CCTK_PARAMETERS + } diff --git a/src/DumpVar.c b/src/DumpVar.c index ad423b4..e642bdf 100644 --- a/src/DumpVar.c +++ b/src/DumpVar.c @@ -476,6 +476,9 @@ void IOFlexIO_DumpGF (cGH *GH, int index, int timelevel, IOFile iof, if (free_outme) free (outme); + + USE_CCTK_PARAMETERS + } @@ -591,6 +594,9 @@ void IOFlexIO_AddCommonAttributes (cGH *GH, int index, int timelevel, i_to_IO = GH->cctk_iteration; CACTUS_IEEEIO_ERROR (IOwriteAttribute (iof, "iteration", FLEXIO_INT4, 1, &i_to_IO)); + + USE_CCTK_PARAMETERS + } /*@@ @@ -848,6 +854,9 @@ void IOFlexIO_getDumpData (cGH *GH, int index, int timelevel, void **outme, printf ("Chunk size : %d %d %d\n", (int) bnd [3], (int) bnd [4], (int) bnd [5]); } + + USE_CCTK_PARAMETERS + } diff --git a/src/GHExtension.c b/src/GHExtension.c index 38edd5f..3917604 100644 --- a/src/GHExtension.c +++ b/src/GHExtension.c @@ -50,6 +50,9 @@ void *IOFlexIO_SetupGH (tFleshConfig *config, int convergence_level, cGH *GH) newGH->IEEEfile_3D = (IOFile *) malloc (numvars * sizeof (IOFile)); return (newGH); + + USE_CCTK_PARAMETERS + } int IOFlexIO_InitGH (cGH *GH) @@ -157,6 +160,9 @@ int IOFlexIO_InitGH (cGH *GH) } return (0); + + USE_CCTK_PARAMETERS + } @@ -175,6 +181,9 @@ int IOFlexIO_Terminate (cGH *GH) } return (0); + + USE_CCTK_PARAMETERS + } #endif @@ -246,4 +255,7 @@ void SetupSliceCenter (cGH *GH) else myGH->sp2xyz[1] = pughGH->lnsize [1]/2 - pughGH->lb [pughGH->myproc][1]; } + + USE_CCTK_PARAMETERS + } diff --git a/src/Output2D.c b/src/Output2D.c index 050ee86..3bed335 100644 --- a/src/Output2D.c +++ b/src/Output2D.c @@ -84,6 +84,9 @@ int IOFlexIO_Output2DGH (cGH *GH) } return (0); + + USE_CCTK_PARAMETERS + } @@ -140,6 +143,9 @@ int IOFlexIO_Output2DVarAs (cGH *GH, const char *fullname, const char *alias) IOFlexIO_Write2D (GH, index, alias); return (0); + + USE_CCTK_PARAMETERS + } @@ -247,4 +253,7 @@ int IOFlexIO_TriggerOutput2D (cGH *GH, int index) myGH->out2D_last [index] = GH->cctk_iteration; return (0); + + USE_CCTK_PARAMETERS + } diff --git a/src/Output3D.c b/src/Output3D.c index af262f1..5ca53a6 100644 --- a/src/Output3D.c +++ b/src/Output3D.c @@ -84,6 +84,9 @@ int IOFlexIO_Output3DGH (cGH *GH) } return (0); + + USE_CCTK_PARAMETERS + } @@ -140,6 +143,9 @@ int IOFlexIO_Output3DVarAs (cGH *GH, const char *fullname, const char *alias) IOFlexIO_Write3D (GH, index, alias); return (0); + + USE_CCTK_PARAMETERS + } @@ -245,4 +251,7 @@ int IOFlexIO_TriggerOutput3D (cGH *GH, int index) myGH->out3D_last [index] = GH->cctk_iteration; return (0); + + USE_CCTK_PARAMETERS + } diff --git a/src/RecoverGH.c b/src/RecoverGH.c index 9adf9a1..f0e8487 100644 --- a/src/RecoverGH.c +++ b/src/RecoverGH.c @@ -414,6 +414,9 @@ int IOFlexIO_RecoverGH (cGH *GH, const char *basename, int called_from) } return (0); + + USE_CCTK_PARAMETERS + } int IOFlexIO_restoreParams (IOFile ifp, int myproc) diff --git a/src/RestoreFile.c b/src/RestoreFile.c index 9207000..99a428a 100644 --- a/src/RestoreFile.c +++ b/src/RestoreFile.c @@ -133,7 +133,7 @@ int GetCommonAttributes (cGH *GH, IOFile ifp, int unchunked, int *index, *timelevel = timelevel_stored; /* verify group type, variable type, dims, sizes and ntimelevels */ - CCTK_GroupData (CCTK_GroupIndex (groupname_stored), gtype, &vtype, &rank, + CCTK_OldGroupData (CCTK_GroupIndex (groupname_stored), gtype, &vtype, &rank, &i, &ntimelevels); if (*gtype != gtype_stored) { sprintf (msg, "Group types don't match for '%s'", fullname); @@ -505,4 +505,7 @@ int IOFlexIO_RestoreIEEEIOfile (cGH *GH, IOFile ifp, int file_ioproc, } return (0); + + USE_CCTK_PARAMETERS + } diff --git a/src/Startup.c b/src/Startup.c index b7b2931..ecd17e9 100644 --- a/src/Startup.c +++ b/src/Startup.c @@ -77,4 +77,7 @@ void IOFlexIO_Startup (void) /* Register the IOFlexIO recovery routine to thorn IOUtil */ if (IOUtil_RegisterRecover ("IOFlexIO recovery", IOFlexIO_RecoverGH) < 0) CCTK_WARN (1, "Failed to register IOFlexIO recovery routine"); + + USE_CCTK_PARAMETERS + } diff --git a/src/Write2D.c b/src/Write2D.c index 47c5e05..55334c3 100644 --- a/src/Write2D.c +++ b/src/Write2D.c @@ -483,6 +483,9 @@ void IOFlexIO_Write2D (cGH *GH, int index, const char *alias) if (verbose) cactus_memtrace(); #endif + + USE_CCTK_PARAMETERS + } diff --git a/src/Write3D.c b/src/Write3D.c index dd71772..fc49f5a 100644 --- a/src/Write3D.c +++ b/src/Write3D.c @@ -221,6 +221,9 @@ void IOFlexIO_Write3D (cGH *GH, int index, const char *alias) if (verbose) printf ("-------------------\n"); + + USE_CCTK_PARAMETERS + } @@ -262,6 +265,9 @@ void IOFlexIO_Write3D_closeFile (cGH *GH, IEEEfile_3D_t *IEEEfile_3D) if (out3D_septimefiles) free (IEEEfile_3D); + + USE_CCTK_PARAMETERS + } @@ -339,6 +345,9 @@ void IOFlexIO_Write3D_openFile (cGH *GH, IEEEfile_3D_t *IEEEfile_3D, /* Turn on buffer cache (with default size chosen by IEEEIO lib) */ IEEEbufferOn (IEEEfile_3D->iofile, 0); + + USE_CCTK_PARAMETERS + } @@ -464,4 +473,7 @@ IEEEfile_3D_t *IOFlexIO_Get3Dfile (cGH *GH, const char *alias, int *isNewFile) *isNewFile = 1; return (IEEEfile_3D); + + USE_CCTK_PARAMETERS + } |