Skip to content
Snippets Groups Projects
Commit 5b96d2ed authored by Ujwal Kishore Jinaga's avatar Ujwal Kishore Jinaga :clown:
Browse files

[MINOR FIX] Resolved bug in computeMaterialLaw - changed fullVector arguments to std:vectors.

parent 489b1066
No related branches found
No related tags found
No related merge requests found
...@@ -444,12 +444,12 @@ void computeMaterialLaw::getTangent_dPdF(fullMatrix<double>& _dPdF){ ...@@ -444,12 +444,12 @@ void computeMaterialLaw::getTangent_dPdF(fullMatrix<double>& _dPdF){
} }
} }
void computeMaterialLaw::getTangents_dPdT_dQdT_dQdF_dQdH_dPdH(fullVector<double>& _dPdT, fullVector<double>& _dQdT, fullMatrix<double>& _dQdF, fullMatrix<double>& _dQdH, fullMatrix<double>& _dPdH){ void computeMaterialLaw::getTangents_dPdT_dQdT_dQdF_dQdH_dPdH(std::vector<double>& _dPdT, std::vector<double>& _dQdT, fullMatrix<double>& _dQdF, fullMatrix<double>& _dQdH, fullMatrix<double>& _dPdH){
if(!_flag_isothermal){ if(!_flag_isothermal){
_dPdT.resize(9); _dPdT.setAll(0.); _dPdT.resize(9); // _dPdT.setAll(0.);
_dQdT.resize(3); _dQdT.setAll(0.); _dQdT.resize(3); // _dQdT.setAll(0.);
_dQdF.resize(3,9); _dQdF.setAll(0.); _dQdF.resize(3,9); _dQdF.setAll(0.);
_dQdH.resize(3,3); _dPdT.setAll(0.); _dQdH.resize(3,3); _dQdH.setAll(0.);
_dPdH.resize(9,3); _dPdH.setAll(0.); _dPdH.resize(9,3); _dPdH.setAll(0.);
IPVariable* ipv = _ips->getState(IPStateBase::current); IPVariable* ipv = _ips->getState(IPStateBase::current);
...@@ -462,9 +462,9 @@ void computeMaterialLaw::getTangents_dPdT_dQdT_dQdF_dQdH_dPdH(fullVector<double> ...@@ -462,9 +462,9 @@ void computeMaterialLaw::getTangents_dPdT_dQdT_dQdF_dQdH_dPdH(fullVector<double>
const STensor33& dPdgradT = ipvcur->getConstRefTodPdGradT(); const STensor33& dPdgradT = ipvcur->getConstRefTodPdGradT();
for(int i=0; i<3; i++){ for(int i=0; i<3; i++){
_dQdT(i) += dQdT(i); _dQdT[i] += dQdT(i);
for(int j=0; j<3; j++){ for(int j=0; j<3; j++){
_dPdT(i+3*j) += dPdT(i,j); _dPdT[i+3*j] += dPdT(i,j);
_dQdH(i,j) += dQdH(i,j); _dQdH(i,j) += dQdH(i,j);
// Msg::Error("_dQdH(%d,%d) = %f",i,j,_dQdH(i,j)); // Msg::Error("_dQdH(%d,%d) = %f",i,j,_dQdH(i,j));
for(int k=0; k<3; k++){ for(int k=0; k<3; k++){
......
...@@ -45,7 +45,7 @@ class computeMaterialLaw ...@@ -45,7 +45,7 @@ class computeMaterialLaw
double getTimeStep() const; double getTimeStep() const;
void getStress(std::vector<double>& Pstress); void getStress(std::vector<double>& Pstress);
void getTangent_dPdF(fullMatrix<double>& _dPdF); void getTangent_dPdF(fullMatrix<double>& _dPdF);
void getTangents_dPdT_dQdT_dQdF_dQdH_dPdH(fullVector<double>& _dPdT, fullVector<double>& _dQdT, fullMatrix<double>& _dQdF, fullMatrix<double>& _dQdH, fullMatrix<double>& _dPdH); void getTangents_dPdT_dQdT_dQdF_dQdH_dPdH(std::vector<double>& _dPdT, std::vector<double>& _dQdT, fullMatrix<double>& _dQdF, fullMatrix<double>& _dQdH, fullMatrix<double>& _dPdH);
void getCombinedTangents_dPQdFHT_dPQdFH(fullMatrix<double>& _dPQdFHT, fullMatrix<double>& _dPQdFH); void getCombinedTangents_dPQdFHT_dPQdFH(fullMatrix<double>& _dPQdFHT, fullMatrix<double>& _dPQdFH);
void getHeatFlux(std::vector<double>& Qstress); void getHeatFlux(std::vector<double>& Qstress);
double get3rdDependentVariable(); double get3rdDependentVariable();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment