Skip to content

GitLab

Commit b3de56bb authored by Thomas Witkowski's avatar Thomas Witkowski
Browse files

Code refactoring and work on parallelization.

parent 739be0ef
Hide whitespace changes
Inline Side-by-side
Showing with 156 additions and 153 deletions
AMDiS/src/ArhWriter.cc
View file @ b3de56bb
......@@ -53,7 +53,7 @@ namespace AMDiS {
file.write(reinterpret_cast<char*>(&nValueVectors), 4);
uint32_t nAllValues =
(vecs.size() > 0 ? vecs[0]->getFeSpace()->getAdmin()->getUsedDOFs() : 0);
(vecs.size() > 0 ? vecs[0]->getFeSpace()->getAdmin()->getUsedDofs() : 0);
file.write(reinterpret_cast<char*>(&nAllValues), 4);
MeshStructure elementStructure;
......
AMDiS/src/BasisFunction.cc
View file @ b3de56bb
......@@ -143,7 +143,7 @@ namespace AMDiS {
}
int BasisFunction::getNumberOfDOFs(int i) const
int BasisFunction::getNumberOfDofs(int i) const
{
return (*nDOF)[i];
}
......
AMDiS/src/BasisFunction.h
View file @ b3de56bb
......@@ -161,10 +161,10 @@ namespace AMDiS {
}
/// Returns \ref nDOF[i]
int getNumberOfDOFs(int i) const;
int getNumberOfDofs(int i) const;
/// Returns \ref nDOF
inline DimVec<int>* getNumberOfDOFs() const
inline DimVec<int>* getNumberOfDofs() const
{
return nDOF;
}
......
AMDiS/src/CoarseningManager1d.cc
View file @ b3de56bb
......@@ -68,13 +68,13 @@ namespace AMDiS {
/*--- hand DOFs from children to parent, and add DOF at center ---*/
/*--------------------------------------------------------------------------*/
if (mesh->getNumberOfDOFs(VERTEX) && !mesh->queryCoarseDOFs()) {
if (mesh->getNumberOfDofs(VERTEX) && !mesh->queryCoarseDOFs()) {
int node = mesh->getNode(VERTEX);
parent->setDof(node+0, const_cast<int*>( child[0]->getDof(node+0)));
parent->setDof(node+1, const_cast<int*>( child[1]->getDof(node+1)));
}
if (mesh->getNumberOfDOFs(CENTER) && !mesh->queryCoarseDOFs()) {
if (mesh->getNumberOfDofs(CENTER) && !mesh->queryCoarseDOFs()) {
parent->setDof(mesh->getNode(CENTER), mesh->getDof(CENTER));
}
......@@ -89,7 +89,7 @@ namespace AMDiS {
int nrAdmin = mesh->getNumberOfDOFAdmin();
for(iadmin = 0; iadmin < nrAdmin; iadmin++) {
std::list<DOFIndexedBase*>::iterator it;
DOFAdmin* admin = const_cast<DOFAdmin*>(&(mesh->getDOFAdmin(iadmin)));
DOFAdmin* admin = const_cast<DOFAdmin*>(&(mesh->getDofAdmin(iadmin)));
std::list<DOFIndexedBase*>::iterator end = admin->endDOFIndexed();
for(it = admin->beginDOFIndexed(); it != end; ++it)
(*it)->coarseRestrict(coarsenList, 1);
......@@ -100,12 +100,12 @@ namespace AMDiS {
/*--- remove all DOFs of children that are not used anymore ---*/
/*--------------------------------------------------------------------------*/
if (mesh->getNumberOfDOFs(VERTEX)) /*--- midpoint of parent ---*/
if (mesh->getNumberOfDofs(VERTEX)) /*--- midpoint of parent ---*/
{
mesh->freeDof(const_cast<int*>( child[1]->getDof(mesh->getNode(VERTEX))), VERTEX);
}
if (mesh->getNumberOfDOFs(CENTER)) /*--- center of the children ---*/
if (mesh->getNumberOfDofs(CENTER)) /*--- center of the children ---*/
{
mesh->freeDof(const_cast<int*>( child[0]->getDof(mesh->getNode(CENTER))), CENTER);
mesh->freeDof(const_cast<int*>( child[1]->getDof(mesh->getNode(CENTER))), CENTER);
......
AMDiS/src/CoarseningManager2d.cc
View file @ b3de56bb
......@@ -30,11 +30,11 @@ namespace AMDiS {
el->getIndex(), child[0]->getIndex(), child[1]->getIndex());
// remove dof from common edge of child[0] and child[1]
if (mesh->getNumberOfDOFs(EDGE))
if (mesh->getNumberOfDofs(EDGE))
mesh->freeDof(const_cast<int*>(child[0]->getDof(4)), EDGE);
// remove dof from the barycenters of child[0] and child[1]
if (mesh->getNumberOfDOFs(CENTER)) {
if (mesh->getNumberOfDofs(CENTER)) {
int node = mesh->getNode(CENTER);
mesh->freeDof(const_cast<int*>(child[0]->getDof(node)), CENTER);
......@@ -72,14 +72,14 @@ namespace AMDiS {
DegreeOfFreedom *dof[3];
dof[0] = const_cast<int*>(el->getChild(0)->getDof(2));
if (mesh->getNumberOfDOFs(EDGE)) {
if (mesh->getNumberOfDofs(EDGE)) {
dof[1] = const_cast<int*>(el->getChild(0)->getDof(3));
dof[2] = const_cast<int*>(el->getChild(1)->getDof(4));
} else {
dof[1] = dof[2] = 0;
}
if (mesh->getNumberOfDOFs(EDGE)) {
if (mesh->getNumberOfDofs(EDGE)) {
int node = mesh->getNode(EDGE);
// get new dof on el at the midpoint of the coarsening edge
......@@ -90,14 +90,14 @@ namespace AMDiS {
}
}
if (mesh->getNumberOfDOFs(EDGE) || mesh->getNumberOfDOFs(CENTER))
if (mesh->getNumberOfDofs(EDGE) || mesh->getNumberOfDofs(CENTER))
coarsenList->addDOFParents(n_neigh);
// restrict dof vectors to the parents on the patch
int nrAdmin = mesh->getNumberOfDOFAdmin();
for (int iadmin = 0; iadmin < nrAdmin; iadmin++) {
DOFAdmin* admin = const_cast<DOFAdmin*>(&mesh->getDOFAdmin(iadmin));
DOFAdmin* admin = const_cast<DOFAdmin*>(&mesh->getDofAdmin(iadmin));
for (std::list<DOFIndexedBase*>::iterator it = admin->beginDOFIndexed();
it != admin->endDOFIndexed(); ++it)
(*it)->coarseRestrict(*coarsenList, n_neigh);
......@@ -111,7 +111,7 @@ namespace AMDiS {
// now, remove those dofs in the coarcening edge
mesh->freeDof(dof[0], VERTEX);
if (mesh->getNumberOfDOFs(EDGE)) {
if (mesh->getNumberOfDofs(EDGE)) {
mesh->freeDof(dof[1], EDGE);
mesh->freeDof(dof[2], EDGE);
}
......
AMDiS/src/CoarseningManager3d.cc
View file @ b3de56bb
......@@ -133,11 +133,11 @@ namespace AMDiS {
/* boundary face or neigh has been coarsend: free the dof's in the face */
/****************************************************************************/
if (mesh->getNumberOfDOFs(EDGE)) {
if (mesh->getNumberOfDofs(EDGE)) {
node = mesh->getNode(EDGE) + Tetrahedron::nChildEdge[el_type][0][dir];
mesh->freeDof(const_cast<int*>( child[0]->getDof(node)), EDGE);
}
if (mesh->getNumberOfDOFs(FACE)) {
if (mesh->getNumberOfDofs(FACE)) {
node = mesh->getNode(FACE) + Tetrahedron::nChildFace[el_type][0][dir];
mesh->freeDof(const_cast<int*>( child[0]->getDof(node)), FACE);
node = mesh->getNode(FACE) + Tetrahedron::nChildFace[el_type][1][dir];
......@@ -151,13 +151,13 @@ namespace AMDiS {
/* child[1] and at the two barycenter */
/****************************************************************************/
if (mesh->getNumberOfDOFs(FACE)) {
if (mesh->getNumberOfDofs(FACE)) {
node = mesh->getNode(FACE);
mesh->freeDof(const_cast<int*>( child[0]->getDof(node)), FACE);
}
if (mesh->getNumberOfDOFs(CENTER)) {
if (mesh->getNumberOfDofs(CENTER)) {
node = mesh->getNode(CENTER);
for (i = 0; i < 2; i++)
mesh->freeDof(const_cast<int*>( child[i]->getDof(node)), CENTER);
......@@ -318,7 +318,7 @@ namespace AMDiS {
int i, node;
DegreeOfFreedom *dof;
if (mesh->getNumberOfDOFs(EDGE)) {
if (mesh->getNumberOfDofs(EDGE)) {
/****************************************************************************/
/* get dof for coarsening edge */
/****************************************************************************/
......@@ -329,9 +329,9 @@ namespace AMDiS {
dof = NULL;
}
if (mesh->getNumberOfDOFs(EDGE) ||
mesh->getNumberOfDOFs(FACE) ||
mesh->getNumberOfDOFs(CENTER)) {
if (mesh->getNumberOfDofs(EDGE) ||
mesh->getNumberOfDofs(FACE) ||
mesh->getNumberOfDofs(CENTER)) {
for (i = 0; i < n_neigh; i++)
coarsenList->addDOFParent(i, dof);
}
......@@ -344,7 +344,7 @@ namespace AMDiS {
int nrAdmin = mesh->getNumberOfDOFAdmin();
for (int iadmin = 0; iadmin < nrAdmin; iadmin++) {
std::list<DOFIndexedBase*>::iterator it;
DOFAdmin* admin = const_cast<DOFAdmin*>(&mesh->getDOFAdmin(iadmin));
DOFAdmin* admin = const_cast<DOFAdmin*>(&mesh->getDofAdmin(iadmin));
std::list<DOFIndexedBase*>::iterator end = admin->endDOFIndexed();
for (it = admin->beginDOFIndexed(); it != end; ++it)
(*it)->coarseRestrict(*coarsenList, n_neigh);
......@@ -359,7 +359,7 @@ namespace AMDiS {
mesh->freeDof(const_cast<int*>( el->getChild(0)->getDof(3)), VERTEX);
mesh->incrementNumberOfVertices(-1);
if (mesh->getNumberOfDOFs(EDGE)) {
if (mesh->getNumberOfDofs(EDGE)) {
node = mesh->getNode(EDGE) + 2;
mesh->freeDof(const_cast<int*>( el->getChild(0)->getDof(node)), EDGE);
mesh->freeDof(const_cast<int*>( el->getChild(1)->getDof(node)), EDGE);
......
AMDiS/src/DOFAdmin.h
View file @ b3de56bb
......@@ -133,7 +133,7 @@ namespace AMDiS {
}
/// Returns \ref usedCount
inline const int getUsedDOFs() const
inline const int getUsedDofs() const
{
return usedCount;
}
......@@ -151,13 +151,13 @@ namespace AMDiS {
}
/// Returns \ref nrDOF[i], i.e., the number of dofs for the position i.
inline const int getNumberOfDOFs(int i) const
inline const int getNumberOfDofs(int i) const
{
return nrDOF[i];
}
/// Returns \ref nrDOF
inline const DimVec<int>& getNumberOfDOFs() const
inline const DimVec<int>& getNumberOfDofs() const
{
return nrDOF;
}
......
AMDiS/src/DOFVector.cc
View file @ b3de56bb
......@@ -91,7 +91,7 @@ namespace AMDiS {
int nPositions = mesh->getGeo(geoIndex);
int numPreDOFs = admin->getNumberOfPreDOFs(i);
for (int j = 0; j < nPositions; j++) {
int dofs = basFcts->getNumberOfDOFs(geoIndex);
int dofs = basFcts->getNumberOfDofs(geoIndex);
numNodeDOFs.push_back(dofs);
nDofs += dofs;
numNodePreDOFs.push_back(numPreDOFs);
......@@ -651,7 +651,7 @@ namespace AMDiS {
int numPositionNodes = mesh->getGeo(geoIndex);
int numPreDOFs = admin->getNumberOfPreDOFs(i);
for (int j = 0; j < numPositionNodes; j++) {
int dofs = basFcts->getNumberOfDOFs(geoIndex);
int dofs = basFcts->getNumberOfDofs(geoIndex);
numNodeDOFs.push_back(dofs);
nDofs += dofs;
numNodePreDOFs.push_back(numPreDOFs);
......
AMDiS/src/DataCollector.cc
View file @ b3de56bb
......@@ -208,6 +208,9 @@ namespace AMDiS {
DegreeOfFreedom vertexDOF;
WorldVector<double> vertexCoords;
MSG("ELEMENT: %d\n", elInfo->getElement()->getIndex());
MSG("DOFs: %d %d %d\n", dof[0][0], dof[1][0], dof[2][0]);
// create ElementInfo
ElementInfo elementInfo(dim);
......
AMDiS/src/Element.cc
View file @ b3de56bb
......@@ -102,7 +102,7 @@ namespace AMDiS {
int ndof = 0;
for (int i = 0; i < mesh->getNumberOfDOFAdmin(); i++)
ndof += mesh->getDOFAdmin(i).getNumberOfDOFs(position);
ndof += mesh->getDofAdmin(i).getNumberOfDofs(position);
if (ndof > 0) {
for (int i = 0; i < mesh->getGeo(position); i++) {
......@@ -158,7 +158,7 @@ namespace AMDiS {
int ndof = 0;
for (int i = 0; i < mesh->getNumberOfDOFAdmin(); i++)
ndof += mesh->getDOFAdmin(i).getNumberOfDOFs(position);
ndof += mesh->getDofAdmin(i).getNumberOfDofs(position);
if (ndof > 0) {
for (int i = 0; i < mesh->getGeo(position); i++) {
......@@ -226,7 +226,7 @@ namespace AMDiS {
int edges = mesh->getGeo(EDGE);
int faces = mesh->getGeo(FACE);
if ((nd = admin->getNumberOfDOFs(VERTEX))) {
if ((nd = admin->getNumberOfDofs(VERTEX))) {
nd0 = admin->getNumberOfPreDOFs(VERTEX);
n0 = admin->getMesh()->getNode(VERTEX);
for (int i = 0; i < vertices; i++) {
......@@ -235,7 +235,7 @@ namespace AMDiS {
}
if (mesh->getDim() > 1) {
if ((nd = admin->getNumberOfDOFs(EDGE))) {
if ((nd = admin->getNumberOfDofs(EDGE))) {
nd0 = admin->getNumberOfPreDOFs(EDGE);
n0 = admin->getMesh()->getNode(EDGE);
for (int i = 0; i < edges; i++) {
......@@ -245,7 +245,7 @@ namespace AMDiS {
}
if (mesh->getDim() == 3) {
if ((nd = admin->getNumberOfDOFs(FACE))) {
if ((nd = admin->getNumberOfDofs(FACE))) {
nd0 = admin->getNumberOfPreDOFs(FACE);
n0 = admin->getMesh()->getNode(FACE);
for (int i = 0; i < faces; i++) {
......@@ -254,7 +254,7 @@ namespace AMDiS {
}
}
if ((nd = admin->getNumberOfDOFs(CENTER))) {
if ((nd = admin->getNumberOfDofs(CENTER))) {
nd0 = admin->getNumberOfPreDOFs(CENTER);
n0 = admin->getMesh()->getNode(CENTER);
int i = 0; /* only one center */
......@@ -271,7 +271,7 @@ namespace AMDiS {
int edges = mesh->getGeo(EDGE);
int faces = mesh->getGeo(FACE);
int nd = admin->getNumberOfDOFs(VERTEX);
int nd = admin->getNumberOfDofs(VERTEX);
if (nd) {
nd0 = admin->getNumberOfPreDOFs(VERTEX);
n0 = admin->getMesh()->getNode(VERTEX);
......@@ -281,7 +281,7 @@ namespace AMDiS {
}
if (mesh->getDim() > 1) {
nd = admin->getNumberOfDOFs(EDGE);
nd = admin->getNumberOfDofs(EDGE);
if (nd) {
nd0 = admin->getNumberOfPreDOFs(EDGE);
n0 = admin->getMesh()->getNode(EDGE);
......@@ -292,7 +292,7 @@ namespace AMDiS {
}
if (mesh->getDim() == 3) {
nd = admin->getNumberOfDOFs(FACE);
nd = admin->getNumberOfDofs(FACE);
if (nd) {
nd0 = admin->getNumberOfPreDOFs(FACE);
n0 = admin->getMesh()->getNode(FACE);
......@@ -302,7 +302,7 @@ namespace AMDiS {
}
}
nd = admin->getNumberOfDOFs(CENTER);
nd = admin->getNumberOfDofs(CENTER);
if (nd) {
nd0 = admin->getNumberOfPreDOFs(CENTER);
n0 = admin->getMesh()->getNode(CENTER);
......@@ -400,7 +400,7 @@ namespace AMDiS {
int ndof = 0;
for (int i = 0; i < mesh->getNumberOfDOFAdmin(); i++)
ndof += mesh->getDOFAdmin(i).getNumberOfDOFs(position);
ndof += mesh->getDofAdmin(i).getNumberOfDofs(position);
if (ndof > 0) {
for (int i = 0; i < mesh->getGeo(position); i++) {
......
AMDiS/src/ElementDofIterator.cc
View file @ b3de56bb
......@@ -25,7 +25,7 @@ namespace AMDiS {
// Get geo index of vertices in the given dimension.
posIndex = INDEX_OF_DIM(pos, dim);
// Get number of dofs per vertex (should be one in all cases).
nDofs = admin->getNumberOfDOFs(posIndex);
nDofs = admin->getNumberOfDofs(posIndex);
TEST_EXIT_DBG(nDofs != 0)("Mh, I've to think about this situation!\n");
......@@ -65,7 +65,7 @@ namespace AMDiS {
// Get geo index posistion.
posIndex = INDEX_OF_DIM(pos, dim);
// Get number of dofs in this position.
nDofs = admin->getNumberOfDOFs(posIndex);
nDofs = admin->getNumberOfDofs(posIndex);
} while (nDofs == 0 && pos < dim);
if (nDofs > 0 && pos <= dim) {
......
AMDiS/src/FiniteElemSpace.cc
View file @ b3de56bb
......@@ -26,13 +26,13 @@ namespace AMDiS {
if (!admin) {
const DOFAdmin *admin_local = NULL;
const DimVec<int> *ndof = NULL;
ndof = basFcts->getNumberOfDOFs();
ndof = basFcts->getNumberOfDofs();
TEST_EXIT(ndof)("no n_dof or basFcts->n_dof\n");
for (int i = 0; i < mesh->getNumberOfDOFAdmin(); i++) {
admin_local = &(mesh->getDOFAdmin(i));
admin_local = &(mesh->getDofAdmin(i));
int j = 0;
for (; j <= mesh->getDim(); j++)
if (admin_local->getNumberOfDOFs(j) != (*ndof)[j])
if (admin_local->getNumberOfDofs(j) != (*ndof)[j])
break;
if (j > mesh->getDim())
break;
......@@ -60,10 +60,10 @@ namespace AMDiS {
mesh = new Mesh(feSpace.mesh->getName(), feSpace.mesh->getDim());
*mesh = *(feSpace.mesh);
admin = &(const_cast<DOFAdmin&>(mesh->getDOFAdmin(0)));
admin = &(const_cast<DOFAdmin&>(mesh->getDofAdmin(0)));
basFcts = feSpace.basFcts;
TEST_EXIT(feSpace.admin == &(feSpace.mesh->getDOFAdmin(0)))
TEST_EXIT(feSpace.admin == &(feSpace.mesh->getDofAdmin(0)))
("Gut, dass muss ich mir noch mal ueberlegen!\n");
return *this;
......
AMDiS/src/Lagrange.cc
View file @ b3de56bb
......@@ -192,7 +192,7 @@ namespace AMDiS {
(*ndofDimDegree[dim][degree])[VERTEX] = 0;
for (int i = 1; i < dim + 1; i++) {
nBasFcts = getNumberOfDOFs(i, degree);
nBasFcts = getNumberOfDofs(i, degree);
(*ndofDimDegree[dim][degree])[INDEX_OF_DIM(i, dim)] = nBasFcts;
for (int j = 0; j < i; j++) {
(*ndofDimDegree[dim][degree])[INDEX_OF_DIM(i, dim)] -=
......@@ -674,7 +674,7 @@ namespace AMDiS {
}
}
int Lagrange::getNumberOfDOFs(int dim, int degree)
int Lagrange::getNumberOfDofs(int dim, int degree)
{
int result = 0;
for (int i = 0; i <= degree; i++)
......@@ -936,7 +936,7 @@ namespace AMDiS {
for (int pos = 0, j = 0; pos <= dim; pos++) {
posIndex = INDEX_OF_DIM(pos, dim);
nrDOFs = admin->getNumberOfDOFs(posIndex);
nrDOFs = admin->getNumberOfDofs(posIndex);
if (nrDOFs) {
n0 = admin->getNumberOfPreDOFs(posIndex);
......@@ -968,7 +968,7 @@ namespace AMDiS {
for (int pos = 0, j = 0; pos <= dim; pos++) {
posIndex = INDEX_OF_DIM(pos, dim);
nrDOFs = admin->getNumberOfDOFs(posIndex);
nrDOFs = admin->getNumberOfDofs(posIndex);
if (nrDOFs) {
n0 = admin->getNumberOfPreDOFs(posIndex);
......
AMDiS/src/Lagrange.h
View file @ b3de56bb
......@@ -165,7 +165,7 @@ namespace AMDiS {
int positionIndex) const;
/// Calculates the number of DOFs needed for Lagrange of the given dim and degree.
static int getNumberOfDOFs(int dim, int degree);
static int getNumberOfDofs(int dim, int degree);
private:
/// barycentric coordinates of the locations of all basis functions
......
AMDiS/src/MacroReader.cc
View file @ b3de56bb
......@@ -284,7 +284,7 @@ namespace AMDiS {
macroInfo->fillBoundaryInfo(mesh);
if (mesh->getNumberOfDOFs(CENTER)) {
if (mesh->getNumberOfDofs(CENTER)) {
for (int i = 0; i < mesh->getNumberOfMacros(); i++)
const_cast<Element*>(mel[i]->getElement())->
setDof(mesh->getNode(CENTER), mesh->getDof(CENTER));
......@@ -444,7 +444,7 @@ namespace AMDiS {
mesh->incrementNumberOfEdges(1);
if (mesh->getNumberOfDOFs(EDGE)) {
if (mesh->getNumberOfDofs(EDGE)) {
dof = mesh->getDof(EDGE);
el->setDof(lnode + i, dof);
......@@ -505,7 +505,7 @@ namespace AMDiS {
mesh->incrementNumberOfFaces(1);
if (mesh->getNumberOfDOFs(FACE)) {
if (mesh->getNumberOfDofs(FACE)) {
TEST_EXIT(!(*(mel + i))->getElement()->getDof(lnode + k))
("dof %d on element %d already set\n",
lnode + k, (*(mel + i))->getIndex());
......@@ -696,7 +696,7 @@ namespace AMDiS {
list_bound[0] = &(mel->boundary[mesh->getGeo(FACE)+edge_no]);
list_project[0] = &(mel->projection[mesh->getGeo(FACE)+edge_no]);
if (mesh->getNumberOfDOFs(EDGE)) {
if (mesh->getNumberOfDofs(EDGE)) {
node = mesh->getNode(EDGE);
if (el->getDof(node+edge_no)) {
/****************************************************************************/
......@@ -742,12 +742,12 @@ namespace AMDiS {
break;
}
if (mesh->getNumberOfDOFs(EDGE)) {
if (mesh->getNumberOfDofs(EDGE)) {
TEST_EXIT(nei->index > mel_index)
("neighbour index %d < element index %d\n", nei->getIndex(), mel_index);
}
if (!mesh->getNumberOfDOFs(EDGE) && nei->getIndex() < mel_index)
if (!mesh->getNumberOfDofs(EDGE) && nei->getIndex() < mel_index)
return false;
edge_no = Tetrahedron::edgeOfDofs[j][k];
......@@ -761,7 +761,7 @@ namespace AMDiS {
list_project[(*n_neigh)++] =
&(nei->projection[mesh->getGeo(FACE)+edge_no]);
if (mesh->getNumberOfDOFs(EDGE))
if (mesh->getNumberOfDofs(EDGE))
nei->element->setDof(node+edge_no,edge_dof);
if (next_el[edge_no][0] != opp_v) {
......@@ -823,7 +823,7 @@ namespace AMDiS {
if (j == 4 || k == 4)
return false;
if (mesh->getNumberOfDOFs(EDGE)) {
if (mesh->getNumberOfDofs(EDGE)) {
TEST_EXIT(nei->getIndex() > mel_index)
("neighbour index %d < element index %d\n", nei->getIndex(),
mel_index);
......@@ -839,7 +839,7 @@ namespace AMDiS {
list_bound[(*n_neigh)] = &(nei->boundary[mesh->getGeo(FACE) + edge_no]);
list_project[(*n_neigh)++] = &(nei->projection[mesh->getGeo(FACE) + edge_no]);
if (mesh->getNumberOfDOFs(EDGE)) {
if (mesh->getNumberOfDofs(EDGE)) {
TEST_EXIT(!nei->getElement()->getDof(node+edge_no))
("dof %d on element %d is already set, but not on element %d\n",
node + edge_no, nei->getIndex(), mel_index);
......@@ -964,7 +964,7 @@ namespace AMDiS {
me->setOppVertex(2,macr->getOppVertex(1));
if (mesh->getNumberOfDOFs(VERTEX)) { /* Ecken */
if (mesh->getNumberOfDofs(VERTEX)) { /* Ecken */
n0 = mesh->getNode(VERTEX);
const_cast<Element*>(me->getElement())->setDof(n0,d[n0+2]);
......@@ -972,7 +972,7 @@ namespace AMDiS {
const_cast<Element*>(me->getElement())->setDof(n0+2,d[n0+1]);
}
if (mesh->getNumberOfDOFs(EDGE)) { /* Kanten */
if (mesh->getNumberOfDofs(EDGE)) { /* Kanten */
n0 = mesh->getNode(EDGE);
const_cast<Element*>(me->getElement())->setDof(n0,d[n0+2]);
......@@ -1000,7 +1000,7 @@ namespace AMDiS {
me->setOppVertex(1,macr->getOppVertex(2));
me->setOppVertex(2,macr->getOppVertex(0));
if (mesh->getNumberOfDOFs(VERTEX)) { /* Ecken */
if (mesh->getNumberOfDofs(VERTEX)) { /* Ecken */
n0 = mesh->getNode(VERTEX);
const_cast<Element*>(me->getElement())->setDof(n0,d[n0+1]);
......@@ -1008,7 +1008,7 @@ namespace AMDiS {
const_cast<Element*>(me->getElement())->setDof(n0+2,d[n0]);
}
if (mesh->getNumberOfDOFs(EDGE)) { /* Kanten */
if (mesh->getNumberOfDofs(EDGE)) { /* Kanten */
n0 = mesh->getNode(EDGE);
const_cast<Element*>(me->getElement())->setDof(n0,d[n0+1]);
......@@ -1240,9 +1240,9 @@ namespace AMDiS {
TEST(nused + nfree == localAdmin->getSize())
("nused = %d, nfree = %d, admin.size = %d ????\n",
nused, nfree, localAdmin->getSize());
TEST(nused == localAdmin->getUsedDOFs())
TEST(nused == localAdmin->getUsedDofs())
("nused = %d, admin.used_count = %d ?????\n",
nused, localAdmin->getUsedDOFs());
nused, localAdmin->getUsedDofs());
}
}
......@@ -1337,19 +1337,19 @@ namespace AMDiS {
FUNCNAME("MacroReader::basicDOFCheckFct()");
Element* el = elinfo->getElement();
const DOFAdmin& admin = mesh->getDOFAdmin(iadmin);
const DOFAdmin& admin = mesh->getDofAdmin(iadmin);
const Element *neig;
const DegreeOfFreedom *dof;
if (0 == mesh->dof_used.size())
return;
int ndof = admin.getNumberOfDOFs(VERTEX);
int ndof = admin.getNumberOfDofs(VERTEX);
if (ndof) {
int j0 = admin.getNumberOfPreDOFs(VERTEX);
TEST_EXIT(j0 + ndof <= mesh->getNumberOfDOFs(VERTEX))
TEST_EXIT(j0 + ndof <= mesh->getNumberOfDofs(VERTEX))
("admin.getNumberOfPreDOFs(VERTEX) %d + nDOF %d > mesh->nDOF %d\n",
j0, ndof, mesh->getNumberOfDOFs(VERTEX));
j0, ndof, mesh->getNumberOfDofs(VERTEX));
int i0 = mesh->getNode(VERTEX);
for (int i = 0; i < mesh->getGeo(VERTEX); i++) {
if ((dof = el->getDof(i0+i)) == NULL) {
......@@ -1368,13 +1368,13 @@ namespace AMDiS {
if (mesh->getDim() > 1) {
ndof = admin.getNumberOfDOFs(EDGE);
ndof = admin.getNumberOfDofs(EDGE);
if (ndof) {
int j0 = admin.getNumberOfPreDOFs(EDGE);
TEST_EXIT(j0 + ndof <= mesh->getNumberOfDOFs(EDGE))