Liebe Gitlab-Nutzer, lieber Gitlab-Nutzer, es ist nun möglich sich mittels des ZIH-Logins/LDAP an unserem Dienst anzumelden. Ein Anmelden über dieses erzeugt ein neues Konto. Das alte Konto ist ü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. Logging in via this will create a new account. The old account can be accessed via the "Standard" tab. The administrators

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

Merge branch 'issue/quad_factory' into 'master'

repair quadfactory storage

See merge request !206
parents b1c86771 eab7e9dd
Pipeline #4706 passed with stage
in 55 minutes and 11 seconds
...@@ -82,7 +82,7 @@ namespace AMDiS ...@@ -82,7 +82,7 @@ namespace AMDiS
void setQuadFactory(PQF&& pre) void setQuadFactory(PQF&& pre)
{ {
using ctype = typename Geometry::ctype; using ctype = typename Geometry::ctype;
quadFactory_.emplace( quadFactory_ = makeUniquePtr(
makeQuadratureFactory<ctype, LC::mydimension, LocalFunction>(FWD(pre))); makeQuadratureFactory<ctype, LC::mydimension, LocalFunction>(FWD(pre)));
} }
...@@ -137,7 +137,7 @@ namespace AMDiS ...@@ -137,7 +137,7 @@ namespace AMDiS
std::optional<LocalFunction> localFct_; std::optional<LocalFunction> localFct_;
/// Assign each element type a quadrature rule /// Assign each element type a quadrature rule
std::optional<QuadFactory> quadFactory_; std::shared_ptr<QuadFactory> quadFactory_;
/// the derivative order of this operator (in {0, 1, 2}) /// the derivative order of this operator (in {0, 1, 2})
int termOrder_ = 0; int termOrder_ = 0;
......
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