Skip to content

Use SymmTensor with TPSA #7322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
svenn-t wants to merge 2 commits into
base: master
Choose a base branch
from
+41 −35
Open

Use SymmTensor with TPSA #7322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
831c42f
Change FieldVector<Scalar,6> -> SymmTensor
svenn-t Aug 13, 2026
b5eaefe
Replace FieldVector with SymmTensor when assigning tensors
svenn-t Aug 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions opm/models/io/vtktpsamodule.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
#include <dune/common/dynmatrix.hh>
#include <dune/common/fvector.hh>

#include <opm/common/utility/SymmTensor.hpp>
#include <opm/common/utility/VoigtArray.hpp>
#include <opm/material/densead/Math.hpp>

#include <opm/models/io/baseoutputmodule.hh>
Expand Down Expand Up @@ -64,7 +66,7 @@ class VtkTpsaModule : public BaseOutputModule<TypeTag>
using VectorBuffer = typename ParentType::VectorBuffer;
using TensorBuffer = typename ParentType::TensorBuffer;

using SymTensor = Dune::FieldVector<Scalar, 6>;
using SymTensor = SymmTensor<Scalar>;
using Tensor = Dune::DynamicMatrix<Scalar>;

public:
Expand Down Expand Up @@ -279,14 +281,15 @@ class VtkTpsaModule : public BaseOutputModule<TypeTag>
static void setTensorFromVoigt_(Tensor& tensor, const SymTensor& symTensor)
{
// Diagonal terms
constexpr auto& ind = SymTensor::diag_indices;
for (std::size_t i = 0; i < 3; ++i) {
tensor[i][i] = symTensor[i];
tensor[i][i] = symTensor[ind[i]];
}

// Off-diagonal terms
tensor[0][1] = symTensor[5];
tensor[0][2] = symTensor[4];
tensor[1][2] = symTensor[3];
tensor[0][1] = symTensor[VoigtIndex::XY];
tensor[0][2] = symTensor[VoigtIndex::XZ];
tensor[1][2] = symTensor[VoigtIndex::YZ];
for (std::size_t i = 0; i < 3; ++i) {
for (std::size_t j = 0; j < 3; ++j) {
if (i > j) {
Expand Down
32 changes: 17 additions & 15 deletions opm/models/tpsa/tpsamodel.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@

#include <opm/grid/utility/ElementChunks.hpp>

#include <opm/common/utility/SymmTensor.hpp>
#include <opm/common/utility/VoigtArray.hpp>
#include <opm/material/common/MathToolbox.hpp>

#include <opm/models/parallel/threadmanager.hpp>
Expand Down Expand Up @@ -77,7 +79,7 @@ class TpsaModel
using MaterialState = MaterialStateTPSA<Evaluation>;

using DimVector = Dune::FieldVector<Scalar, dimWorld>;
using SymTensor = Dune::FieldVector<Scalar, 6>;
using SymTensor = SymmTensor<Scalar>;
using PotForceVector = Dune::BlockVector<Scalar>;

public:
Expand Down Expand Up @@ -491,7 +493,7 @@ class TpsaModel
// the total stress
SymTensor linStressTensor = stress(globalIdx, false);
const auto potForce = mechPotentialForce(globalIdx);
for (unsigned dirIdx = 0; dirIdx < 3; ++dirIdx) {
for (const auto& dirIdx : SymTensor::diag_indices) {
linStressTensor[dirIdx] -= potForce;
}
return -1.0 * linStressTensor;
Expand Down Expand Up @@ -591,12 +593,12 @@ class TpsaModel

// Reconstructed stress tensor at cell center
const auto& stress = lsq.x();
stressOutput[0] = stress[0]; // XX
stressOutput[1] = stress[1]; // YY
stressOutput[2] = stress[2]; // ZZ
stressOutput[3] = stress[5]; // YZ
stressOutput[4] = stress[4]; // XZ
stressOutput[5] = stress[3]; // XY
stressOutput[VoigtIndex::XX] = stress[0]; // XX
stressOutput[VoigtIndex::YY] = stress[1]; // YY
stressOutput[VoigtIndex::ZZ] = stress[2]; // ZZ
stressOutput[VoigtIndex::YZ] = stress[5]; // YZ
stressOutput[VoigtIndex::XZ] = stress[4]; // XZ
stressOutput[VoigtIndex::XY] = stress[3]; // XY
}
return stressOutput;
}
Expand All @@ -612,10 +614,10 @@ class TpsaModel
{
// Deviatoric stress
auto stressDev = this->linstress(globalIdx);
Scalar traceStress = 1.0 / 3.0 * (stressDev[0] + stressDev[1] + stressDev[2]);
stressDev[0] -= traceStress;
stressDev[1] -= traceStress;
stressDev[2] -= traceStress;
Scalar traceStress = 1.0 / 3.0 * stressDev.trace();
stressDev[VoigtIndex::XX] -= traceStress;
stressDev[VoigtIndex::YY] -= traceStress;
stressDev[VoigtIndex::ZZ] -= traceStress;

// Deviatoric strain
auto& problem = simulator_.problem();
Expand All @@ -627,9 +629,9 @@ class TpsaModel
Scalar strainVolTerm = traceStress / (3.0 * lameParam + 2 * sMod);

SymTensor strainVol;
strainVol[0] = strainVolTerm;
strainVol[1] = strainVolTerm;
strainVol[2] = strainVolTerm;
strainVol[VoigtIndex::XX] = strainVolTerm;
strainVol[VoigtIndex::YY] = strainVolTerm;
strainVol[VoigtIndex::ZZ] = strainVolTerm;

// Total
SymTensor strainOutput = strainDev + strainVol;
Expand Down
20 changes: 10 additions & 10 deletions opm/simulators/flow/MechContainer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ allocate(const std::size_t bufferSize,
template<class Scalar>
void MechContainer<Scalar>::
assignDelStress(const unsigned globalDofIdx,
const Dune::FieldVector<Scalar,6>& delStress)
const SymmTensor<Scalar>& delStress)
{
this->delstress_.assign(globalDofIdx, VoigtContainer<Scalar>(delStress));
this->delstress_.assign(globalDofIdx, delStress);
}

template<class Scalar>
Expand All @@ -96,17 +96,17 @@ assignDisplacement(const unsigned globalDofIdx,
template<class Scalar>
void MechContainer<Scalar>::
assignFracStress(const unsigned globalDofIdx,
const Dune::FieldVector<Scalar,6>& fracStress)
const SymmTensor<Scalar>& fracStress)
{
this->fracstress_.assign(globalDofIdx, VoigtContainer<Scalar>(fracStress));
this->fracstress_.assign(globalDofIdx, fracStress);
}

template<class Scalar>
void MechContainer<Scalar>::
assignLinStress(const unsigned globalDofIdx,
const Dune::FieldVector<Scalar,6>& linStress)
const SymmTensor<Scalar>& linStress)
{
this->linstress_.assign(globalDofIdx, VoigtContainer<Scalar>(linStress));
this->linstress_.assign(globalDofIdx, linStress);
}

template<class Scalar>
Expand All @@ -124,17 +124,17 @@ assignPotentialForces(const unsigned globalDofIdx,
template<class Scalar>
void MechContainer<Scalar>::
assignStrain(const unsigned globalDofIdx,
const Dune::FieldVector<Scalar,6>& strain)
const SymmTensor<Scalar>& strain)
{
this->strain_.assign(globalDofIdx, VoigtContainer<Scalar>(strain));
this->strain_.assign(globalDofIdx, strain);
}

template<class Scalar>
void MechContainer<Scalar>::
assignStress(const unsigned globalDofIdx,
const Dune::FieldVector<Scalar,6>& stress)
const SymmTensor<Scalar>& stress)
{
this->stress_.assign(globalDofIdx, VoigtContainer<Scalar>(stress));
this->stress_.assign(globalDofIdx, stress);
}

template<class Scalar>
Expand Down
11 changes: 6 additions & 5 deletions opm/simulators/flow/MechContainer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@

#include <dune/common/fvector.hh>

#include <opm/common/utility/SymmTensor.hpp>
#include <opm/common/utility/VoigtArray.hpp>

#include <array>
Expand All @@ -53,24 +54,24 @@ class MechContainer
const Dune::FieldVector<Scalar,3>& disp);

void assignDelStress(const unsigned globalDofIdx,
const Dune::FieldVector<Scalar,6>& delStress);
const SymmTensor<Scalar>& delStress);

void assignPotentialForces(const unsigned globalDofIdx,
const Scalar force,
const Scalar pressForce,
const Scalar tempForce);

void assignFracStress(const unsigned globalDofIdx,
const Dune::FieldVector<Scalar,6>& fracStress);
const SymmTensor<Scalar>& fracStress);

void assignLinStress(const unsigned globalDofIdx,
const Dune::FieldVector<Scalar,6>& linStress);
const SymmTensor<Scalar>& linStress);

void assignStrain(const unsigned globalDofIdx,
const Dune::FieldVector<Scalar,6>& strain);
const SymmTensor<Scalar>& strain);

void assignStress(const unsigned globalDofIdx,
const Dune::FieldVector<Scalar,6>& stress);
const SymmTensor<Scalar>& stress);

void outputRestart(data::Solution& sol);

Expand Down