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

Constructures for Vector_FOT and VecCoordsAtQP_FOT changed.

parent fd82b971
...@@ -132,7 +132,7 @@ namespace AMDiS { ...@@ -132,7 +132,7 @@ namespace AMDiS {
{ {
const DimVec<WorldVector<double> > &Lambda = elInfo->getGrdLambda(); const DimVec<WorldVector<double> > &Lambda = elInfo->getGrdLambda();
for (int iq = 0; iq < nPoints; iq++) for (int iq = 0; iq < nPoints; iq++)
lb(Lambda, b, Lb[iq], (*g)(coordsAtQPs[iq])); lb(Lambda, *b, Lb[iq], (*g)(coordsAtQPs[iq]));
} }
void VecCoordsAtQP_FOT::eval(int nPoints, void VecCoordsAtQP_FOT::eval(int nPoints,
......
...@@ -198,7 +198,7 @@ namespace AMDiS { ...@@ -198,7 +198,7 @@ namespace AMDiS {
{ {
public: public:
/// Constructor. /// Constructor.
Vector_FOT(WorldVector<double> wv) Vector_FOT(WorldVector<double> *wv)
: FirstOrderTerm(0), b(wv) : FirstOrderTerm(0), b(wv)
{} {}
...@@ -221,7 +221,7 @@ namespace AMDiS { ...@@ -221,7 +221,7 @@ namespace AMDiS {
lb_one(Lambda, Lb[iq], 1.0); lb_one(Lambda, Lb[iq], 1.0);
} else { } else {
for (int iq = 0; iq < nPoints; iq++) for (int iq = 0; iq < nPoints; iq++)
lb(Lambda, b, Lb[iq], 1.0); lb(Lambda, *b, Lb[iq], 1.0);
} }
} }
...@@ -235,12 +235,12 @@ namespace AMDiS { ...@@ -235,12 +235,12 @@ namespace AMDiS {
{ {
if (grdUhAtQP) if (grdUhAtQP)
for (int iq = 0; iq < nPoints; iq++) for (int iq = 0; iq < nPoints; iq++)
result[iq] += b * grdUhAtQP[iq] * factor; result[iq] += *b * grdUhAtQP[iq] * factor;
} }
protected: protected:
/// Vector which is multiplied with \f$ \nabla u(\vec{x}) \f$ /// Vector which is multiplied with \f$ \nabla u(\vec{x}) \f$
WorldVector<double> b; WorldVector<double> *b;
}; };
/** /**
...@@ -346,7 +346,7 @@ namespace AMDiS { ...@@ -346,7 +346,7 @@ namespace AMDiS {
public: public:
/// Constructor. /// Constructor.
VecCoordsAtQP_FOT(AbstractFunction<double, WorldVector<double> > *af, VecCoordsAtQP_FOT(AbstractFunction<double, WorldVector<double> > *af,
WorldVector<double> wv) WorldVector<double> *wv)
: FirstOrderTerm(af->getDegree()), g(af), b(wv) : FirstOrderTerm(af->getDegree()), g(af), b(wv)
{} {}
...@@ -374,7 +374,7 @@ namespace AMDiS { ...@@ -374,7 +374,7 @@ namespace AMDiS {
AbstractFunction<double, WorldVector<double> > *g; AbstractFunction<double, WorldVector<double> > *g;
/// Coefficient vector. /// Coefficient vector.
WorldVector<double> b; WorldVector<double> *b;
}; };
/** /**
......
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