Commit b1b44e98 authored by niklas.baumgarten's avatar niklas.baumgarten
Browse files

replacing deprecated functions

parent 69a05e93
......@@ -22,7 +22,7 @@ void DGReactionAssemble::Dirichlet(double t, Vector &u) const {
}
}
}
DirichletConsistent(u);
u.DirichletConsistent();
}
double DGReactionAssemble::Residual(double t, const Vector &u, Vector &r) const {
......@@ -134,7 +134,7 @@ double DGReactionAssemble::Residual(double t, const Vector &u, Vector &r) const
}
}
}
Collect(r);
r.Collect();
return r.norm();
}
......@@ -294,7 +294,7 @@ void DGReactionAssemble::SetInitialValue(Vector &u) const {
u(r, j) = problem
->Concentration(0, lambda * c() + (1 - lambda) * elem.NodalPoint(j));
}
Accumulate(u);
u.Accumulate();
}
double DGReactionAssemble::Mass(const Vector &u) const {
......
......@@ -233,7 +233,7 @@ void DGLinearTransportAssemble::SetExactSolution(double t, Vector &u_ex) const {
for (int j = 0; j < Elem.NodalPoints(); ++j)
u_ex(r, j) = problem->Solution(t, Elem.NodalPoint(j));
}
Accumulate(u_ex);
u_ex.Accumulate();
}
void DGNonLinearTransportAssemble::AssembleTransfer(TransferMatrix &TM) const {
......@@ -267,7 +267,7 @@ void DGLinearTransportAssemble::SetInitialValue(Vector &u) const {
u(r, j) =
problem->Solution(0, lambda * c() + (1 - lambda) * Elem.NodalPoint(j));
}
Accumulate(u);
u.Accumulate();
}
void DGLinearTransportAssemble::PrintMatrixInfo(Matrix &A, int diagonal) const {
......@@ -375,7 +375,7 @@ double DGNonLinearTransportAssemble::Residual(const Vector &u, Vector &b) const
b -= dt_ * rhs;
b.ClearDirichletValues();
Collect(b);
b.Collect();
delete fluxMatrix;
delete massMatrix;
return b.norm();
......
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