mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
store linStress as a VoigtArray in MechContainer
This commit is contained in:
parent
6809268d12
commit
d1b9cab189
@ -67,6 +67,7 @@ allocate(const std::size_t bufferSize,
|
||||
};
|
||||
|
||||
resizeAndRegister(delstress_, "DELSTR");
|
||||
resizeAndRegister(linstress_, "LINSTR");
|
||||
resizeAndRegister(strain_, "STRAIN");
|
||||
resizeAndRegister(stress_, "STRESS");
|
||||
|
||||
@ -83,19 +84,6 @@ allocate(const std::size_t bufferSize,
|
||||
this->fracstressYZ_.resize(bufferSize,0.0);
|
||||
rstKeywords["FRCSTRYZ"] = 0;
|
||||
|
||||
this->linstressXX_.resize(bufferSize,0.0);
|
||||
rstKeywords["LINSTRXX"] = 0;
|
||||
this->linstressYY_.resize(bufferSize,0.0);
|
||||
rstKeywords["LINSTRYY"] = 0;
|
||||
this->linstressZZ_.resize(bufferSize,0.0);
|
||||
rstKeywords["LINSTRZZ"] = 0;
|
||||
this->linstressXY_.resize(bufferSize,0.0);
|
||||
rstKeywords["LINSTRXY"] = 0;
|
||||
this->linstressXZ_.resize(bufferSize,0.0);
|
||||
rstKeywords["LINSTRXZ"] = 0;
|
||||
this->linstressYZ_.resize(bufferSize,0.0);
|
||||
rstKeywords["LINSTRYZ"] = 0;
|
||||
|
||||
allocated_ = true;
|
||||
}
|
||||
|
||||
@ -122,12 +110,7 @@ void MechContainer<Scalar>::
|
||||
assignLinStress(const unsigned globalDofIdx,
|
||||
const Dune::FieldVector<Scalar,6>& linStress)
|
||||
{
|
||||
this->linstressXX_[globalDofIdx] = linStress[0];
|
||||
this->linstressYY_[globalDofIdx] = linStress[1];
|
||||
this->linstressZZ_[globalDofIdx] = linStress[2];
|
||||
this->linstressYZ_[globalDofIdx] = linStress[3];
|
||||
this->linstressXZ_[globalDofIdx] = linStress[4];
|
||||
this->linstressXY_[globalDofIdx] = linStress[5];
|
||||
this->linstress_.assign(globalDofIdx, VoigtContainer<Scalar>(linStress));
|
||||
}
|
||||
|
||||
template<class Scalar>
|
||||
@ -189,12 +172,7 @@ outputRestart(data::Solution& sol) const
|
||||
DataEntry{"FRCSTRXY", UnitSystem::measure::pressure, &fracstressXY_},
|
||||
DataEntry{"FRCSTRXZ", UnitSystem::measure::pressure, &fracstressXZ_},
|
||||
DataEntry{"FRCSTRYZ", UnitSystem::measure::pressure, &fracstressYZ_},
|
||||
DataEntry{"LINSTRXX", UnitSystem::measure::pressure, &linstressXX_},
|
||||
DataEntry{"LINSTRYY", UnitSystem::measure::pressure, &linstressYY_},
|
||||
DataEntry{"LINSTRZZ", UnitSystem::measure::pressure, &linstressZZ_},
|
||||
DataEntry{"LINSTRXY", UnitSystem::measure::pressure, &linstressXY_},
|
||||
DataEntry{"LINSTRXZ", UnitSystem::measure::pressure, &linstressXZ_},
|
||||
DataEntry{"LINSTRYZ", UnitSystem::measure::pressure, &linstressYZ_},
|
||||
DataEntry{"LINSTR", UnitSystem::measure::pressure, &linstress_},
|
||||
DataEntry{"MECHPOTF", UnitSystem::measure::pressure, &potentialForce_},
|
||||
DataEntry{"PRESPOTF", UnitSystem::measure::pressure, &potentialPressForce_},
|
||||
DataEntry{"STRAIN", UnitSystem::measure::identity, &strain_},
|
||||
|
@ -81,14 +81,9 @@ public:
|
||||
|
||||
std::array<ScalarBuffer,3> disp_;
|
||||
VoigtArray<Scalar> delstress_;
|
||||
VoigtArray<Scalar> linstress_;
|
||||
VoigtArray<Scalar> strain_;
|
||||
VoigtArray<Scalar> stress_;
|
||||
ScalarBuffer linstressXX_;
|
||||
ScalarBuffer linstressYY_;
|
||||
ScalarBuffer linstressZZ_;
|
||||
ScalarBuffer linstressXY_;
|
||||
ScalarBuffer linstressXZ_;
|
||||
ScalarBuffer linstressYZ_;
|
||||
ScalarBuffer fracstressXX_;
|
||||
ScalarBuffer fracstressYY_;
|
||||
ScalarBuffer fracstressZZ_;
|
||||
|
Loading…
Reference in New Issue
Block a user