Skip to content
Snippets Groups Projects

Smp modification of elastic response running

Merged Ludovic Noels requested to merge smpModifFp into master
7 files
+ 385
502
Compare changes
  • Side-by-side
  • Inline
Files
7
@@ -13,7 +13,7 @@
@@ -13,7 +13,7 @@
#include "restartManager.h"
#include "restartManager.h"
#include "STensorOperations.h"
#include "STensorOperations.h"
IPHyperViscoElastic::IPHyperViscoElastic(const int N):IPVariableMechanics(),_N(N),_elasticEnergy(0.),_Ee(0.),_kirchhoff(0.),_kirchhoff_vol(0.),_kirchhoff_dev(0.),
IPHyperViscoElastic::IPHyperViscoElastic(const int N):IPVariableMechanics(),_N(N),_elasticEnergy(0.),_Ee(0.),_kirchhoff(0.),
_irreversibleEnergy(0.),_DirreversibleEnergyDF(0.), _viscousEnergyPart(0.), _dElasticEnergyPartdF(0.), _dViscousEnergyPartdF(0.), _elasticBulkPropertyScaleFactor(1.), _elasticShearPropertyScaleFactor(1.)
_irreversibleEnergy(0.),_DirreversibleEnergyDF(0.), _viscousEnergyPart(0.), _dElasticEnergyPartdF(0.), _dViscousEnergyPartdF(0.), _elasticBulkPropertyScaleFactor(1.), _elasticShearPropertyScaleFactor(1.)
{
{
_A.clear();
_A.clear();
@@ -25,7 +25,7 @@ IPHyperViscoElastic::IPHyperViscoElastic(const int N):IPVariableMechanics(),_N(N
@@ -25,7 +25,7 @@ IPHyperViscoElastic::IPHyperViscoElastic(const int N):IPVariableMechanics(),_N(N
}
}
};
};
IPHyperViscoElastic::IPHyperViscoElastic(const IPHyperViscoElastic& src): IPVariableMechanics(src), _Ee(src._Ee),
IPHyperViscoElastic::IPHyperViscoElastic(const IPHyperViscoElastic& src): IPVariableMechanics(src), _Ee(src._Ee),
_N(src._N),_A(src._A),_B(src._B),_elasticEnergy(src._elasticEnergy), _kirchhoff(src._kirchhoff), _kirchhoff_vol(src._kirchhoff_vol), _kirchhoff_dev(src._kirchhoff_dev),
_N(src._N),_A(src._A),_B(src._B),_elasticEnergy(src._elasticEnergy), _kirchhoff(src._kirchhoff),
_irreversibleEnergy(src._irreversibleEnergy),_DirreversibleEnergyDF(src._DirreversibleEnergyDF),
_irreversibleEnergy(src._irreversibleEnergy),_DirreversibleEnergyDF(src._DirreversibleEnergyDF),
_viscousEnergyPart(src._viscousEnergyPart), _dElasticEnergyPartdF(src._dElasticEnergyPartdF),
_viscousEnergyPart(src._viscousEnergyPart), _dElasticEnergyPartdF(src._dElasticEnergyPartdF),
_dViscousEnergyPartdF(src._dViscousEnergyPartdF), _elasticBulkPropertyScaleFactor(src._elasticBulkPropertyScaleFactor), _elasticShearPropertyScaleFactor(src._elasticShearPropertyScaleFactor)
_dViscousEnergyPartdF(src._dViscousEnergyPartdF), _elasticBulkPropertyScaleFactor(src._elasticBulkPropertyScaleFactor), _elasticShearPropertyScaleFactor(src._elasticShearPropertyScaleFactor)
@@ -40,8 +40,6 @@ IPHyperViscoElastic& IPHyperViscoElastic::operator =(const IPVariable& src){
@@ -40,8 +40,6 @@ IPHyperViscoElastic& IPHyperViscoElastic::operator =(const IPVariable& src){
if (psrc != NULL){
if (psrc != NULL){
_Ee = psrc->_Ee;
_Ee = psrc->_Ee;
_kirchhoff = psrc->_kirchhoff;
_kirchhoff = psrc->_kirchhoff;
_kirchhoff_vol = psrc->_kirchhoff_vol;
_kirchhoff_dev = psrc->_kirchhoff_dev;
_N = psrc->_N;
_N = psrc->_N;
_A = psrc->_A;
_A = psrc->_A;
_B = psrc->_B;
_B = psrc->_B;
@@ -65,8 +63,6 @@ void IPHyperViscoElastic::restart() {
@@ -65,8 +63,6 @@ void IPHyperViscoElastic::restart() {
restartManager::restart(_B);
restartManager::restart(_B);
restartManager::restart(_Ee);
restartManager::restart(_Ee);
restartManager::restart(_kirchhoff);
restartManager::restart(_kirchhoff);
restartManager::restart(_kirchhoff_vol);
restartManager::restart(_kirchhoff_dev);
restartManager::restart(_irreversibleEnergy);
restartManager::restart(_irreversibleEnergy);
restartManager::restart(_DirreversibleEnergyDF);
restartManager::restart(_DirreversibleEnergyDF);
restartManager::restart(_viscousEnergyPart);
restartManager::restart(_viscousEnergyPart);
Loading