Commit acf27767 authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

some corrections in the extensions

parent 0f1e4c8e
......@@ -25,7 +25,7 @@ void calcMaxOnXAxis(DOFVector<double> *rho, std::vector<std::pair<WorldVector<do
}
}
}
};
}
void calcMaxOnYAxis(DOFVector<double> *rho, std::vector<std::pair<WorldVector<double>, double> > &maxima)
{ FUNCNAME("Helpers::calcMaxOnYAxis()");
......@@ -49,7 +49,7 @@ void calcMaxOnYAxis(DOFVector<double> *rho, std::vector<std::pair<WorldVector<do
}
}
}
};
}
void transformMesh(Mesh *mesh, WorldVector<double> scale, WorldVector<double> shift, WorldVector<double> rotate)
......@@ -101,7 +101,7 @@ void transformMesh(Mesh *mesh, WorldVector<double> scale, WorldVector<double> sh
(*macro)->setCoord(i, x);
}
}
};
}
void scaleMesh(Mesh *mesh, WorldVector<double> shift, WorldVector<double> scale)
{ FUNCNAME("Helpers::scaleMesh()");
......@@ -117,7 +117,7 @@ void scaleMesh(Mesh *mesh, WorldVector<double> shift, WorldVector<double> scale)
(*macro)->setCoord(i, x);
}
}
};
}
// scale by different values in all directions
void scaleMesh(Mesh *mesh, WorldVector<double> scale)
......
......@@ -9,17 +9,17 @@ Phase_SOT::Phase_SOT(DOFVectorBase<double>* phaseDV_,double fac_) :
{
TEST_EXIT(phaseDV_)("no vector phase!\n");
auxFeSpaces.insert(phaseDV_->getFeSpace());
};
}
void Phase_SOT::initElement(const ElInfo* elInfo,
SubAssembler* subAssembler,
Quadrature *quad) {
getVectorAtQPs(phaseDV, elInfo, subAssembler, quad, phase);
};
}
void Phase_SOT::initElement(const ElInfo* largeElInfo, const ElInfo* smallElInfo,
SubAssembler* subAssembler,
Quadrature *quad) {
getVectorAtQPs(phaseDV, smallElInfo, largeElInfo, subAssembler, quad, phase);
};
}
void Phase_SOT::getLALt(const ElInfo *elInfo,
vector<mtl::dense2D<double> > &LALt) const
{
......@@ -28,7 +28,7 @@ void Phase_SOT::getLALt(const ElInfo *elInfo,
for (int iq = 0; iq < nPoints; iq++)
l1lt(Lambda, LALt[iq], f(iq) * phase[iq] * fac);
};
}
void Phase_SOT::eval(int nPoints,
const mtl::dense_vector<double>& uhAtQP,
const mtl::dense_vector<WorldVector<double> >& grdUhAtQP,
......@@ -45,7 +45,7 @@ void Phase_SOT::eval(int nPoints,
result[iq] += feval * resultQP;
}
}
};
}
void Phase_SOT::weakEval(const std::vector<WorldVector<double> > &grdUhAtQP,
std::vector<WorldVector<double> > &result)
{
......@@ -54,11 +54,11 @@ void Phase_SOT::weakEval(const std::vector<WorldVector<double> > &grdUhAtQP,
double factor = f(iq) * phase[iq] * fac;
axpy(factor, grdUhAtQP[iq], result[iq]);
}
};
}
double Phase_SOT::f(const int iq) const
{
return 1.0;
};
}
/* ----------------------------------------------------------- */
......@@ -67,17 +67,17 @@ Phase_FOT::Phase_FOT(DOFVectorBase<double>* phaseDV_,double fac_) :
{
TEST_EXIT(phaseDV_)("no vector phase!\n");
auxFeSpaces.insert(phaseDV_->getFeSpace());
};
}
void Phase_FOT::initElement(const ElInfo* elInfo,
SubAssembler* subAssembler,
Quadrature *quad) {
getVectorAtQPs(phaseDV, elInfo, subAssembler, quad, phase);
};
}
void Phase_FOT::initElement(const ElInfo* largeElInfo, const ElInfo* smallElInfo,
SubAssembler* subAssembler,
Quadrature *quad) {
getVectorAtQPs(phaseDV, smallElInfo, largeElInfo, subAssembler, quad, phase);
};
}
void Phase_FOT::getLb(const ElInfo *elInfo,
vector<mtl::dense_vector<double> >& result) const
{
......@@ -87,7 +87,7 @@ void Phase_FOT::getLb(const ElInfo *elInfo,
for (int iq = 0; iq < nPoints; iq++) {
lb(Lambda, f(iq), result[iq], phase[iq]*fac);
}
};
}
void Phase_FOT::eval(int nPoints,
const mtl::dense_vector<double>& uhAtQP,
const mtl::dense_vector<WorldVector<double> >& grdUhAtQP,
......@@ -100,13 +100,13 @@ void Phase_FOT::eval(int nPoints,
double resultQP = grdUhAtQP[iq] * f(iq);
result[iq] += phase[iq] * factor * resultQP;
}
};
}
WorldVector<double> Phase_FOT::f(const int iq) const
{
WorldVector<double> result;
result.set(1.0);
return result;
};
}
/* ----------------------------------------------------------- */
......@@ -116,25 +116,25 @@ Phase_ZOT::Phase_ZOT(DOFVectorBase<double>* phaseDV_, double fac_) : ZeroOrderTe
TEST_EXIT(phaseDV_)("No vector Phase!\n");
auxFeSpaces.insert(phaseDV_->getFeSpace());
};
}
void Phase_ZOT::initElement(const ElInfo* elInfo,
SubAssembler* subAssembler,
Quadrature *quad)
{
getVectorAtQPs(phaseDV, elInfo, subAssembler, quad, phase);
};
}
void Phase_ZOT::initElement(const ElInfo* largeElInfo,
const ElInfo* smallElInfo,
SubAssembler* subAssembler,
Quadrature *quad)
{
getVectorAtQPs(phaseDV, smallElInfo, largeElInfo, subAssembler, quad, phase);
};
}
void Phase_ZOT::getC(const ElInfo *elInfo, int nPoints, ElementVector &C)
{
for (int iq = 0; iq < nPoints; iq++)
C[iq] += f(iq) * phase[iq] * fac;
};
}
void Phase_ZOT::eval(int nPoints,
const mtl::dense_vector<double>& uhAtQP,
const mtl::dense_vector<WorldVector<double> >& grdUhAtQP,
......@@ -145,11 +145,11 @@ void Phase_ZOT::eval(int nPoints,
double factor = opFactor * fac;
for (int iq = 0; iq < nPoints; iq++)
result[iq] += factor * f(iq) * phase[iq] * uhAtQP[iq];
};
}
double Phase_ZOT::f(const int iq) const
{
return 1.0;
};
}
/* ----------------------------------------------------------- */
......@@ -161,33 +161,33 @@ PhaseInverse_ZOT::PhaseInverse_ZOT(DOFVectorBase<double>* phaseDV_, double fac_)
facVec->set(1.0);
auxFeSpaces.insert(phaseDV_->getFeSpace());
};
}
PhaseInverse_ZOT::PhaseInverse_ZOT(DOFVectorBase<double>* phaseDV_, double fac_, WorldVector<double> *facVec_, int component_) : ZeroOrderTerm(6),
phaseDV(phaseDV_), fac(fac_), component(component_), facVec(facVec_)
{
TEST_EXIT(phaseDV_)("No vector Phase!\n");
auxFeSpaces.insert(phaseDV_->getFeSpace());
};
}
void PhaseInverse_ZOT::initElement(const ElInfo* elInfo,
SubAssembler* subAssembler,
Quadrature *quad)
{
getVectorAtQPs(phaseDV, elInfo, subAssembler, quad, phase);
};
}
void PhaseInverse_ZOT::initElement(const ElInfo* largeElInfo,
const ElInfo* smallElInfo,
SubAssembler* subAssembler,
Quadrature *quad)
{
getVectorAtQPs(phaseDV, smallElInfo, largeElInfo, subAssembler, quad, phase);
};
}
void PhaseInverse_ZOT::getC(const ElInfo *, int nPoints, ElementVector &C)
{
double factor = fac * (*facVec)[component];
for (int iq = 0; iq < nPoints; iq++)
C[iq] += f(iq) * factor;
};
}
void PhaseInverse_ZOT::eval(int nPoints,
const mtl::dense_vector<double>& uhAtQP,
const mtl::dense_vector<WorldVector<double> >& grdUhAtQP,
......@@ -198,11 +198,11 @@ void PhaseInverse_ZOT::eval(int nPoints,
double factor = opFactor * fac * (*facVec)[component];
for (int iq = 0; iq < nPoints; iq++)
result[iq] += factor * f(iq) * uhAtQP[iq];
};
}
double PhaseInverse_ZOT::f(const int iq) const
{
return std::max(0.0, std::min( 1.0, (1.0-phase[iq]) ) );
};
}
/* ----------------------------------------------------------- */
......@@ -211,26 +211,26 @@ Pow3_ZOT::Pow3_ZOT(DOFVectorBase<double> *rhoDV_, double fac_) :
{
TEST_EXIT(rhoDV_)("No vector rho!\n");
auxFeSpaces.insert(rhoDV_->getFeSpace());
};
}
void Pow3_ZOT::initElement(const ElInfo* elInfo,
SubAssembler* subAssembler,
Quadrature *quad)
{
getVectorAtQPs(rhoDV, elInfo, subAssembler, quad, rho);
};
}
void Pow3_ZOT::initElement(const ElInfo* largeElInfo,
const ElInfo* smallElInfo,
SubAssembler* subAssembler,
Quadrature *quad)
{
getVectorAtQPs(rhoDV, smallElInfo, largeElInfo, subAssembler, quad, rho);
};
}
void Pow3_ZOT::getC(const ElInfo *elInfo, int nPoints, ElementVector &C)
{
for (int iq = 0; iq < nPoints; iq++)
C[iq] += f(iq) * fac;
};
}
void Pow3_ZOT::eval(int nPoints,
const mtl::dense_vector<double>& uhAtQP,
const mtl::dense_vector<WorldVector<double> >& grdUhAtQP,
......@@ -241,11 +241,11 @@ void Pow3_ZOT::eval(int nPoints,
double factor = opFactor * fac;
for (int iq = 0; iq < nPoints; iq++)
result[iq] += factor * f(iq) * uhAtQP[iq];
};
}
double Pow3_ZOT::f(const int iq) const
{
return rho[iq]*sqr(rho[iq]);
};
}
/* ----------------------------------------------------------- */
......@@ -254,7 +254,7 @@ Pow3Phase_ZOT::Pow3Phase_ZOT(DOFVectorBase<double>* phaseDV, DOFVectorBase<doubl
{
TEST_EXIT(rhoDV_)("No vector rho!\n");
auxFeSpaces.insert(rhoDV_->getFeSpace());
};
}
void Pow3Phase_ZOT::initElement(const ElInfo* elInfo,
SubAssembler* subAssembler,
......@@ -262,7 +262,7 @@ void Pow3Phase_ZOT::initElement(const ElInfo* elInfo,
{
Phase_ZOT::initElement(elInfo,subAssembler,quad);
getVectorAtQPs(rhoDV, elInfo, subAssembler, quad, rho);
};
}
void Pow3Phase_ZOT::initElement(const ElInfo* largeElInfo,
const ElInfo* smallElInfo,
SubAssembler* subAssembler,
......@@ -270,11 +270,11 @@ void Pow3Phase_ZOT::initElement(const ElInfo* largeElInfo,
{
Phase_ZOT::initElement(largeElInfo,smallElInfo,subAssembler,quad);
getVectorAtQPs(rhoDV, smallElInfo, largeElInfo, subAssembler, quad, rho);
};
}
double Pow3Phase_ZOT::f(const int iq) const
{
return rho[iq]*sqr(rho[iq]);
};
}
/* ----------------------------------------------------------- */
......@@ -283,26 +283,26 @@ Pow2_ZOT::Pow2_ZOT(DOFVectorBase<double> *rhoDV_, double fac_) :
{
TEST_EXIT(rhoDV_)("No vector rho!\n");
auxFeSpaces.insert(rhoDV_->getFeSpace());
};
}
void Pow2_ZOT::initElement(const ElInfo* elInfo,
SubAssembler* subAssembler,
Quadrature *quad)
{
getVectorAtQPs(rhoDV, elInfo, subAssembler, quad, rho);
};
}
void Pow2_ZOT::initElement(const ElInfo* largeElInfo,
const ElInfo* smallElInfo,
SubAssembler* subAssembler,
Quadrature *quad)
{
getVectorAtQPs(rhoDV, smallElInfo, largeElInfo, subAssembler, quad, rho);
};
}
void Pow2_ZOT::getC(const ElInfo *elInfo, int nPoints, ElementVector &C)
{
for (int iq = 0; iq < nPoints; iq++)
C[iq] += f(iq) * fac;
};
}
void Pow2_ZOT::eval(int nPoints,
const mtl::dense_vector<double>& uhAtQP,
const mtl::dense_vector<WorldVector<double> >& grdUhAtQP,
......@@ -313,11 +313,11 @@ void Pow2_ZOT::eval(int nPoints,
double factor = opFactor * fac;
for (int iq = 0; iq < nPoints; iq++)
result[iq] += factor * f(iq) * uhAtQP[iq];
};
}
double Pow2_ZOT::f(const int iq) const
{
return sqr(rho[iq]);
};
}
/* ----------------------------------------------------------- */
......@@ -326,7 +326,7 @@ Pow2Phase_ZOT::Pow2Phase_ZOT(DOFVectorBase<double>* phaseDV, DOFVectorBase<doubl
{
TEST_EXIT(rhoDV_)("No vector rho!\n");
auxFeSpaces.insert(rhoDV_->getFeSpace());
};
}
void Pow2Phase_ZOT::initElement(const ElInfo* elInfo,
SubAssembler* subAssembler,
......@@ -334,7 +334,7 @@ void Pow2Phase_ZOT::initElement(const ElInfo* elInfo,
{
Phase_ZOT::initElement(elInfo,subAssembler,quad);
getVectorAtQPs(rhoDV, elInfo, subAssembler, quad, rho);
};
}
void Pow2Phase_ZOT::initElement(const ElInfo* largeElInfo,
const ElInfo* smallElInfo,
SubAssembler* subAssembler,
......@@ -342,11 +342,11 @@ void Pow2Phase_ZOT::initElement(const ElInfo* largeElInfo,
{
Phase_ZOT::initElement(largeElInfo,smallElInfo,subAssembler,quad);
getVectorAtQPs(rhoDV, smallElInfo, largeElInfo, subAssembler, quad, rho);
};
}
double Pow2Phase_ZOT::f(const int iq) const
{
return sqr(rho[iq]);
};
}
/* -----------------------------------------------------------
1/(rho+0.9)
*/
......@@ -356,7 +356,7 @@ ConstrainedFrac_ZOT::ConstrainedFrac_ZOT(DOFVectorBase<double> *phaseDV_, DOFVec
{
TEST_EXIT(rhoDV_)("No vector rho!\n");
auxFeSpaces.insert(rhoDV_->getFeSpace());
};
}
void ConstrainedFrac_ZOT::initElement(const ElInfo* elInfo,
SubAssembler* subAssembler,
......@@ -364,7 +364,7 @@ void ConstrainedFrac_ZOT::initElement(const ElInfo* elInfo,
{
Phase_ZOT::initElement(elInfo, subAssembler,quad);
getVectorAtQPs(rhoDV, elInfo, subAssembler, quad, rho);
};
}
void ConstrainedFrac_ZOT::initElement(const ElInfo* largeElInfo,
const ElInfo* smallElInfo,
SubAssembler* subAssembler,
......@@ -372,11 +372,11 @@ void ConstrainedFrac_ZOT::initElement(const ElInfo* largeElInfo,
{
Phase_ZOT::initElement(largeElInfo, smallElInfo, subAssembler,quad);
getVectorAtQPs(rhoDV, smallElInfo, largeElInfo, subAssembler, quad, rho);
};
}
double ConstrainedFrac_ZOT::f(const int iq) const
{
return 1.0/std::max(1.e-6, rho[iq]+0.9);
};
}
/* -----------------------------------------------------------
-1/(rho+0.9)^2
......@@ -387,7 +387,7 @@ ConstrainedFracSqr_ZOT::ConstrainedFracSqr_ZOT(DOFVectorBase<double> *phaseDV_,
{
TEST_EXIT(rhoDV_)("No vector rho!\n");
auxFeSpaces.insert(rhoDV_->getFeSpace());
};
}
void ConstrainedFracSqr_ZOT::initElement(const ElInfo* elInfo,
SubAssembler* subAssembler,
......@@ -395,7 +395,7 @@ void ConstrainedFracSqr_ZOT::initElement(const ElInfo* elInfo,
{
Phase_ZOT::initElement(elInfo, subAssembler,quad);
getVectorAtQPs(rhoDV, elInfo, subAssembler, quad, rho);
};
}
void ConstrainedFracSqr_ZOT::initElement(const ElInfo* largeElInfo,
const ElInfo* smallElInfo,
SubAssembler* subAssembler,
......@@ -403,11 +403,11 @@ void ConstrainedFracSqr_ZOT::initElement(const ElInfo* largeElInfo,
{
Phase_ZOT::initElement(largeElInfo, smallElInfo, subAssembler,quad);
getVectorAtQPs(rhoDV, smallElInfo, largeElInfo, subAssembler, quad, rho);
};
}
double ConstrainedFracSqr_ZOT::f(const int iq) const
{
return -1.0/std::max(1.e-6, sqr(rho[iq]+0.9));
};
}
ConstrainedPowImpl_ZOT::ConstrainedPowImpl_ZOT(DOFVectorBase<double> *rhoDV_, double p_, double rhoMin_, double fac_) :
......@@ -415,26 +415,26 @@ ConstrainedPowImpl_ZOT::ConstrainedPowImpl_ZOT(DOFVectorBase<double> *rhoDV_, do
{
TEST_EXIT(rhoDV_)("No vector rho!\n");
auxFeSpaces.insert(rhoDV_->getFeSpace());
};
}
void ConstrainedPowImpl_ZOT::initElement(const ElInfo* elInfo,
SubAssembler* subAssembler,
Quadrature *quad)
{
getVectorAtQPs(rhoDV, elInfo, subAssembler, quad, rho);
};
}
void ConstrainedPowImpl_ZOT::initElement(const ElInfo* largeElInfo,
const ElInfo* smallElInfo,
SubAssembler* subAssembler,
Quadrature *quad)
{
getVectorAtQPs(rhoDV, smallElInfo, largeElInfo, subAssembler, quad, rho);
};
}
void ConstrainedPowImpl_ZOT::getC(const ElInfo *elInfo, int nPoints, ElementVector &C)
{
for (int iq = 0; iq < nPoints; iq++)
C[iq] += f(iq)*fac;
};
}
void ConstrainedPowImpl_ZOT::eval(int nPoints,
const mtl::dense_vector<double>& uhAtQP,
const mtl::dense_vector<WorldVector<double> >& grdUhAtQP,
......@@ -445,11 +445,11 @@ void ConstrainedPowImpl_ZOT::eval(int nPoints,
double factor = opFactor*fac;
for (int iq = 0; iq < nPoints; iq++)
result[iq] += factor * f(iq) * uhAtQP[iq];
};
}
double ConstrainedPowImpl_ZOT::f(const int iq) const
{
return 2.0*p*Helpers::toInt(0.0<=rhoMin-rho[iq]);
};
}
ConstrainedPowExpl_ZOT::ConstrainedPowExpl_ZOT(DOFVectorBase<double> *rhoDV_, double p_, double rhoMin_, double fac_) :
......@@ -457,26 +457,26 @@ ConstrainedPowExpl_ZOT::ConstrainedPowExpl_ZOT(DOFVectorBase<double> *rhoDV_, do
{
TEST_EXIT(rhoDV_)("No vector rho!\n");
auxFeSpaces.insert(rhoDV_->getFeSpace());
};
}
void ConstrainedPowExpl_ZOT::initElement(const ElInfo* elInfo,
SubAssembler* subAssembler,
Quadrature *quad)
{
getVectorAtQPs(rhoDV, elInfo, subAssembler, quad, rho);
};
}
void ConstrainedPowExpl_ZOT::initElement(const ElInfo* largeElInfo,
const ElInfo* smallElInfo,
SubAssembler* subAssembler,
Quadrature *quad)
{
getVectorAtQPs(rhoDV, smallElInfo, largeElInfo, subAssembler, quad, rho);
};
}
void ConstrainedPowExpl_ZOT::getC(const ElInfo *elInfo, int nPoints, ElementVector &C)
{
for (int iq = 0; iq < nPoints; iq++)
C[iq] += f(iq)*fac;
};
}
void ConstrainedPowExpl_ZOT::eval(int nPoints,
const mtl::dense_vector<double>& uhAtQP,
const mtl::dense_vector<WorldVector<double> >& grdUhAtQP,
......@@ -487,37 +487,37 @@ void ConstrainedPowExpl_ZOT::eval(int nPoints,
double factor = opFactor*fac;
for (int iq = 0; iq < nPoints; iq++)
result[iq] += factor * f(iq) * uhAtQP[iq];
};
}
double ConstrainedPowExpl_ZOT::f(const int iq) const
{
return -2.0*p*std::max(0.0, rhoMin-rho[iq]);
};
}
ConstrainedPow_ZOT::ConstrainedPow_ZOT(DOFVectorBase<double> *rhoDV_, double p_, double rhoMin_, double fac_) :
ZeroOrderTerm(2), rhoDV(rhoDV_), p(p_), rhoMin(rhoMin_), fac(fac_)
{
TEST_EXIT(rhoDV_)("No vector rho!\n");
auxFeSpaces.insert(rhoDV_->getFeSpace());
};
}
void ConstrainedPow_ZOT::initElement(const ElInfo* elInfo,
SubAssembler* subAssembler,
Quadrature *quad)
{
getVectorAtQPs(rhoDV, elInfo, subAssembler, quad, rho);
};
}
void ConstrainedPow_ZOT::initElement(const ElInfo* largeElInfo,
const ElInfo* smallElInfo,
SubAssembler* subAssembler,
Quadrature *quad)
{
getVectorAtQPs(rhoDV, smallElInfo, largeElInfo, subAssembler, quad, rho);
};
}
void ConstrainedPow_ZOT::getC(const ElInfo *elInfo, int nPoints, ElementVector &C)
{
for (int iq = 0; iq < nPoints; iq++)
C[iq] += f(iq)*fac;
};
}
void ConstrainedPow_ZOT::eval(int nPoints,
const mtl::dense_vector<double>& uhAtQP,
const mtl::dense_vector<WorldVector<double> >& grdUhAtQP,
......@@ -528,11 +528,11 @@ void ConstrainedPow_ZOT::eval(int nPoints,
double factor = opFactor*fac;
for (int iq = 0; iq < nPoints; iq++)
result[iq] += factor * f(iq) * uhAtQP[iq];
};
}
double ConstrainedPow_ZOT::f(const int iq) const
{
return -2.0*p*std::max(0.0, rhoMin-rho[iq]);
};
}
/* -----------------------------------------------------------
phi*rho
......@@ -543,7 +543,7 @@ FactorPhase_ZOT::FactorPhase_ZOT(DOFVectorBase<double> *phaseDV_, DOFVectorBase<
{
TEST_EXIT(rhoDV_)("No vector rho!\n");
auxFeSpaces.insert(rhoDV_->getFeSpace());
};
}
void FactorPhase_ZOT::initElement(const ElInfo* elInfo,
SubAssembler* subAssembler,
......@@ -551,7 +551,7 @@ void FactorPhase_ZOT::initElement(const ElInfo* elInfo,
{
Phase_ZOT::initElement(elInfo, subAssembler,quad);
getVectorAtQPs(rhoDV, elInfo, subAssembler, quad, rho);
};
}
void FactorPhase_ZOT::initElement(const ElInfo* largeElInfo,
const ElInfo* smallElInfo,
SubAssembler* subAssembler,
......@@ -559,11 +559,11 @@ void FactorPhase_ZOT::initElement(const ElInfo* largeElInfo,
{
Phase_ZOT::initElement(largeElInfo, smallElInfo, subAssembler,quad);
getVectorAtQPs(rhoDV, smallElInfo, largeElInfo, subAssembler, quad, rho);
};
}
double FactorPhase_ZOT::f(const int iq) const
{
return rho[iq];
};
}
/* ----------------------------------------------------------- */
......@@ -583,7 +583,7 @@ WorldVecAndVecFct_FOT::WorldVecAndVecFct_FOT(WorldVector<DOFVectorBase<double>*>
vec0DV=vecs_[0];
vec1DV=vecs_[1];
if(numVecs>=3) vec2DV=vecs_[2];
};
}
void WorldVecAndVecFct_FOT::initElement(const ElInfo* elInfo,
SubAssembler* subAssembler,
Quadrature *quad)
......@@ -592,7 +592,7 @@ void WorldVecAndVecFct_FOT::initElement(const ElInfo* elInfo,
getVectorAtQPs(vec1DV, elInfo, subAssembler, quad, vec1);
if(numVecs>=3) getVectorAtQPs(vec2DV, elInfo, subAssembler, quad, vec2);
getVectorAtQPs(phaseDV, elInfo, subAssembler, quad, phase);
};
}
void WorldVecAndVecFct_FOT::initElement(const ElInfo* largeElInfo, const ElInfo* smallElInfo,
SubAssembler* subAssembler,
Quadrature *quad)
......@@ -601,7 +601,7 @@ void WorldVecAndVecFct_FOT::initElement(const ElInfo* largeElInfo, const ElInfo*
getVectorAtQPs(vec1DV, smallElInfo, largeElInfo, subAssembler, quad, vec1);
if(numVecs>=3) getVectorAtQPs(vec2DV, smallElInfo, largeElInfo, subAssembler, quad, vec2);
getVectorAtQPs(phaseDV, smallElInfo, largeElInfo, subAssembler, quad, phase);
};
}
void WorldVecAndVecFct_FOT::getLb(const ElInfo *elInfo,
vector<mtl::dense_vector<double> >& result) const
{
......@@ -615,7 +615,7 @@ void WorldVecAndVecFct_FOT::getLb(const ElInfo *elInfo,
if(numVecs>=3) vec[2]=vec2[iq];
lb(Lambda, vec, result[iq], phase[iq]*fac);