From 11157150b9c0e2a39d3ee5a5d0bb3e3a6efbaf54 Mon Sep 17 00:00:00 2001
From: Thomas Witkowski <thomas.witkowski@gmx.de>
Date: Tue, 9 Jun 2009 10:37:35 +0000
Subject: [PATCH] nothing really important.
---
AMDiS/src/Lagrange.cc | 3 +--
AMDiS/src/MacroElement.cc | 3 +--
AMDiS/src/MacroReader.cc | 6 +++---
AMDiS/src/MacroReader.h | 2 +-
AMDiS/src/Mesh.cc | 2 +-
5 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/AMDiS/src/Lagrange.cc b/AMDiS/src/Lagrange.cc
index 03fd2070..5de5cba6 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 c8a9d7d5..94044be0 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 8e009e3e..5d826df2 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 e15b639c..ac455585 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 41894b57..9f99f2c5 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;
}
--
GitLab