diff --git a/dG3D/src/computeWithMaterialLaw.cpp b/dG3D/src/computeWithMaterialLaw.cpp index 15fb46b8b2258735010c9164032a7e42088d1cc0..af382410df31934d6871c1d10340563368bb200c 100644 --- a/dG3D/src/computeWithMaterialLaw.cpp +++ b/dG3D/src/computeWithMaterialLaw.cpp @@ -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){ - _dPdT.resize(9); _dPdT.setAll(0.); - _dQdT.resize(3); _dQdT.setAll(0.); + _dPdT.resize(9); // _dPdT.setAll(0.); + _dQdT.resize(3); // _dQdT.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.); IPVariable* ipv = _ips->getState(IPStateBase::current); @@ -462,9 +462,9 @@ void computeMaterialLaw::getTangents_dPdT_dQdT_dQdF_dQdH_dPdH(fullVector<double> const STensor33& dPdgradT = ipvcur->getConstRefTodPdGradT(); for(int i=0; i<3; i++){ - _dQdT(i) += dQdT(i); + _dQdT[i] += dQdT(i); 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); // Msg::Error("_dQdH(%d,%d) = %f",i,j,_dQdH(i,j)); for(int k=0; k<3; k++){ diff --git a/dG3D/src/computeWithMaterialLaw.h b/dG3D/src/computeWithMaterialLaw.h index 0bb3eca29537fca05a2d95d92c6aabc7487917c0..3455cc70f4dac1d86c2cc195d200bca50fa47988 100644 --- a/dG3D/src/computeWithMaterialLaw.h +++ b/dG3D/src/computeWithMaterialLaw.h @@ -45,7 +45,7 @@ class computeMaterialLaw double getTimeStep() const; void getStress(std::vector<double>& Pstress); 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 getHeatFlux(std::vector<double>& Qstress); double get3rdDependentVariable();