Commit 471e31f7 authored by niklas.baumgarten's avatar niklas.baumgarten
Browse files

Merge branch 'rmv-warnings' into 'master'

Rmv warnings

See merge request !4
parents f2c05cb5 fcb2efac
Pipeline #209620 failed with stages
in 2 minutes and 23 seconds
......@@ -1042,7 +1042,7 @@ public:
virtual double Phasefield(const cell &C, const Point &lz, const Point &z) const {
if (pf) {
ScalarElement E(*pf_disc, *pf, C);
ScalarElement E(*pf, C);
return E.Value(lz, *pf);
}
return Phasefield(z);
......@@ -1056,7 +1056,7 @@ public:
virtual double Phasefield2(const cell &C, const Point &lz, const Point &z) const {
if (pf2) {
ScalarElement E(*pf_disc, *pf2, C);
ScalarElement E(*pf2, C);
return E.Value(lz, *pf2);
}
return Phasefield(z);
......@@ -1070,7 +1070,7 @@ public:
virtual double Phasefield_old(const cell &C, const Point &lz, const Point &z) const {
if (pf_old) {
ScalarElement E(*pf_disc, *pf_old, C);
ScalarElement E(*pf_old, C);
return E.Value(lz, *pf_old);
}
return Phasefield(z);
......@@ -1337,7 +1337,7 @@ public:
virtual double Phasefield(const cell &C, const Point &lz, const Point &z) const {
if (pf) {
ScalarElement E(*pf_disc, *pf, C);
ScalarElement E(*pf, C);
return E.Value(lz, *pf);
}
return Phasefield(z);
......@@ -1351,7 +1351,7 @@ public:
virtual double Phasefield2(const cell &C, const Point &lz, const Point &z) const {
if (pf2) {
ScalarElement E(*pf_disc, *pf2, C);
ScalarElement E(*pf2, C);
double P = E.Value(lz, *pf2);
// if (P < 0.3)
// std::cout << "PhaseField " << P << " at " << z[0] << " " << z[1] << endl;
......@@ -1362,7 +1362,7 @@ public:
virtual double OldPhasefield2(const cell &C, const Point &lz, const Point &z) const {
if (pf_old) {
ScalarElement E(*pf_disc, *pf_old, C);
ScalarElement E(*pf_old, C);
return E.Value(lz, *pf_old);
}
return Phasefield(z);
......@@ -1388,7 +1388,7 @@ public:
virtual double Phasefield_old(const cell &C, const Point &lz, const Point &z) const {
if (pf_old) {
ScalarElement E(*pf_disc, *pf_old, C);
ScalarElement E(*pf_old, C);
return E.Value(lz, *pf_old);
}
return Phasefield(z);
......@@ -1538,7 +1538,7 @@ public:
double Phasefield(const cell &C, const Point &lz, const Point &z) const {
if (pf) {
ScalarElement E(*pf_disc, *pf, C);
ScalarElement E(*pf, C);
return E.Value(lz, *pf);
}
return Phasefield(z);
......@@ -1585,7 +1585,7 @@ public:
double ProjectedPhasefield(const cell &C, const Point &lz, const Point &z) const {
if (pf) {
ScalarElement E(*pf_disc, *pf, C);
ScalarElement E(*pf, C);
// pout << OUT(E.Value(lz,*pf)) << endl;
if (E.Value(lz, *pf) > s_min) return 1;
return 0;
......@@ -1595,7 +1595,7 @@ public:
double ProjectedPhasefield_old(const cell &C, const Point &lz, const Point &z) const {
if (pf_old) {
ScalarElement E(*pf_disc, *pf_old, C);
ScalarElement E(*pf_old, C);
if (E.Value(lz, *pf_old) > s_min) return 1;
return 0;
}
......@@ -2518,7 +2518,7 @@ public:
Tensor StressStrain(const cell &C,
const Point &lz, const Point &z, const Tensor &S) const {
ScalarElement E(*pf_disc, *U, C);
ScalarElement E(*U, C);
double Ux = E.Value(lz, *U);
VectorField DUx = scaleNL * E.Derivative(lz, *U);
//double Fxx = 1 + DUx[0];
......
Subproject commit 58dc4db04865216e8df1f611dd1c0c3a646bbd68
Subproject commit 973247ff0d2aebff932784ef91b3c6b647996975
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