changed deviator trace assertion #2044
Conversation
| @@ -16,7 +16,7 @@ double Invariants<KelvinVectorSize>::equivalentStress( | |||
| Eigen::Matrix<double, KelvinVectorSize, 1> const& deviatoric_v) | |||
| { | |||
| assert(std::abs(trace(deviatoric_v)) <= | |||
| 1e-16 * std::abs(deviatoric_v.squaredNorm())); | |||
There was a problem hiding this comment.
deviatoric_v is a column vector, so deviatoric_v.diagonal() is only the first entry of that vector. Is that intended?
Does this small check lead to failing tests/simulations and therefore has to be changed?
There was a problem hiding this comment.
Seems like I made a mistake ;)
endJunction
force-pushed
the
KelvinVector_Assert
branch
from
8530d67
to
a91d074
Compare
Used diagonal of tensor and fixed norm
endJunction
force-pushed
the
KelvinVector_Assert
branch
from
a91d074
to
c462da9
Compare
|
Rebased to the master having the Kelvin vectors in the MathLib. Fixed the getting of the diagonal. |
| /// Trace of the corresponding tensor. | ||
| template <int KelvinVectorSize> | ||
| double Invariants<KelvinVectorSize>::trace( | ||
| Eigen::Matrix<double, KelvinVectorSize, 1> const& v) | ||
| { | ||
| return v.template topLeftCorner<3, 1>().sum(); | ||
| return diagonal(v).sum(); |
There was a problem hiding this comment.
The former solution might have been more efficient, because diagonal() creates a temporary.
There was a problem hiding this comment.
Good point! I'll check this.
There was a problem hiding this comment.
Looks like there is no temporary. I made a small setup
KelvinVectorType<3> const kv = KelvinVectorType<3>::Random();
Invariants<6> const invariants;
volatile double t = invariants.trace(kv);and changed the implementation of trace btw. topLeftCorner and diagonal. There is no difference in the assembly code (in release mode).
I'd guess that because the diagonal method is inline (being a template), or return value optimization works, or both....
Anyway no difference.
If there are no further comments, I'll merge it tonight.
|
OpenGeoSys development has been moved to GitLab. |
Used diagonal of tensor and fixed norm