Commit a9ca5edc authored by Thomas Witkowski's avatar Thomas Witkowski

Merged two AMDiS directories, no changes.

parent 34dd5b2f
......@@ -33,7 +33,6 @@ namespace AMDiS {
MacroInfo *macroInfo = new MacroInfo();
macroInfo->readAMDiSMacro(filename, mesh);
#if 0
std::deque<MacroElement*>::iterator mel = macroInfo->mel.begin();
int **melVertex = macroInfo->mel_vertex;
WorldVector<double> *coords = macroInfo->coords;
......@@ -245,8 +244,9 @@ namespace AMDiS {
}
}
if (!macroInfo->bound_set)
if (!macroInfo->bound_set) {
macroInfo->dirichletBoundary();
}
if (mesh->getDim() > 1)
boundaryDOFs(mesh);
......@@ -315,7 +315,6 @@ namespace AMDiS {
macroTest(mesh, filenew);
}
}
#endif
return macroInfo;
}
......@@ -353,10 +352,6 @@ namespace AMDiS {
for (int i = 0; i < nv; i++)
dof[i] = mesh->getDOF(VERTEX);
std::cout << "REMOVE THIS RETURN!" << std::endl;
return;
for (int i = 0; i < ne; i++) {
mel[i]->element = mesh->createNewElement();
mel[i]->index = i;
......@@ -498,6 +493,7 @@ namespace AMDiS {
}
fclose(file);
/*******************************************************************************/
/* Test, if there is data for every key and if all is defined in right order. */
/*******************************************************************************/
......@@ -586,12 +582,8 @@ namespace AMDiS {
("number of vertices = %d must be bigger than 0\n", nv);
key_def[2] = true;
if (key_def[3])
fill(mesh, ne, nv);
std::cout << "REMOVE THIS RETURN" << std::endl;
return;
if (key_def[3])
fill(mesh, ne, nv);
break;
case 3:
......@@ -667,7 +659,7 @@ namespace AMDiS {
key_def[6] = true;
break;
case 7:
case 7:
// block "element neighbours"
fscanf(file, "%*s %*s");
......@@ -810,8 +802,6 @@ namespace AMDiS {
}
}
return;
if (ind)
delete ind;
......
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