Skip to content
Snippets Groups Projects
Commit c47467fc authored by Cristian C Lalescu's avatar Cristian C Lalescu
Browse files

temporary changes

parent e3ac2334
No related branches found
No related tags found
No related merge requests found
...@@ -49,9 +49,9 @@ int fftwf_copy_complex_array( ...@@ -49,9 +49,9 @@ int fftwf_copy_complex_array(
(myrank == fi->rank(ii0))) (myrank == fi->rank(ii0)))
{ {
std::copy( std::copy(
ai + (ii0 - fi->starts[0] )*fi->slice_size, (float*)(ai + (ii0 - fi->starts[0] )*fi->slice_size),
ai + (ii0 - fi->starts[0] + 1)*fi->slice_size, (float*)(ai + (ii0 - fi->starts[0] + 1)*fi->slice_size),
buffer); (float*)buffer);
} }
else else
{ {
...@@ -94,9 +94,9 @@ int fftwf_copy_complex_array( ...@@ -94,9 +94,9 @@ int fftwf_copy_complex_array(
continue; continue;
} }
std::copy( std::copy(
(buffer + ii1*fi->sizes[2]), (float*)(buffer + ii1*fi->sizes[2]),
(buffer + ii1*fi->sizes[2] + min_fast_dim), (float*)(buffer + ii1*fi->sizes[2] + min_fast_dim),
(ao + ((oi0 - fo->starts[0])*fo->sizes[1] + oi1)*fo->sizes[2])); (float*)(ao + ((oi0 - fo->starts[0])*fo->sizes[1] + oi1)*fo->sizes[2]));
} }
} }
} }
......
...@@ -59,12 +59,11 @@ int field_descriptor::read( ...@@ -59,12 +59,11 @@ int field_descriptor::read(
MPI_Info_create(&info); MPI_Info_create(&info);
MPI_File f; MPI_File f;
MPI_File_open( f = MPI::File::Open(
this->comm, this->comm,
fname, fname,
MPI_MODE_RDONLY, MPI_MODE_RDONLY,
info, info);
&f);
MPI_File_set_view( MPI_File_set_view(
f, f,
0, 0,
...@@ -91,12 +90,11 @@ int field_descriptor::write( ...@@ -91,12 +90,11 @@ int field_descriptor::write(
MPI_Info_create(&info); MPI_Info_create(&info);
MPI_File f; MPI_File f;
MPI_File_open( f = MPI::File::Open(
this->comm, this->comm,
fname, fname,
MPI_MODE_CREATE | MPI_MODE_WRONLY, MPI_MODE_CREATE | MPI_MODE_WRONLY,
info, info);
&f);
MPI_File_set_view( MPI_File_set_view(
f, f,
0, 0,
......
...@@ -10,9 +10,9 @@ class field_descriptor ...@@ -10,9 +10,9 @@ class field_descriptor
public: public:
/* data */ /* data */
int *sizes = NULL; int *sizes;
int *subsizes = NULL; int *subsizes;
int *starts = NULL; int *starts;
int ndims; int ndims;
ptrdiff_t slice_size, local_size, full_size; ptrdiff_t slice_size, local_size, full_size;
MPI_Datatype mpi_array_dtype, mpi_dtype; MPI_Datatype mpi_array_dtype, mpi_dtype;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment