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

Code refactoring and work on parallelization.

parent 739be0ef
...@@ -53,7 +53,7 @@ namespace AMDiS { ...@@ -53,7 +53,7 @@ namespace AMDiS {
file.write(reinterpret_cast<char*>(&nValueVectors), 4); file.write(reinterpret_cast<char*>(&nValueVectors), 4);
uint32_t nAllValues = 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); file.write(reinterpret_cast<char*>(&nAllValues), 4);
MeshStructure elementStructure; MeshStructure elementStructure;
......
...@@ -143,7 +143,7 @@ namespace AMDiS { ...@@ -143,7 +143,7 @@ namespace AMDiS {
} }
int BasisFunction::getNumberOfDOFs(int i) const int BasisFunction::getNumberOfDofs(int i) const
{ {
return (*nDOF)[i]; return (*nDOF)[i];
} }
......
...@@ -161,10 +161,10 @@ namespace AMDiS { ...@@ -161,10 +161,10 @@ namespace AMDiS {
} }
/// Returns \ref nDOF[i] /// Returns \ref nDOF[i]
int getNumberOfDOFs(int i) const; int getNumberOfDofs(int i) const;
/// Returns \ref nDOF /// Returns \ref nDOF
inline DimVec<int>* getNumberOfDOFs() const inline DimVec<int>* getNumberOfDofs() const
{ {
return nDOF; return nDOF;
} }
......
...@@ -68,13 +68,13 @@ namespace AMDiS { ...@@ -68,13 +68,13 @@ namespace AMDiS {
/*--- hand DOFs from children to parent, and add DOF at center ---*/ /*--- 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); int node = mesh->getNode(VERTEX);
parent->setDof(node+0, const_cast<int*>( child[0]->getDof(node+0))); parent->setDof(node+0, const_cast<int*>( child[0]->getDof(node+0)));
parent->setDof(node+1, const_cast<int*>( child[1]->getDof(node+1))); 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)); parent->setDof(mesh->getNode(CENTER), mesh->getDof(CENTER));
} }
...@@ -89,7 +89,7 @@ namespace AMDiS { ...@@ -89,7 +89,7 @@ namespace AMDiS {
int nrAdmin = mesh->getNumberOfDOFAdmin(); int nrAdmin = mesh->getNumberOfDOFAdmin();
for(iadmin = 0; iadmin < nrAdmin; iadmin++) { for(iadmin = 0; iadmin < nrAdmin; iadmin++) {
std::list<DOFIndexedBase*>::iterator it; 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(); std::list<DOFIndexedBase*>::iterator end = admin->endDOFIndexed();
for(it = admin->beginDOFIndexed(); it != end; ++it) for(it = admin->beginDOFIndexed(); it != end; ++it)
(*it)->coarseRestrict(coarsenList, 1); (*it)->coarseRestrict(coarsenList, 1);
...@@ -100,12 +100,12 @@ namespace AMDiS { ...@@ -100,12 +100,12 @@ namespace AMDiS {
/*--- remove all DOFs of children that are not used anymore ---*/ /*--- 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); 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[0]->getDof(mesh->getNode(CENTER))), CENTER);
mesh->freeDof(const_cast<int*>( child[1]->getDof(mesh->getNode(CENTER))), CENTER); mesh->freeDof(const_cast<int*>( child[1]->getDof(mesh->getNode(CENTER))), CENTER);
......
...@@ -30,11 +30,11 @@ namespace AMDiS { ...@@ -30,11 +30,11 @@ namespace AMDiS {
el->getIndex(), child[0]->getIndex(), child[1]->getIndex()); el->getIndex(), child[0]->getIndex(), child[1]->getIndex());
// remove dof from common edge of child[0] and child[1] // 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); mesh->freeDof(const_cast<int*>(child[0]->getDof(4)), EDGE);
// remove dof from the barycenters of child[0] and child[1] // remove dof from the barycenters of child[0] and child[1]
if (mesh->getNumberOfDOFs(CENTER)) { if (mesh->getNumberOfDofs(CENTER)) {
int node = mesh->getNode(CENTER); int node = mesh->getNode(CENTER);
mesh->freeDof(const_cast<int*>(child[0]->getDof(node)), CENTER); mesh->freeDof(const_cast<int*>(child[0]->getDof(node)), CENTER);
...@@ -72,14 +72,14 @@ namespace AMDiS { ...@@ -72,14 +72,14 @@ namespace AMDiS {
DegreeOfFreedom *dof[3]; DegreeOfFreedom *dof[3];
dof[0] = const_cast<int*>(el->getChild(0)->getDof(2)); 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[1] = const_cast<int*>(el->getChild(0)->getDof(3));
dof[2] = const_cast<int*>(el->getChild(1)->getDof(4)); dof[2] = const_cast<int*>(el->getChild(1)->getDof(4));
} else { } else {
dof[1] = dof[2] = 0; dof[1] = dof[2] = 0;
} }
if (mesh->getNumberOfDOFs(EDGE)) { if (mesh->getNumberOfDofs(EDGE)) {
int node = mesh->getNode(EDGE); int node = mesh->getNode(EDGE);
// get new dof on el at the midpoint of the coarsening edge // get new dof on el at the midpoint of the coarsening edge
...@@ -90,14 +90,14 @@ namespace AMDiS { ...@@ -90,14 +90,14 @@ namespace AMDiS {
} }
} }
if (mesh->getNumberOfDOFs(EDGE) || mesh->getNumberOfDOFs(CENTER)) if (mesh->getNumberOfDofs(EDGE) || mesh->getNumberOfDofs(CENTER))
coarsenList->addDOFParents(n_neigh); coarsenList->addDOFParents(n_neigh);
// restrict dof vectors to the parents on the patch // restrict dof vectors to the parents on the patch
int nrAdmin = mesh->getNumberOfDOFAdmin(); int nrAdmin = mesh->getNumberOfDOFAdmin();
for (int iadmin = 0; iadmin < nrAdmin; iadmin++) { 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(); for (std::list<DOFIndexedBase*>::iterator it = admin->beginDOFIndexed();
it != admin->endDOFIndexed(); ++it) it != admin->endDOFIndexed(); ++it)
(*it)->coarseRestrict(*coarsenList, n_neigh); (*it)->coarseRestrict(*coarsenList, n_neigh);
...@@ -111,7 +111,7 @@ namespace AMDiS { ...@@ -111,7 +111,7 @@ namespace AMDiS {
// now, remove those dofs in the coarcening edge // now, remove those dofs in the coarcening edge
mesh->freeDof(dof[0], VERTEX); mesh->freeDof(dof[0], VERTEX);
if (mesh->getNumberOfDOFs(EDGE)) { if (mesh->getNumberOfDofs(EDGE)) {
mesh->freeDof(dof[1], EDGE); mesh->freeDof(dof[1], EDGE);
mesh->freeDof(dof[2], EDGE); mesh->freeDof(dof[2], EDGE);
} }
......
...@@ -133,11 +133,11 @@ namespace AMDiS { ...@@ -133,11 +133,11 @@ namespace AMDiS {
/* boundary face or neigh has been coarsend: free the dof's in the face */ /* 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]; node = mesh->getNode(EDGE) + Tetrahedron::nChildEdge[el_type][0][dir];
mesh->freeDof(const_cast<int*>( child[0]->getDof(node)), EDGE); 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]; node = mesh->getNode(FACE) + Tetrahedron::nChildFace[el_type][0][dir];
mesh->freeDof(const_cast<int*>( child[0]->getDof(node)), FACE); mesh->freeDof(const_cast<int*>( child[0]->getDof(node)), FACE);
node = mesh->getNode(FACE) + Tetrahedron::nChildFace[el_type][1][dir]; node = mesh->getNode(FACE) + Tetrahedron::nChildFace[el_type][1][dir];
...@@ -151,13 +151,13 @@ namespace AMDiS { ...@@ -151,13 +151,13 @@ namespace AMDiS {
/* child[1] and at the two barycenter */ /* child[1] and at the two barycenter */
/****************************************************************************/ /****************************************************************************/
if (mesh->getNumberOfDOFs(FACE)) { if (mesh->getNumberOfDofs(FACE)) {
node = mesh->getNode(FACE); node = mesh->getNode(FACE);
mesh->freeDof(const_cast<int*>( child[0]->getDof(node)), FACE); mesh->freeDof(const_cast<int*>( child[0]->getDof(node)), FACE);
} }
if (mesh->getNumberOfDOFs(CENTER)) { if (mesh->getNumberOfDofs(CENTER)) {
node = mesh->getNode(CENTER); node = mesh->getNode(CENTER);
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++)
mesh->freeDof(const_cast<int*>( child[i]->getDof(node)), CENTER); mesh->freeDof(const_cast<int*>( child[i]->getDof(node)), CENTER);
...@@ -318,7 +318,7 @@ namespace AMDiS { ...@@ -318,7 +318,7 @@ namespace AMDiS {
int i, node; int i, node;
DegreeOfFreedom *dof; DegreeOfFreedom *dof;
if (mesh->getNumberOfDOFs(EDGE)) { if (mesh->getNumberOfDofs(EDGE)) {
/****************************************************************************/ /****************************************************************************/
/* get dof for coarsening edge */ /* get dof for coarsening edge */
/****************************************************************************/ /****************************************************************************/
...@@ -329,9 +329,9 @@ namespace AMDiS { ...@@ -329,9 +329,9 @@ namespace AMDiS {
dof = NULL; dof = NULL;
} }
if (mesh->getNumberOfDOFs(EDGE) || if (mesh->getNumberOfDofs(EDGE) ||
mesh->getNumberOfDOFs(FACE) || mesh->getNumberOfDofs(FACE) ||
mesh->getNumberOfDOFs(CENTER)) { mesh->getNumberOfDofs(CENTER)) {
for (i = 0; i < n_neigh; i++) for (i = 0; i < n_neigh; i++)
coarsenList->addDOFParent(i, dof); coarsenList->addDOFParent(i, dof);
} }
...@@ -344,7 +344,7 @@ namespace AMDiS { ...@@ -344,7 +344,7 @@ namespace AMDiS {
int nrAdmin = mesh->getNumberOfDOFAdmin(); int nrAdmin = mesh->getNumberOfDOFAdmin();
for (int iadmin = 0; iadmin < nrAdmin; iadmin++) { for (int iadmin = 0; iadmin < nrAdmin; iadmin++) {
std::list<DOFIndexedBase*>::iterator it; 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(); std::list<DOFIndexedBase*>::iterator end = admin->endDOFIndexed();
for (it = admin->beginDOFIndexed(); it != end; ++it) for (it = admin->beginDOFIndexed(); it != end; ++it)
(*it)->coarseRestrict(*coarsenList, n_neigh); (*it)->coarseRestrict(*coarsenList, n_neigh);
...@@ -359,7 +359,7 @@ namespace AMDiS { ...@@ -359,7 +359,7 @@ namespace AMDiS {
mesh->freeDof(const_cast<int*>( el->getChild(0)->getDof(3)), VERTEX); mesh->freeDof(const_cast<int*>( el->getChild(0)->getDof(3)), VERTEX);
mesh->incrementNumberOfVertices(-1); mesh->incrementNumberOfVertices(-1);
if (mesh->getNumberOfDOFs(EDGE)) { if (mesh->getNumberOfDofs(EDGE)) {
node = mesh->getNode(EDGE) + 2; node = mesh->getNode(EDGE) + 2;
mesh->freeDof(const_cast<int*>( el->getChild(0)->getDof(node)), EDGE); mesh->freeDof(const_cast<int*>( el->getChild(0)->getDof(node)), EDGE);
mesh->freeDof(const_cast<int*>( el->getChild(1)->getDof(node)), EDGE); mesh->freeDof(const_cast<int*>( el->getChild(1)->getDof(node)), EDGE);
......
...@@ -133,7 +133,7 @@ namespace AMDiS { ...@@ -133,7 +133,7 @@ namespace AMDiS {
} }
/// Returns \ref usedCount /// Returns \ref usedCount
inline const int getUsedDOFs() const inline const int getUsedDofs() const
{ {
return usedCount; return usedCount;
} }
...@@ -151,13 +151,13 @@ namespace AMDiS { ...@@ -151,13 +151,13 @@ namespace AMDiS {
} }
/// Returns \ref nrDOF[i], i.e., the number of dofs for the position i. /// 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]; return nrDOF[i];
} }
/// Returns \ref nrDOF /// Returns \ref nrDOF
inline const DimVec<int>& getNumberOfDOFs() const inline const DimVec<int>& getNumberOfDofs() const
{ {
return nrDOF; return nrDOF;
} }
......
...@@ -91,7 +91,7 @@ namespace AMDiS { ...@@ -91,7 +91,7 @@ namespace AMDiS {
int nPositions = mesh->getGeo(geoIndex); int nPositions = mesh->getGeo(geoIndex);
int numPreDOFs = admin->getNumberOfPreDOFs(i); int numPreDOFs = admin->getNumberOfPreDOFs(i);
for (int j = 0; j < nPositions; j++) { for (int j = 0; j < nPositions; j++) {
int dofs = basFcts->getNumberOfDOFs(geoIndex); int dofs = basFcts->getNumberOfDofs(geoIndex);
numNodeDOFs.push_back(dofs); numNodeDOFs.push_back(dofs);
nDofs += dofs; nDofs += dofs;
numNodePreDOFs.push_back(numPreDOFs); numNodePreDOFs.push_back(numPreDOFs);
...@@ -651,7 +651,7 @@ namespace AMDiS { ...@@ -651,7 +651,7 @@ namespace AMDiS {
int numPositionNodes = mesh->getGeo(geoIndex); int numPositionNodes = mesh->getGeo(geoIndex);
int numPreDOFs = admin->getNumberOfPreDOFs(i); int numPreDOFs = admin->getNumberOfPreDOFs(i);
for (int j = 0; j < numPositionNodes; j++) { for (int j = 0; j < numPositionNodes; j++) {
int dofs = basFcts->getNumberOfDOFs(geoIndex); int dofs = basFcts->getNumberOfDofs(geoIndex);
numNodeDOFs.push_back(dofs); numNodeDOFs.push_back(dofs);
nDofs += dofs; nDofs += dofs;
numNodePreDOFs.push_back(numPreDOFs); numNodePreDOFs.push_back(numPreDOFs);
......
...@@ -208,6 +208,9 @@ namespace AMDiS { ...@@ -208,6 +208,9 @@ namespace AMDiS {
DegreeOfFreedom vertexDOF; DegreeOfFreedom vertexDOF;
WorldVector<double> vertexCoords; 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 // create ElementInfo
ElementInfo elementInfo(dim); ElementInfo elementInfo(dim);
......
...@@ -102,7 +102,7 @@ namespace AMDiS { ...@@ -102,7 +102,7 @@ namespace AMDiS {
int ndof = 0; int ndof = 0;
for (int i = 0; i < mesh->getNumberOfDOFAdmin(); i++) for (int i = 0; i < mesh->getNumberOfDOFAdmin(); i++)
ndof += mesh->getDOFAdmin(i).getNumberOfDOFs(position); ndof += mesh->getDofAdmin(i).getNumberOfDofs(position);
if (ndof > 0) { if (ndof > 0) {
for (int i = 0; i < mesh->getGeo(position); i++) { for (int i = 0; i < mesh->getGeo(position); i++) {
...@@ -158,7 +158,7 @@ namespace AMDiS { ...@@ -158,7 +158,7 @@ namespace AMDiS {
int ndof = 0; int ndof = 0;
for (int i = 0; i < mesh->getNumberOfDOFAdmin(); i++) for (int i = 0; i < mesh->getNumberOfDOFAdmin(); i++)
ndof += mesh->getDOFAdmin(i).getNumberOfDOFs(position); ndof += mesh->getDofAdmin(i).getNumberOfDofs(position);
if (ndof > 0) { if (ndof > 0) {
for (int i = 0; i < mesh->getGeo(position); i++) { for (int i = 0; i < mesh->getGeo(position); i++) {
...@@ -226,7 +226,7 @@ namespace AMDiS { ...@@ -226,7 +226,7 @@ namespace AMDiS {
int edges = mesh->getGeo(EDGE); int edges = mesh->getGeo(EDGE);
int faces = mesh->getGeo(FACE); int faces = mesh->getGeo(FACE);
if ((nd = admin->getNumberOfDOFs(VERTEX))) { if ((nd = admin->getNumberOfDofs(VERTEX))) {
nd0 = admin->getNumberOfPreDOFs(VERTEX); nd0 = admin->getNumberOfPreDOFs(VERTEX);
n0 = admin->getMesh()->getNode(VERTEX); n0 = admin->getMesh()->getNode(VERTEX);
for (int i = 0; i < vertices; i++) { for (int i = 0; i < vertices; i++) {
...@@ -235,7 +235,7 @@ namespace AMDiS { ...@@ -235,7 +235,7 @@ namespace AMDiS {
} }
if (mesh->getDim() > 1) { if (mesh->getDim() > 1) {
if ((nd = admin->getNumberOfDOFs(EDGE))) { if ((nd = admin->getNumberOfDofs(EDGE))) {
nd0 = admin->getNumberOfPreDOFs(EDGE); nd0 = admin->getNumberOfPreDOFs(EDGE);
n0 = admin->getMesh()->getNode(EDGE); n0 = admin->getMesh()->getNode(EDGE);
for (int i = 0; i < edges; i++) { for (int i = 0; i < edges; i++) {
...@@ -245,7 +245,7 @@ namespace AMDiS { ...@@ -245,7 +245,7 @@ namespace AMDiS {
} }
if (mesh->getDim() == 3) { if (mesh->getDim() == 3) {
if ((nd = admin->getNumberOfDOFs(FACE))) { if ((nd = admin->getNumberOfDofs(FACE))) {
nd0 = admin->getNumberOfPreDOFs(FACE); nd0 = admin->getNumberOfPreDOFs(FACE);
n0 = admin->getMesh()->getNode(FACE); n0 = admin->getMesh()->getNode(FACE);
for (int i = 0; i < faces; i++) { for (int i = 0; i < faces; i++) {
...@@ -254,7 +254,7 @@ namespace AMDiS { ...@@ -254,7 +254,7 @@ namespace AMDiS {
} }
} }
if ((nd = admin->getNumberOfDOFs(CENTER))) { if ((nd = admin->getNumberOfDofs(CENTER))) {
nd0 = admin->getNumberOfPreDOFs(CENTER); nd0 = admin->getNumberOfPreDOFs(CENTER);
n0 = admin->getMesh()->getNode(CENTER); n0 = admin->getMesh()->getNode(CENTER);
int i = 0; /* only one center */ int i = 0; /* only one center */
...@@ -271,7 +271,7 @@ namespace AMDiS { ...@@ -271,7 +271,7 @@ namespace AMDiS {
int edges = mesh->getGeo(EDGE); int edges = mesh->getGeo(EDGE);
int faces = mesh->getGeo(FACE); int faces = mesh->getGeo(FACE);
int nd = admin->getNumberOfDOFs(VERTEX); int nd = admin->getNumberOfDofs(VERTEX);
if (nd) { if (nd) {
nd0 = admin->getNumberOfPreDOFs(VERTEX); nd0 = admin->getNumberOfPreDOFs(VERTEX);
n0 = admin->getMesh()->getNode(VERTEX); n0 = admin->getMesh()->getNode(VERTEX);
...@@ -281,7 +281,7 @@ namespace AMDiS { ...@@ -281,7 +281,7 @@ namespace AMDiS {
} }
if (mesh->getDim() > 1) { if (mesh->getDim() > 1) {
nd = admin->getNumberOfDOFs(EDGE); nd = admin->getNumberOfDofs(EDGE);
if (nd) { if (nd) {
nd0 = admin->getNumberOfPreDOFs(EDGE); nd0 = admin->getNumberOfPreDOFs(EDGE);
n0 = admin->getMesh()->getNode(EDGE); n0 = admin->getMesh()->getNode(EDGE);
...@@ -292,7 +292,7 @@ namespace AMDiS { ...@@ -292,7 +292,7 @@ namespace AMDiS {
} }
if (mesh->getDim() == 3) { if (mesh->getDim() == 3) {
nd = admin->getNumberOfDOFs(FACE); nd = admin->getNumberOfDofs(FACE);
if (nd) { if (nd) {
nd0 = admin->getNumberOfPreDOFs(FACE); nd0 = admin->getNumberOfPreDOFs(FACE);
n0 = admin->getMesh()->getNode(FACE); n0 = admin->getMesh()->getNode(FACE);
...@@ -302,7 +302,7 @@ namespace AMDiS { ...@@ -302,7 +302,7 @@ namespace AMDiS {
} }
} }
nd = admin->getNumberOfDOFs(CENTER); nd = admin->getNumberOfDofs(CENTER);
if (nd) { if (nd) {
nd0 = admin->getNumberOfPreDOFs(CENTER); nd0 = admin->getNumberOfPreDOFs(CENTER);
n0 = admin->getMesh()->getNode(CENTER); n0 = admin->getMesh()->getNode(CENTER);
...@@ -400,7 +400,7 @@ namespace AMDiS { ...@@ -400,7 +400,7 @@ namespace AMDiS {
int ndof = 0; int ndof = 0;
for (int i = 0; i < mesh->getNumberOfDOFAdmin(); i++) for (int i = 0; i < mesh->getNumberOfDOFAdmin(); i++)
ndof += mesh->getDOFAdmin(i).getNumberOfDOFs(position); ndof += mesh->getDofAdmin(i).getNumberOfDofs(position);
if (ndof > 0) { if (ndof > 0) {
for (int i = 0; i < mesh->getGeo(position); i++) { for (int i = 0; i < mesh->getGeo(position); i++) {
......
...@@ -25,7 +25,7 @@ namespace AMDiS { ...@@ -25,7 +25,7 @@ namespace AMDiS {
// Get geo index of vertices in the given dimension. // Get geo index of vertices in the given dimension.
posIndex = INDEX_OF_DIM(pos, dim); posIndex = INDEX_OF_DIM(pos, dim);
// Get number of dofs per vertex (should be one in all cases). // 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"); TEST_EXIT_DBG(nDofs != 0)("Mh, I've to think about this situation!\n");
...@@ -65,7 +65,7 @@ namespace AMDiS { ...@@ -65,7 +65,7 @@ namespace AMDiS {
// Get geo index posistion. // Get geo index posistion.
posIndex = INDEX_OF_DIM(pos, dim); posIndex = INDEX_OF_DIM(pos, dim);
// Get number of dofs in this position. // Get number of dofs in this position.
nDofs = admin->getNumberOfDOFs(posIndex); nDofs = admin->getNumberOfDofs(posIndex);
} while (nDofs == 0 && pos < dim); } while (nDofs == 0 && pos < dim);
if (nDofs > 0 && pos <= dim) { if (nDofs > 0 && pos <= dim) {
......
...@@ -26,13 +26,13 @@ namespace AMDiS { ...@@ -26,13 +26,13 @@ namespace AMDiS {
if (!admin) { if (!admin) {
const DOFAdmin *admin_local = NULL; const DOFAdmin *admin_local = NULL;
const DimVec<int> *ndof = NULL; const DimVec<int> *ndof = NULL;
ndof = basFcts->getNumberOfDOFs(); ndof = basFcts->getNumberOfDofs();
TEST_EXIT(ndof)("no n_dof or basFcts->n_dof\n"); TEST_EXIT(ndof)("no n_dof or basFcts->n_dof\n");
for (int i = 0; i < mesh->getNumberOfDOFAdmin(); i++) { for (int i = 0; i < mesh->getNumberOfDOFAdmin(); i++) {
admin_local = &(mesh->getDOFAdmin(i)); admin_local = &(mesh->getDofAdmin(i));
int j = 0; int j = 0;
for (; j <= mesh->getDim(); j++) for (; j <= mesh->getDim(); j++)
if (admin_local->getNumberOfDOFs(j) != (*ndof)[j]) if (admin_local->getNumberOfDofs(j) != (*ndof)[j])
break; break;
if (j > mesh->getDim()) if (j > mesh->getDim())
break; break;
...@@ -60,10 +60,10 @@ namespace AMDiS { ...@@ -60,10 +60,10 @@ namespace AMDiS {