diff --git a/AMDiS/src/Lagrange.cc b/AMDiS/src/Lagrange.cc index 03fd2070728a005e38068dc2d93a07309f3ed5db..5de5cba6592736c96d62fb90065c487c10a278ea 100644 --- a/AMDiS/src/Lagrange.cc +++ b/AMDiS/src/Lagrange.cc @@ -961,9 +961,8 @@ namespace AMDiS { const DOFAdmin *admin, Vector<DegreeOfFreedom> *indices) const { - if (indices->getSize() < nBasFcts) { + if (indices->getSize() < nBasFcts) indices->resize(nBasFcts); - } getLocalIndices(el, admin, &((*indices)[0])); } diff --git a/AMDiS/src/MacroElement.cc b/AMDiS/src/MacroElement.cc index c8a9d7d5211e1bb919bdd20ad899c9cbfc70b422..94044be04e7fa6d11dc04dc30970074f5dd01835 100644 --- a/AMDiS/src/MacroElement.cc +++ b/AMDiS/src/MacroElement.cc @@ -56,9 +56,8 @@ namespace AMDiS { // write coords int size = coord.getSize(); out.write(reinterpret_cast<const char*>(&size), sizeof(int)); - for (int i = 0; i < size; i++) { + for (int i = 0; i < size; i++) coord[i].serialize(out); - } // write boundary boundary.serialize(out); diff --git a/AMDiS/src/MacroReader.cc b/AMDiS/src/MacroReader.cc index 8e009e3ea3926696b295434768563a5db6f8c7a3..5d826df28579584ab7ecf331f12108a0393a7e1a 100644 --- a/AMDiS/src/MacroReader.cc +++ b/AMDiS/src/MacroReader.cc @@ -374,16 +374,16 @@ namespace AMDiS { for (int i = 0; i < ne; i++) { mel[i]->element = mesh->createNewElement(); - (mel)[i]->index = i; + mel[i]->index = i; if (dim == 3) - (mel)[i]->elType = 0; + mel[i]->elType = 0; } neigh_set = false; bound_set = false; } - void MacroInfo::clear(int ne, int nv) + void MacroInfo::clear() { for (int i = 0; i < mesh->getNumberOfMacros(); i++) delete [] mel_vertex[i]; diff --git a/AMDiS/src/MacroReader.h b/AMDiS/src/MacroReader.h index e15b639c48ab7d6ae6146a58db5d2e3efda84211..ac45558517f9c579dca94df3111003546863625b 100644 --- a/AMDiS/src/MacroReader.h +++ b/AMDiS/src/MacroReader.h @@ -133,7 +133,7 @@ namespace AMDiS { void readAMDiSMacro(const char *filename, Mesh* mesh); /// Frees memory of MacroInfo - void clear(int ne, int nv); + void clear(); /** \brief * Sets the boundary of all edges/faces with no neigbour to a straight diff --git a/AMDiS/src/Mesh.cc b/AMDiS/src/Mesh.cc index 41894b57e117fb6bb6cd5beb87e5bb81ea6ecca8..9f99f2c553aa5ee2fca5236d6ec95385709bfd19 100644 --- a/AMDiS/src/Mesh.cc +++ b/AMDiS/src/Mesh.cc @@ -1130,7 +1130,7 @@ namespace AMDiS { void Mesh::clearMacroFileInfo() { - macroFileInfo->clear(nEdges, nVertices); + macroFileInfo->clear(); delete macroFileInfo; macroFileInfo = NULL; }