Commit 99ad7c08 authored by Thomas Witkowski's avatar Thomas Witkowski

Merged two AMDiS directories, no changes.

parent eb4bddc0
This diff is collapsed.
......@@ -124,7 +124,7 @@ namespace AMDiS {
int dof = 0;
// if there is a hole
if (firstHole < static_cast<int>(dofFree.size())) {
if (firstHole < static_cast<int>(dofFree.size())) {
TEST_EXIT_DBG(dofFree[firstHole])("no hole at firstHole!\n");
// its no longer a hole
dofFree[firstHole] = false;
......@@ -140,6 +140,7 @@ namespace AMDiS {
} else { // if there is no hole
// enlarge dof-list
enlargeDOFLists(0);
TEST_EXIT_DBG(firstHole < static_cast<int>(dofFree.size()))
("no free entry after enlargeDOFLists\n");
TEST_EXIT_DBG(dofFree[firstHole])("no free bit at firstHole\n");
......@@ -153,7 +154,7 @@ namespace AMDiS {
holeCount--;
sizeUsed = max(sizeUsed, dof + 1);
return(dof);
return dof;
}
void DOFAdmin::enlargeDOFLists(int minsize)
......@@ -179,8 +180,10 @@ namespace AMDiS {
std::list<DOFIndexedBase*>::iterator di;
for (di = dofIndexedList.begin(); di != dofIndexedList.end(); ++di)
if ((*di)->getSize() < newval)
(*di)->resize(newval);
if ((*di)->getSize() < newval) {
(*di)->resize(newval);
std::cout << "RESIE WITH " << (*di)->getSize() << " " << newval << std::endl;
}
}
void DOFAdmin::addDOFIndexed(DOFIndexedBase* dofIndexed)
......
......@@ -419,7 +419,7 @@ namespace AMDiS {
inline void resize(int n)
{
FUNCNAME("DOFVector<T>::resize()");
TEST_EXIT_DBG((n >= 0))("Can't resize DOFVector to negative size\n");
TEST_EXIT_DBG(n >= 0)("Can't resize DOFVector to negative size\n");
vec.resize(n);
}
......@@ -427,7 +427,7 @@ namespace AMDiS {
inline void resize(int n, T init)
{
FUNCNAME("DOFVector<T>::resize()");
TEST_EXIT_DBG((n >= 0))("Can't resize DOFVector to negative size\n");
TEST_EXIT_DBG(n >= 0)("Can't resize DOFVector to negative size\n");
vec.resize(n, init);
}
......@@ -435,7 +435,7 @@ namespace AMDiS {
inline const T& operator[](DegreeOfFreedom i) const
{
FUNCNAME("DOFVector<T>::operator[]");
TEST_EXIT_DBG((i>= 0) && (i < static_cast<int>(vec.size())))
TEST_EXIT_DBG(i >= 0 && i < static_cast<int>(vec.size()))
("Illegal vector index %d.\n",i);
return vec[i];
}
......@@ -444,7 +444,7 @@ namespace AMDiS {
inline T& operator[](DegreeOfFreedom i)
{
FUNCNAME("DOFVector<T>::operator[]");
TEST_EXIT_DBG((i >= 0) && (i < static_cast<int>(vec.size())))
TEST_EXIT_DBG(i >= 0 && i < static_cast<int>(vec.size()))
("Illegal vector index %d.\n",i);
return vec[i];
}
......
......@@ -71,9 +71,10 @@ namespace AMDiS {
DOFVectorBase<T>::DOFVectorBase(const FiniteElemSpace *f, std::string n)
: feSpace(f),
name(n),
elementVector(f->getBasisFcts()->getNumber()),
// elementVector(f->getBasisFcts()->getNumber()),
boundaryManager(NULL)
{
/*
nBasFcts = feSpace->getBasisFcts()->getNumber();
dim = feSpace->getMesh()->getDim();
......@@ -90,6 +91,7 @@ namespace AMDiS {
grdTmp[i] = new DimVec<double>(dim, DEFAULT_VALUE, 0.0);
D2Phis[i] = new DimMat<double>(dim, NO_INIT);
}
*/
}
template<typename T>
......@@ -116,11 +118,11 @@ namespace AMDiS {
template<typename T>
void DOFVector<T>::init(const FiniteElemSpace* f, std::string n)
{
this->name = n;
this->feSpace = f;
if (this->feSpace && this->feSpace->getAdmin())
(this->feSpace->getAdmin())->addDOFIndexed(this);
this->boundaryManager = new BoundaryManager(f);
// this->name = n;
// this->feSpace = f;
// if (this->feSpace && this->feSpace->getAdmin())
// (this->feSpace->getAdmin())->addDOFIndexed(this);
// this->boundaryManager = new BoundaryManager(f);
}
template<typename T>
......
......@@ -33,6 +33,7 @@ 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;
......@@ -244,9 +245,8 @@ namespace AMDiS {
}
}
if (!macroInfo->bound_set) {
if (!macroInfo->bound_set)
macroInfo->dirichletBoundary();
}
if (mesh->getDim() > 1)
boundaryDOFs(mesh);
......@@ -315,6 +315,7 @@ namespace AMDiS {
macroTest(mesh, filenew);
}
}
#endif
return macroInfo;
}
......@@ -352,6 +353,10 @@ 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;
......@@ -493,7 +498,6 @@ namespace AMDiS {
}
fclose(file);
/*******************************************************************************/
/* Test, if there is data for every key and if all is defined in right order. */
/*******************************************************************************/
......@@ -582,8 +586,12 @@ 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);
if (key_def[3])
fill(mesh, ne, nv);
std::cout << "REMOVE THIS RETURN" << std::endl;
return;
break;
case 3:
......@@ -659,7 +667,7 @@ namespace AMDiS {
key_def[6] = true;
break;
case 7:
case 7:
// block "element neighbours"
fscanf(file, "%*s %*s");
......@@ -802,6 +810,8 @@ namespace AMDiS {
}
}
return;
if (ind)
delete ind;
......
......@@ -1125,13 +1125,13 @@ namespace AMDiS {
if (macroFilename.length()) {
macroFileInfo = MacroReader::readMacro(macroFilename.c_str(), this,
periodicFile == "" ? NULL : periodicFile.c_str(),
check);
periodicFile == "" ? NULL : periodicFile.c_str(),
check);
// If there is no value file which should be written, we can delete
// the information of the macro file.
if (!valueFilename.length())
clearMacroFileInfo();
// if (!valueFilename.length())
// clearMacroFileInfo();
}
initialized = true;
......
......@@ -54,8 +54,12 @@ namespace AMDiS {
{
FUNCNAME("ParallelDomainVec::initParallelization()");
std::cout << "TEST RHS 1 " << probVec->getRHS()->getDOFVector(0) << ": " << probVec->getRHS()->getDOFVector(0)->getCoarsenOperation() << std::endl;
ParallelDomainBase::initParallelization(adaptInfo);
std::cout << "TEST RHS 2 " << probVec->getRHS()->getDOFVector(0) << ": " << probVec->getRHS()->getDOFVector(0)->getCoarsenOperation() << std::endl;
for (int i = 0; i < nComponents; i++) {
for (int j = 0; j < nComponents; j++)
if (probVec->getSystemMatrix(i, j))
......
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