Liebe Gitlab-Nutzer, lieber Gitlab-Nutzer,
es ist nun möglich sich mittels des ZIH-Logins/LDAP an unserem Dienst anzumelden. Die Konten der externen Nutzer:innen sind über den Reiter "Standard" erreichbar.
Die Administratoren


Dear Gitlab user,
it is now possible to log in to our service using the ZIH login/LDAP. The accounts of external users can be accessed via the "Standard" tab.
The administrators

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

Many changes in code style, fixed a bug in 2D-deg4 multi-mesh method.

parent 227414f4
28.03.2006: init file:
<myProblem>->output->serialize adapt info: 0/1
28.03.2006: FileWriterInterface changed:
writeFiles(double time, bool force) ->
writeFiles(AdaptInfo *adaptInfo, bool force)
27.03.2006: GERSMarker corrected
23.03.2006: BasisFunction::getDOFIndices() -> BasisFunction::getLocalIndices()
both functions do the same -> getDOFIndices depricated
15.03.2006: parallel AMDiS:
DualTraverse generalized
14.03.2006: parallel AMDiS:
MeshStructure.h and .cc added.
(-> transfer mesh tree via MPI)
13.03.2006: parallel AMDiS:
EmptyElementData.h added.
(-> marks elements belonging to processors myRank region)
Rev 1210:
* In ganz AMDiS Variablen- und Funktionsnamen von "FESpace" nach
"FeSpace" gendert. Dies betrifft insbesondere "getFESpace()",
das nun "getFeSpace()" heit.
* ProblemVec::getRHS() -> ProblemVec::getRhs()
......@@ -12,14 +12,14 @@ void HL_SignedDist::calcSignedDistFct(AdaptInfo *adaptInfo_,
if (elFct == NULL) {
TEST_EXIT(lS_DOF_)("illegal level set function !\n");
TEST_EXIT(lS_DOF_->getFESpace() == sD_DOF_->getFESpace())("DOF vectors do not have the same FE space!\n");
TEST_EXIT(lS_DOF_->getFeSpace() == sD_DOF_->getFeSpace())("DOF vectors do not have the same FE space!\n");
}
TEST_EXIT(sD_DOF_)("illegal DOF vector for signed distance function !\n");
TEST_EXIT(sD_DOF_->getFESpace()->getBasisFcts()->getDegree() == 1)("does it work for non-linear finite elements ?\n");
TEST_EXIT(sD_DOF_->getFeSpace()->getBasisFcts()->getDegree() == 1)("does it work for non-linear finite elements ?\n");
lS_DOF = lS_DOF_;
sD_DOF = sD_DOF_;
feSpace = sD_DOF->getFESpace();
feSpace = sD_DOF->getFeSpace();
// ===== Initialization. =====
initialize(elFct);
......@@ -56,7 +56,7 @@ void HL_SignedDist::calcSignedDistFct(AdaptInfo *adaptInfo_, DOFVector<double> *
{
TEST_EXIT(lS_DOF_)("illegal level set function lS_DOF_ !\n");
sD_DOF = new DOFVector<double>(lS_DOF_->getFESpace(), "sD_DOF");
sD_DOF = new DOFVector<double>(lS_DOF_->getFeSpace(), "sD_DOF");
calcSignedDistFct(adaptInfo_, lS_DOF_, sD_DOF, NULL);
......@@ -87,7 +87,7 @@ void HL_SignedDist::calcVelocityExt(AdaptInfo *adaptInfo_,
TEST_EXIT(vel_DOF_)("illegal level set function lS_DOF_ !\n");
sD_DOF = new DOFVector<double>(vel_DOF_->getFESpace(), "sD_DOF");
sD_DOF = new DOFVector<double>(vel_DOF_->getFeSpace(), "sD_DOF");
calcSignedDistFct(adaptInfo_, lS_DOF_, sD_DOF, elFct);
......@@ -112,7 +112,7 @@ void HL_SignedDist::calcVelocityExt(AdaptInfo *adaptInfo_,
TEST_EXIT(lS_DOF_)("illegal level set function lS_DOF_ !\n");
DOFVector<double> *newVel_DOF_ =
new DOFVector<double>(vel_DOF_->getFESpace(), "vel_DOF_");
new DOFVector<double>(vel_DOF_->getFeSpace(), "vel_DOF_");
velExt->setVelocity(vel_DOF_, newVel_DOF_);
......@@ -121,7 +121,7 @@ void HL_SignedDist::calcVelocityExt(AdaptInfo *adaptInfo_,
if (calcSDFct && elFct == NULL) {
calcSignedDistFct(adaptInfo_, lS_DOF_);
} else {
sD_DOF = new DOFVector<double>(vel_DOF_->getFESpace(), "sD_DOF");
sD_DOF = new DOFVector<double>(vel_DOF_->getFeSpace(), "sD_DOF");
calcSignedDistFct(adaptInfo_, lS_DOF_, sD_DOF, elFct);
......@@ -160,7 +160,7 @@ void HL_SignedDist::calcVelocityExt(AdaptInfo *adaptInfo_,
TEST_EXIT(vel_DOF_[0])("illegal level set function lS_DOF_ !\n");
sD_DOF = new DOFVector<double>(vel_DOF_[0]->getFESpace(), "sD_DOF");
sD_DOF = new DOFVector<double>(vel_DOF_[0]->getFeSpace(), "sD_DOF");
calcSignedDistFct(adaptInfo_, lS_DOF_, sD_DOF, elFct);
......@@ -189,7 +189,7 @@ void HL_SignedDist::calcVelocityExt(AdaptInfo *adaptInfo_,
for (int nV = 0; nV < nVelDOFs; ++nV) {
TEST_EXIT(vel_DOF_[nV])("velocity vector vel_DOF_ not defined !\n");
newVel_DOF_[nV] = new DOFVector<double>((vel_DOF_[nV])->getFESpace(), "vel_DOF_");
newVel_DOF_[nV] = new DOFVector<double>((vel_DOF_[nV])->getFeSpace(), "vel_DOF_");
}
velExt->setVelocity(vel_DOF_, newVel_DOF_);
......@@ -199,7 +199,7 @@ void HL_SignedDist::calcVelocityExt(AdaptInfo *adaptInfo_,
if (calcSDFct && elFct == NULL) {
calcSignedDistFct(adaptInfo_, lS_DOF_);
} else {
sD_DOF = new DOFVector<double>(vel_DOF_[0]->getFESpace(), "sD_DOF");
sD_DOF = new DOFVector<double>(vel_DOF_[0]->getFeSpace(), "sD_DOF");
calcSignedDistFct(adaptInfo_, lS_DOF_, sD_DOF, elFct);
......@@ -240,7 +240,7 @@ void HL_SignedDist::calcVelocityExtFromVelocityField(AdaptInfo *adaptInfo_,
TEST_EXIT(vel_DOF_)("illegal velocity vector vel_DOF_ !\n");
sD_DOF = new DOFVector<double>(vel_DOF_->getFESpace(), "sD_DOF");
sD_DOF = new DOFVector<double>(vel_DOF_->getFeSpace(), "sD_DOF");
calcSignedDistFct(adaptInfo_, lS_DOF_, sD_DOF, elFct);
......@@ -274,7 +274,7 @@ void HL_SignedDist::calcVelocityExtFromVelocityField(AdaptInfo *adaptInfo_,
TEST_EXIT(vel_DOF_)("illegal velocity vector vel_DOF_ !\n");
sD_DOF = new DOFVector<double>(vel_DOF_->getFESpace(), "sD_DOF");
sD_DOF = new DOFVector<double>(vel_DOF_->getFeSpace(), "sD_DOF");
calcSignedDistFct(adaptInfo_, lS_DOF_, sD_DOF, elFct);
......
......@@ -321,7 +321,7 @@ HL_SignedDistLevels::HL_updateIteration()
//print chosen level in a file
if (print_level == 1)
{
DOFVector<double> *level_DOF = NEW DOFVector<double>(sD_DOF->getFESpace(),
DOFVector<double> *level_DOF = NEW DOFVector<double>(sD_DOF->getFeSpace(),
"level_DOF");
int numElems;
......@@ -372,7 +372,7 @@ HL_SignedDistLevels::HL_updateIteration()
FileWriter *levelFileWriter =
NEW FileWriter("level->output",
level_DOF->getFESpace()->getMesh(),
level_DOF->getFeSpace()->getMesh(),
level_DOF);
levelFileWriter->writeFiles (adaptInfo, false);
......
......@@ -33,7 +33,7 @@ public:
FileWriter *fileWriter = new FileWriter(
"VelocityExt->velocity output",
(velDOF[i])->getFESpace()->getMesh(),
(velDOF[i])->getFeSpace()->getMesh(),
const_cast<DOFVector<double> *>(velDOF[i]));
fileWriter->writeFiles(adaptInfo, false);
......@@ -49,7 +49,7 @@ public:
FileWriter *fileWriter = new FileWriter(
"VelocityExt->interface velocity output",
(origVelDOF[i])->getFESpace()->getMesh(),
(origVelDOF[i])->getFeSpace()->getMesh(),
const_cast<DOFVector<double> *>(origVelDOF[i]));
fileWriter->writeFiles(adaptInfo, false);
......@@ -68,7 +68,7 @@ public:
TEST_EXIT(origVelDOF_)("illegal velocity vector origVelDOF !\n");
TEST_EXIT(velDOF_)("illegal velocity vector velDOF !\n");
TEST_EXIT(origVelDOF_->getFESpace() == velDOF_->getFESpace())
TEST_EXIT(origVelDOF_->getFeSpace() == velDOF_->getFeSpace())
("different fe spaces !\n");
origVelDOF.clear();
......@@ -94,7 +94,7 @@ public:
for (int i=0; i<nVelDOFs; ++i) {
TEST_EXIT(origVelDOF_[i])("illegal velocity vector origVelDOF !\n");
TEST_EXIT(velDOF_[i])("illegal velocity vector velDOF !\n");
TEST_EXIT((origVelDOF_[i])->getFESpace() == (velDOF_[i])->getFESpace())
TEST_EXIT((origVelDOF_[i])->getFeSpace() == (velDOF_[i])->getFeSpace())
("different fe spaces !\n");
}
......
......@@ -55,10 +55,10 @@ public:
TEST_EXIT(lSFct)("level set function not defined !\n");
TEST_EXIT((int)velField.size() == dim)("illegal velocity field !\n");
TEST_EXIT(lSFct->getFESpace() == velDOF_->getFESpace())
TEST_EXIT(lSFct->getFeSpace() == velDOF_->getFeSpace())
("different feSpaces !\n");
basFcts = lSFct->getFESpace()->getBasisFcts();
basFcts = lSFct->getFeSpace()->getBasisFcts();
};
/**
......
......@@ -33,21 +33,18 @@ void CompositeFEMMethods::setPosLsToFct(DOFVector<double> *dof,
const AbstractFunction<double, WorldVector<double> > *fct,
const DOFVector<double> *lsFct_dof)
{
const BasisFunction *basisFcts = dof->getFESpace()->getBasisFcts();
const DOFAdmin *admin = dof->getFESpace()->getAdmin();
const int dim = dof->getFESpace()->getMesh()->getDim();
const BasisFunction *basisFcts = dof->getFeSpace()->getBasisFcts();
const DOFAdmin *admin = dof->getFeSpace()->getAdmin();
const int dim = dof->getFeSpace()->getMesh()->getDim();
const double *locVec;
const Element *el;
const DegreeOfFreedom *locInd;
TraverseStack stack;
ElInfo *elInfo = stack.traverseFirst(dof->getFESpace()->getMesh(), -1,
Mesh::CALL_LEAF_EL |
Mesh::FILL_COORDS);
TraverseStack stack;
ElInfo *elInfo = stack.traverseFirst(dof->getFeSpace()->getMesh(), -1,
Mesh::CALL_LEAF_EL | Mesh::FILL_COORDS);
while (elInfo) {
el = elInfo->getElement();
const Element *el = elInfo->getElement();
// Get level set function values for all vertices of element.
locVec = lsFct_dof->getLocalVector(el, NULL);
......@@ -55,7 +52,7 @@ void CompositeFEMMethods::setPosLsToFct(DOFVector<double> *dof,
// Get dof indices of vertices.
locInd = basisFcts->getLocalIndices(el, admin, NULL);
for (int i=0; i<=dim; ++i) {
for (int i = 0; i <= dim; i++) {
// Is vertex in domain with positive level set function values ?
if (locVec[i] > 0)
(*dof)[locInd[i]] = (*fct)(elInfo->getCoord(i));
......
......@@ -53,8 +53,8 @@ CompositeFEMOperator::getElementMatrix(const ElInfo *elInfo,
if(!subElementAssembler) {
subElementAssembler = new SubElementAssembler(this,
rowFESpace,
colFESpace);
rowFeSpace,
colFeSpace);
}
/**
......@@ -115,7 +115,7 @@ CompositeFEMOperator::getElementMatrix(const ElInfo *elInfo,
if (!assembler[myRank]) {
assembler[myRank] =
new StandardAssembler(this, NULL, NULL, NULL, NULL, rowFESpace, colFESpace);
new StandardAssembler(this, NULL, NULL, NULL, NULL, rowFeSpace, colFeSpace);
}
if (elLS->getLevelSetDomain() ==
......@@ -191,8 +191,8 @@ CompositeFEMOperator::getElementVector(const ElInfo *elInfo,
if(!subElementAssembler) {
subElementAssembler = new SubElementAssembler(this,
rowFESpace,
colFESpace);
rowFeSpace,
colFeSpace);
}
/**
......@@ -250,7 +250,7 @@ CompositeFEMOperator::getElementVector(const ElInfo *elInfo,
if (!assembler[myRank]) {
assembler[myRank] =
new StandardAssembler(this, NULL, NULL, NULL, NULL, rowFESpace, colFESpace);
new StandardAssembler(this, NULL, NULL, NULL, NULL, rowFeSpace, colFeSpace);
}
if (elLS->getLevelSetDomain() ==
......
......@@ -56,9 +56,9 @@ public:
/// Constructor.
CompositeFEMOperator(Flag operatorType_,
ElementLevelSet *elLS_,
const FiniteElemSpace *rowFESpace_,
const FiniteElemSpace *colFESpace_ = NULL)
: Operator(operatorType_, rowFESpace_, colFESpace_),
const FiniteElemSpace *rowFeSpace_,
const FiniteElemSpace *colFeSpace_ = NULL)
: Operator(operatorType_, rowFeSpace_, colFeSpace_),
elLS(elLS_),
subElementAssembler(NULL),
elStatus(ElementLevelSet::LEVEL_SET_UNDEFINED)
......
......@@ -44,16 +44,16 @@ public:
ElementLevelSet *elLS_,
double factor_,
bool penaltyCoeffFlag_,
FiniteElemSpace *rowFESpace_,
FiniteElemSpace *colFESpace_ = NULL)
: Operator(operatorType_, rowFESpace_, colFESpace_),
FiniteElemSpace *rowFeSpace_,
FiniteElemSpace *colFeSpace_ = NULL)
: Operator(operatorType_, rowFeSpace_, colFeSpace_),
elLS(elLS_),
elStatus(ElementLevelSet::LEVEL_SET_UNDEFINED),
factor(factor_),
penaltyCoeffFlag(penaltyCoeffFlag_),
surfaceOp(NULL),
dim(getRowFESpace()->getMesh()->getDim()),
degree(getRowFESpace()->getBasisFcts()->getDegree())
dim(getRowFeSpace()->getMesh()->getDim()),
degree(getRowFeSpace()->getBasisFcts()->getDegree())
{
TEST_EXIT(elLS->getLevelSetFct() && elLS->getMesh())
("ElementLevelSet not initialized!\n");
......
......@@ -7,9 +7,9 @@
namespace AMDiS {
SubElementAssembler::SubElementAssembler(Operator *op,
const FiniteElemSpace *rowFESpace_,
const FiniteElemSpace *colFESpace_)
: StandardAssembler(op, NULL, NULL, NULL, NULL, rowFESpace_, colFESpace_)
const FiniteElemSpace *rowFeSpace_,
const FiniteElemSpace *colFeSpace_)
: StandardAssembler(op, NULL, NULL, NULL, NULL, rowFeSpace_, colFeSpace_)
{
/**
* Create a scalable quadrature for subassembler and replace the original
......
......@@ -73,8 +73,8 @@ namespace AMDiS {
{
public:
SubElementAssembler(Operator *op,
const FiniteElemSpace *rowFESpace,
const FiniteElemSpace *colFESpace = NULL);
const FiniteElemSpace *rowFeSpace,
const FiniteElemSpace *colFeSpace = NULL);
virtual ~SubElementAssembler()
{
......
......@@ -14,10 +14,10 @@ namespace AMDiS {
const FiniteElemSpace *row,
const FiniteElemSpace *col)
: operat(op),
rowFESpace(row),
colFESpace(col ? col : row),
nRow(rowFESpace->getBasisFcts()->getNumber()),
nCol(colFESpace->getBasisFcts()->getNumber()),
rowFeSpace(row),
colFeSpace(col ? col : row),
nRow(rowFeSpace->getBasisFcts()->getNumber()),
nCol(colFeSpace->getBasisFcts()->getNumber()),
remember(true),
rememberElMat(false),
rememberElVec(false),
......@@ -112,7 +112,7 @@ namespace AMDiS {
secondOrderAssembler->calculateElementMatrix(smallElInfo, mat);
ElementMatrix &m =
smallElInfo->getSubElemGradCoordsMat(rowFESpace->getBasisFcts()->getDegree());
smallElInfo->getSubElemGradCoordsMat(rowFeSpace->getBasisFcts()->getDegree());
if (smallElInfo == colElInfo)
tmpMat = m * mat;
......@@ -127,12 +127,12 @@ namespace AMDiS {
if (largeElInfo == rowElInfo) {
ElementMatrix &m =
smallElInfo->getSubElemGradCoordsMat(rowFESpace->getBasisFcts()->getDegree());
smallElInfo->getSubElemGradCoordsMat(rowFeSpace->getBasisFcts()->getDegree());
tmpMat = m * mat;
} else {
ElementMatrix &m =
smallElInfo->getSubElemCoordsMat(rowFESpace->getBasisFcts()->getDegree());
smallElInfo->getSubElemCoordsMat(rowFeSpace->getBasisFcts()->getDegree());
tmpMat = mat * trans(m);
}
......@@ -145,12 +145,12 @@ namespace AMDiS {
if (largeElInfo == colElInfo) {
ElementMatrix &m =
smallElInfo->getSubElemGradCoordsMat(rowFESpace->getBasisFcts()->getDegree());
smallElInfo->getSubElemGradCoordsMat(rowFeSpace->getBasisFcts()->getDegree());
tmpMat = mat * trans(m);
} else {
ElementMatrix &m =
smallElInfo->getSubElemCoordsMat(rowFESpace->getBasisFcts()->getDegree());
smallElInfo->getSubElemCoordsMat(rowFeSpace->getBasisFcts()->getDegree());
tmpMat = m * mat;
}
......@@ -162,7 +162,7 @@ namespace AMDiS {
zeroOrderAssembler->calculateElementMatrix(smallElInfo, mat);
ElementMatrix &m =
smallElInfo->getSubElemCoordsMat(rowFESpace->getBasisFcts()->getDegree());
smallElInfo->getSubElemCoordsMat(rowFeSpace->getBasisFcts()->getDegree());
if (smallElInfo == colElInfo)
tmpMat = m * mat;
......@@ -275,7 +275,7 @@ namespace AMDiS {
if (smallElInfo != mainElInfo) {
ElementVector tmpVec(vec);
ElementMatrix &m =
smallElInfo->getSubElemCoordsMat(rowFESpace->getBasisFcts()->getDegree());
smallElInfo->getSubElemCoordsMat(rowFeSpace->getBasisFcts()->getDegree());
tmpVec = m * vec;
vec = tmpVec;
......@@ -319,16 +319,16 @@ namespace AMDiS {
{
FUNCNAME("Assembler::matVecAssemble()");
TEST_EXIT(rowFESpace->getBasisFcts() == colFESpace->getBasisFcts())
TEST_EXIT(rowFeSpace->getBasisFcts() == colFeSpace->getBasisFcts())
("Works only for equal basis functions for different components!\n");
TEST_EXIT(operat->uhOld->getFESpace()->getMesh() == auxElInfo->getMesh())
TEST_EXIT(operat->uhOld->getFeSpace()->getMesh() == auxElInfo->getMesh())
("Da stimmt was nicht!\n");
Element *mainEl = mainElInfo->getElement();
Element *auxEl = auxElInfo->getElement();
const BasisFunction *basFcts = rowFESpace->getBasisFcts();
const BasisFunction *basFcts = rowFeSpace->getBasisFcts();
int nBasFcts = basFcts->getNumber();
std::vector<double> uhOldLoc(nBasFcts);
......@@ -369,7 +369,7 @@ namespace AMDiS {
if (secondOrderAssembler) {
// create quadrature
if (!secondOrderAssembler->getQuadrature()) {
int dim = rowFESpace->getMesh()->getDim();
int dim = rowFeSpace->getMesh()->getDim();
int degree = operat->getQuadratureDegree(2);
Quadrature *quadrature = Quadrature::provideQuadrature(dim, degree);
secondOrderAssembler->setQuadrature(quadrature);
......@@ -378,7 +378,7 @@ namespace AMDiS {
if (firstOrderAssemblerGrdPsi) {
// create quadrature
if (!firstOrderAssemblerGrdPsi->getQuadrature()) {
int dim = rowFESpace->getMesh()->getDim();
int dim = rowFeSpace->getMesh()->getDim();
int degree = operat->getQuadratureDegree(1, GRD_PSI);
Quadrature *quadrature = Quadrature::provideQuadrature(dim, degree);
firstOrderAssemblerGrdPsi->setQuadrature(quadrature);
......@@ -387,7 +387,7 @@ namespace AMDiS {
if (firstOrderAssemblerGrdPhi) {
// create quadrature
if (!firstOrderAssemblerGrdPhi->getQuadrature()) {
int dim = rowFESpace->getMesh()->getDim();
int dim = rowFeSpace->getMesh()->getDim();
int degree = operat->getQuadratureDegree(1, GRD_PHI);
Quadrature *quadrature = Quadrature::provideQuadrature(dim, degree);
firstOrderAssemblerGrdPhi->setQuadrature(quadrature);
......@@ -396,7 +396,7 @@ namespace AMDiS {
if (zeroOrderAssembler) {
// create quadrature
if (!zeroOrderAssembler->getQuadrature()) {
int dim = rowFESpace->getMesh()->getDim();
int dim = rowFeSpace->getMesh()->getDim();
int degree = operat->getQuadratureDegree(0);
Quadrature *quadrature = Quadrature::provideQuadrature(dim, degree);
zeroOrderAssembler->setQuadrature(quadrature);
......
......@@ -54,8 +54,8 @@ namespace AMDiS {
public:
/// Constructor
Assembler(Operator *op,
const FiniteElemSpace *rowFESpace,
const FiniteElemSpace *colFESpace = NULL);
const FiniteElemSpace *rowFeSpace,
const FiniteElemSpace *colFeSpace = NULL);
/// Destructor
~Assembler();
......@@ -85,16 +85,16 @@ namespace AMDiS {
ElementVector& userVec,
double factor = 1.0);
/// Returns \ref rowFESpace.
inline const FiniteElemSpace* getRowFESpace()
/// Returns \ref rowFeSpace.
inline const FiniteElemSpace* getRowFeSpace()
{
return rowFESpace;
return rowFeSpace;
}
/// Returns \ref colFESpace.
inline const FiniteElemSpace* getColFESpace()
/// Returns \ref colFeSpace.
inline const FiniteElemSpace* getColFeSpace()
{
return colFESpace;
return colFeSpace;
}
/// Returns \ref nRow.
......@@ -210,10 +210,10 @@ namespace AMDiS {
Operator *operat;
/// Row FiniteElemSpace.
const FiniteElemSpace *rowFESpace;
const FiniteElemSpace *rowFeSpace;
/// Column FiniteElemSpace.
const FiniteElemSpace *colFESpace;
const FiniteElemSpace *colFeSpace;
/// Number of rows.
int nRow;
......@@ -287,8 +287,8 @@ namespace AMDiS {
Quadrature *quad1GrdPsi,
Quadrature *quad1GrdPhi,
Quadrature *quad0,
const FiniteElemSpace *rowFESpace,
const FiniteElemSpace *colFESpace = NULL);
const FiniteElemSpace *rowFeSpace,
const FiniteElemSpace *colFeSpace = NULL);
};
/**
......@@ -306,8 +306,8 @@ namespace AMDiS {
Quadrature *quad1GrdPsi,
Quadrature *quad1GrdPhi,
Quadrature *quad0,
const FiniteElemSpace *rowFESpace,
const FiniteElemSpace *colFESpace = NULL);
const FiniteElemSpace *rowFeSpace,
const FiniteElemSpace *colFeSpace = NULL);
};
}
......
......@@ -40,14 +40,14 @@ namespace AMDiS {
public:
/// Constructor.
BoundaryCondition(BoundaryType type,
const FiniteElemSpace *rowFESpace_,
const FiniteElemSpace *colFESpace_ = NULL)
const FiniteElemSpace *rowFeSpace_,
const FiniteElemSpace *colFeSpace_ = NULL)
: boundaryType(type),
rowFESpace(rowFESpace_),
colFESpace(colFESpace_)
rowFeSpace(rowFeSpace_),
colFeSpace(colFeSpace_)
{
if (!colFESpace)
colFESpace = rowFESpace;
if (!colFeSpace)
colFeSpace = rowFeSpace;
}
/// Returns \ref boundaryType.
......@@ -56,16 +56,16 @@ namespace AMDiS {
return boundaryType;
}
/// Returns \ref rowFESpace.
inline const FiniteElemSpace *getRowFESpace()
/// Returns \ref rowFeSpace.
inline const FiniteElemSpace *getRowFeSpace()
{
return rowFESpace;
return rowFeSpace;
}
/// Returns \ref rowFESpace.
inline const FiniteElemSpace *getColFESpace()
/// Returns \ref rowFeSpace.
inline const FiniteElemSpace *getColFeSpace()
{
return colFESpace;
return colFeSpace;
}
virtual void initMatrix(DOFMatrix*) {}
......@@ -146,10 +146,10 @@ namespace AMDiS {
BoundaryType boundaryType;
/// FiniteElemSpace for this BoundaryCondition.
const FiniteElemSpace *rowFESpace;
const FiniteElemSpace *rowFeSpace;
/// FiniteElemSpace for this BoundaryCondition.
const FiniteElemSpace *colFESpace;
const FiniteElemSpace *colFeSpace;
};
}
......
......@@ -53,7 +53,7 @@ namespace AMDiS {
DOFVectorBase<double> *vec)
{
if (localBCs.size() > 0) {
const FiniteElemSpace *feSpace = vec->getFESpace();
const FiniteElemSpace *feSpace = vec->getFeSpace();
std::vector<DegreeOfFreedom> &dofVec = dofIndices[omp_get_thread_num()];