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

[MINOR PATCH] Corrected the implementation of the previous feature.

parent ebd37fca
No related branches found
No related tags found
No related merge requests found
......@@ -5104,6 +5104,17 @@ void StochDMNDG3DMaterialLaw::setZXZRotationMatrix_in_IP(StochDMNDG3DIPVariable*
eulerZXZToRotationMatrix(alpha,beta,gamma,R);
};
 
void StochDMNDG3DMaterialLaw::set_R_user_input(const double xx, const double xy, const double xz, const double yx, const double yy, const double yz, const double zx, const double zy, const double zz){
if(_type_of_R == 1){
_R_user_input(0,0) = xx; _R_user_input(0,1) = xy; _R_user_input(0,2) = xz;
_R_user_input(1,0) = yx; _R_user_input(1,1) = yy; _R_user_input(1,2) = yz;
_R_user_input(2,0) = zx; _R_user_input(2,1) = zy; _R_user_input(2,2) = zz;
}
else{
Msg::Error("Use set_flag_DMN_response_rotation to set_type_of_R == 1 to use this feature.");
}
};
// FLE
StochTMDMNDG3DMaterialLaw::StochTMDMNDG3DMaterialLaw(const int num, const double rho, const double E,const double nu, const char *ParaFile, const bool ReadTree,
const bool porous, const bool flag_isothermal, const bool flag_microTempFixed, const double tol):
......@@ -5702,6 +5713,17 @@ void StochTMDMNDG3DMaterialLaw::reset_Parameter(const char* Para){
StochTMDMNDG3DMaterialLaw::fill_Matrices();
}
 
void StochTMDMNDG3DMaterialLaw::set_R_user_input(const double xx, const double xy, const double xz, const double yx, const double yy, const double yz, const double zx, const double zy, const double zz){
if(_type_of_R == 1){
_R_user_input(0,0) = xx; _R_user_input(0,1) = xy; _R_user_input(0,2) = xz;
_R_user_input(1,0) = yx; _R_user_input(1,1) = yy; _R_user_input(1,2) = yz;
_R_user_input(2,0) = zx; _R_user_input(2,1) = zy; _R_user_input(2,2) = zz;
}
else{
Msg::Error("Use set_flag_DMN_response_rotation to set_type_of_R == 1 to use this feature.");
}
};
void StochTMDMNDG3DMaterialLaw::stress(IPVariable*ipv, const IPVariable*ipvprev, const bool stiff, const bool checkfrac, const bool dTangent){
// get ipvariable
......
......@@ -778,6 +778,7 @@ class StochDMNDG3DMaterialLaw : public dG3DMaterialLaw{
virtual void getParameterDerivative(const IPVariable*ipv, std::vector< fullMatrix<double> >& dPdPn, std::vector< fullMatrix<double> >&dPdPv) const;
virtual void setZXZRotationMatrix_in_IP(StochDMNDG3DIPVariable* ipv);
#endif //SWIG
virtual void set_R_user_input(const double xx, const double xy, const double xz, const double yx, const double yy, const double yz, const double zx, const double zy, const double zz);
virtual void reset_Parameter(std::vector<std::vector<double>>& Para_Norm, std::vector<std::vector<double>>& Para_Wt, const double Vf = 0.0);
virtual void reset_Parameter(const char* Para);
virtual void reset_Parameter(std::vector<double>& Para_EulerAngles);
......@@ -830,7 +831,7 @@ class StochTMDMNDG3DMaterialLaw : public StochDMNDG3DMaterialLaw{
}
virtual void setMacroSolver(const nonLinearMechSolver* sv);
#endif //SWIG
virtual void set_R_user_input(const double xx, const double xy, const double xz, const double yx, const double yy, const double yz, const double zx, const double zy, const double zz);
virtual void reset_Parameter(std::vector<std::vector<double>>& Para_Norm, std::vector<std::vector<double>>& Para_Wt, const double Vf);
virtual void reset_Parameter(const char* Para);
virtual void set_flag_DMN_response_rotation(const bool flag_rotation, const int type_of_R){_flag_rotation = flag_rotation; _type_of_R = type_of_R;};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment