Commit 4c2d3483 authored by Thomas Witkowski's avatar Thomas Witkowski
Browse files

Fix some bugs which makes petsc assembling a little bit slow.

parent 6305e8f2
...@@ -44,7 +44,7 @@ available_tags=" CXX F77" ...@@ -44,7 +44,7 @@ available_tags=" CXX F77"
# ### BEGIN LIBTOOL CONFIG # ### BEGIN LIBTOOL CONFIG
# Libtool was configured on host deimos101: # Libtool was configured on host deimos104:
# Shell to use when invoking shell scripts. # Shell to use when invoking shell scripts.
SHELL="/bin/sh" SHELL="/bin/sh"
...@@ -6760,7 +6760,7 @@ build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac` ...@@ -6760,7 +6760,7 @@ build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
# End: # End:
# ### BEGIN LIBTOOL TAG CONFIG: CXX # ### BEGIN LIBTOOL TAG CONFIG: CXX
# Libtool was configured on host deimos101: # Libtool was configured on host deimos104:
# Shell to use when invoking shell scripts. # Shell to use when invoking shell scripts.
SHELL="/bin/sh" SHELL="/bin/sh"
...@@ -7065,7 +7065,7 @@ include_expsyms="" ...@@ -7065,7 +7065,7 @@ include_expsyms=""
# ### BEGIN LIBTOOL TAG CONFIG: F77 # ### BEGIN LIBTOOL TAG CONFIG: F77
# Libtool was configured on host deimos101: # Libtool was configured on host deimos104:
# Shell to use when invoking shell scripts. # Shell to use when invoking shell scripts.
SHELL="/bin/sh" SHELL="/bin/sh"
......
...@@ -150,11 +150,7 @@ namespace AMDiS { ...@@ -150,11 +150,7 @@ namespace AMDiS {
void ParallelDomainBase::exitParallelization(AdaptInfo *adaptInfo) void ParallelDomainBase::exitParallelization(AdaptInfo *adaptInfo)
{ {}
VecDestroy(petscRhsVec);
VecDestroy(petscSolVec);
VecDestroy(petscTmpVec);
}
void ParallelDomainBase::updateDofAdmins() void ParallelDomainBase::updateDofAdmins()
...@@ -396,6 +392,7 @@ namespace AMDiS { ...@@ -396,6 +392,7 @@ namespace AMDiS {
for (RankToDofContainer::iterator it = recvDofs.begin(); for (RankToDofContainer::iterator it = recvDofs.begin();
it != recvDofs.end(); ++it) { it != recvDofs.end(); ++it) {
int nSend = sendMatrixEntry[it->first].size(); int nSend = sendMatrixEntry[it->first].size();
request[requestCounter++] = mpiComm.Isend(&nSend, 1, MPI_INT, it->first, 0); request[requestCounter++] = mpiComm.Isend(&nSend, 1, MPI_INT, it->first, 0);
if (nSend > 0) { if (nSend > 0) {
...@@ -467,7 +464,7 @@ namespace AMDiS { ...@@ -467,7 +464,7 @@ namespace AMDiS {
for (int j = 0; j < recvSize[i]; j++) { for (int j = 0; j < recvSize[i]; j++) {
int r = recvBuffers[i][j * 2]; int r = recvBuffers[i][j * 2];
int c = recvBuffers[i][j * 2 + 1]; int c = recvBuffers[i][j * 2 + 1];
r -= rstart * nComponents; r -= rstart * nComponents;
TEST_EXIT_DBG(r >= 0 && r < nRankRows)("Should not happen!\n"); TEST_EXIT_DBG(r >= 0 && r < nRankRows)("Should not happen!\n");
...@@ -475,13 +472,15 @@ namespace AMDiS { ...@@ -475,13 +472,15 @@ namespace AMDiS {
if (c < rstart * nComponents || if (c < rstart * nComponents ||
c >= rstart * nComponents + nRankRows) c >= rstart * nComponents + nRankRows)
o_nnz[r]++; o_nnz[r]++;
else
d_nnz[r]++;
} }
delete [] recvBuffers[i]; delete [] recvBuffers[i];
} }
i++; i++;
} }
MatCreateMPIAIJ(PETSC_COMM_WORLD, nRankRows, nRankRows, nOverallRows, nOverallRows, MatCreateMPIAIJ(PETSC_COMM_WORLD, nRankRows, nRankRows, nOverallRows, nOverallRows,
0, d_nnz, 0, o_nnz, &petscMatrix); 0, d_nnz, 0, o_nnz, &petscMatrix);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment