max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 08:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

changed automatic arrays to dynamic arrays

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@924 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2006-05-16 01:10:25 +00:00
parent 6df20749e2
commit 1e28de647f
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Solution.cxx
View File

@ -904,9 +904,9 @@ void cxxSolution::mpi_send(int task_number)
*/ */
position = 0; position = 0;
int i = ints.size(); int i = ints.size();
int int_array[i]; int *int_array = new int[i];
int d = doubles.size(); int d = doubles.size();
double double_array[d]; double *double_array = new double[d];
for (int j = 0; j < i; j++) { for (int j = 0; j < i; j++) {
int_array[j] = ints[j]; int_array[j] = ints[j];
} }
@ -922,6 +922,8 @@ void cxxSolution::mpi_send(int task_number)
MPI_Send(buffer, position, MPI_PACKED, task_number, 0, MPI_COMM_WORLD); MPI_Send(buffer, position, MPI_PACKED, task_number, 0, MPI_COMM_WORLD);
buffer = (void *) free_check_null(buffer); buffer = (void *) free_check_null(buffer);
delete[] int_array;
delete[] double_array;
} }
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
void cxxSolution::mpi_recv(int task_number) void cxxSolution::mpi_recv(int task_number)
@ -948,13 +950,13 @@ void cxxSolution::mpi_recv(int task_number)
/* Unpack ints */ /* Unpack ints */
int count_ints; int count_ints;
MPI_Unpack(buffer, msg_size, &position, &count_ints, 1, MPI_INT, MPI_COMM_WORLD); MPI_Unpack(buffer, msg_size, &position, &count_ints, 1, MPI_INT, MPI_COMM_WORLD);
int ints[count_ints]; int *ints = new int[count_ints];
MPI_Unpack(buffer, msg_size, &position, ints, count_ints, MPI_INT, MPI_COMM_WORLD); MPI_Unpack(buffer, msg_size, &position, ints, count_ints, MPI_INT, MPI_COMM_WORLD);
/* Unpack doubles */ /* Unpack doubles */
int count_doubles; int count_doubles;
MPI_Unpack(buffer, msg_size, &position, &count_doubles, 1, MPI_INT, MPI_COMM_WORLD); MPI_Unpack(buffer, msg_size, &position, &count_doubles, 1, MPI_INT, MPI_COMM_WORLD);
double doubles[count_doubles]; double *doubles = new double[count_doubles];
MPI_Unpack(buffer, msg_size, &position, doubles, count_doubles, MPI_DOUBLE, MPI_COMM_WORLD); MPI_Unpack(buffer, msg_size, &position, doubles, count_doubles, MPI_DOUBLE, MPI_COMM_WORLD);
buffer = free_check_null(buffer); buffer = free_check_null(buffer);
/* /*
@ -997,6 +999,8 @@ void cxxSolution::mpi_recv(int task_number)
* struct master_activity *species_gamma; * struct master_activity *species_gamma;
*/ */
this->species_gamma.mpi_unpack(ints, &i, doubles, &d); this->species_gamma.mpi_unpack(ints, &i, doubles, &d);
delete[] ints;
delete[] doubles;
} }
#endif #endif
void cxxSolution::set_master_activity(char *string, double d) void cxxSolution::set_master_activity(char *string, double d)

6
StorageBin.cxx
View File

@ -734,13 +734,13 @@ void cxxStorageBin::mpi_recv(int task_number)
/* Unpack ints */ /* Unpack ints */
int count_ints; int count_ints;
MPI_Unpack(buffer, msg_size, &position, &count_ints, 1, MPI_INT, MPI_COMM_WORLD); MPI_Unpack(buffer, msg_size, &position, &count_ints, 1, MPI_INT, MPI_COMM_WORLD);
int ints[count_ints]; int *ints = new int[count_ints];
MPI_Unpack(buffer, msg_size, &position, ints, count_ints, MPI_INT, MPI_COMM_WORLD); MPI_Unpack(buffer, msg_size, &position, ints, count_ints, MPI_INT, MPI_COMM_WORLD);
/* Unpack doubles */ /* Unpack doubles */
int count_doubles; int count_doubles;
MPI_Unpack(buffer, msg_size, &position, &count_doubles, 1, MPI_INT, MPI_COMM_WORLD); MPI_Unpack(buffer, msg_size, &position, &count_doubles, 1, MPI_INT, MPI_COMM_WORLD);
double doubles[count_doubles]; double *doubles = new double[count_doubles];
MPI_Unpack(buffer, msg_size, &position, doubles, count_doubles, MPI_DOUBLE, MPI_COMM_WORLD); MPI_Unpack(buffer, msg_size, &position, doubles, count_doubles, MPI_DOUBLE, MPI_COMM_WORLD);
buffer = free_check_null(buffer); buffer = free_check_null(buffer);
#ifdef SKIP #ifdef SKIP
@ -815,6 +815,8 @@ void cxxStorageBin::mpi_recv(int task_number)
} }
//std::cerr << "Unpacked Surface" << std::endl; //std::cerr << "Unpacked Surface" << std::endl;
delete[] ints;
delete[] doubles;
} }
#endif #endif