diff options
| -rw-r--r-- | src/DumpVar.c | 4 | ||||
| -rw-r--r-- | src/RestoreFile.c | 6 | ||||
| -rw-r--r-- | src/Write2D.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/DumpVar.c b/src/DumpVar.c index 0e6548d..fdf17ad 100644 --- a/src/DumpVar.c +++ b/src/DumpVar.c @@ -128,7 +128,7 @@ void IOFlexIO_DumpVar (cGH *GH, int index, int timelevel, IOFile iof) #endif break; - case CCTK_VARIABLE_INTEGER: + case CCTK_VARIABLE_INT: ioflex_type = FLEXIO_INT; element_size = sizeof (CCTK_INT); #ifdef MPI @@ -805,7 +805,7 @@ void IOFlexIO_getDumpData (cGH *GH, int index, int timelevel, void **outme, char_ptr [l++] = ((CCTK_CHAR *) data) [DI (pughGH, i, j, k)]; break; - case CCTK_VARIABLE_INTEGER: + case CCTK_VARIABLE_INT: int_ptr = (CCTK_INT *) *outme; for (k = start [2]; k <= end [2]; k += ioUtilGH->downsample_z) for (j = start [1]; j <= end [1]; j += ioUtilGH->downsample_y) diff --git a/src/RestoreFile.c b/src/RestoreFile.c index feb9b27..3192184 100644 --- a/src/RestoreFile.c +++ b/src/RestoreFile.c @@ -155,7 +155,7 @@ int GetCommonAttributes (cGH *GH, IOFile ifp, int unchunked, int *index, Up to now CCTK knows only REALs, but COMPLEX types aren't supported anyway by IOFlexIO. */ if ((vtype_stored == FLEXIO_REAL && vtype == CCTK_VARIABLE_REAL) || - (vtype_stored == FLEXIO_INT && vtype == CCTK_VARIABLE_INTEGER) || + (vtype_stored == FLEXIO_INT && vtype == CCTK_VARIABLE_INT) || (vtype_stored == FLEXIO_CHAR && vtype == CCTK_VARIABLE_CHAR)) { #if 0 || (vtype_stored == FLEXIO_COMPLEX && vtype == CCTK_VARIABLE_COMPLEX)) { @@ -375,7 +375,7 @@ int IOFlexIO_RestoreIEEEIOfile (cGH *GH, IOFile ifp, int file_ioproc, case CCTK_VARIABLE_CHAR: element_size = sizeof (CCTK_CHAR); mpi_type = PUGH_MPI_CHAR; break; - case CCTK_VARIABLE_INTEGER: + case CCTK_VARIABLE_INT: element_size = sizeof (CCTK_INT); mpi_type = PUGH_MPI_INT; break; case CCTK_VARIABLE_REAL: @@ -497,7 +497,7 @@ int IOFlexIO_RestoreIEEEIOfile (cGH *GH, IOFile ifp, int file_ioproc, switch (CCTK_GetVarVType (index)) { case CCTK_VARIABLE_CHAR: mpi_type = PUGH_MPI_CHAR; break; - case CCTK_VARIABLE_INTEGER: mpi_type = PUGH_MPI_INT; break; + case CCTK_VARIABLE_INT: mpi_type = PUGH_MPI_INT; break; case CCTK_VARIABLE_REAL: mpi_type = PUGH_MPI_REAL; break; case CCTK_VARIABLE_COMPLEX: CCTK_WARN (1, "Restoring of complex datatypes not yet supported"); diff --git a/src/Write2D.c b/src/Write2D.c index bc67bfd..a7ac38f 100644 --- a/src/Write2D.c +++ b/src/Write2D.c @@ -184,7 +184,7 @@ void IOFlexIO_Write2D (cGH *GH, int index, const char *alias, int first) #endif break; - case CCTK_VARIABLE_INTEGER: + case CCTK_VARIABLE_INT: ioflex_type = FLEXIO_INT; element_size = sizeof (CCTK_INT); #ifdef MPI @@ -314,7 +314,7 @@ void IOFlexIO_Write2D (cGH *GH, int index, const char *alias, int first) assert (l <= npoints && pt <= pughGH->npoints); char_locdat [l++] = ((CCTK_CHAR *) data) [pt]; } - } else if (variable_type == CCTK_VARIABLE_INTEGER) { + } else if (variable_type == CCTK_VARIABLE_INT) { CCTK_INT *int_locdat = (CCTK_INT *) locdat; for (k = locbnd [2]; k < locbnd [3]; k++) @@ -401,7 +401,7 @@ void IOFlexIO_Write2D (cGH *GH, int index, const char *alias, int first) for (k = bnd [2]; k < bnd [3]; k++) for (j = bnd [0]; j < bnd [1]; j++) ((CCTK_CHAR *) alldat) [j + k*ni] = ((CCTK_CHAR *) ud) [l++]; - else if (variable_type == CCTK_VARIABLE_INTEGER) + else if (variable_type == CCTK_VARIABLE_INT) for (k = bnd [2]; k < bnd [3]; k++) for (j = bnd [0]; j < bnd [1]; j++) ((CCTK_INT *) alldat) [j + k*ni] = ((CCTK_INT *) ud) [l++]; |