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

Merged two AMDiS directories, no changes.

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