Merge pull request #21 from 3MAH/dfa_pywrap

Add python wrappers for DFA equivalent stress

simcoon-python-builder/include/simcoon/python_wrappers/Libraries/Continuum_mechanics/criteria.hpp

@@ -33,11 +33,17 @@ double Ani_stress(const pybind11::array_t<double> &input, const pybind11::array_
 
 //This function returns the derivative of the Ani equivalent stress.
 pybind11::array_t<double> dAni_stress(const pybind11::array_t<double> &input, const pybind11::array_t<double> &props, const bool &copy=true);
+
+//This function returns the DFA equivalent stress.
+double DFA_stress(const pybind11::array_t<double> &input, const pybind11::array_t<double> &props);
+
+//This function returns the derivative of the DFA equivalent stress.
+pybind11::array_t<double> dDFA_stress(const pybind11::array_t<double> &input, const pybind11::array_t<double> &props, const bool &copy=true);
 
 //This function computes the selected equivalent stress function
 double Eq_stress(const pybind11::array_t<double> &input, const std::string &criteria, const pybind11::array_t<double> &props);
 
 //This function computes the deriavtive of the selected equivalent stress function
 pybind11::array_t<double> dEq_stress(const pybind11::array_t<double> &input, const std::string &criteria, const pybind11::array_t<double> &props, const bool &copy=true);
 
-} //namespace simpy
+} //namespace simpy

simcoon-python-builder/src/python_wrappers/Libraries/Continuum_mechanics/criteria.cpp

@@ -57,36 +57,51 @@ py::array_t<double> P_Hill(const py::array_t<double> &props, const bool &copy) {
     return carma::mat_to_arr(t, copy);
 }
 
-//This function returns the Tresca equivalent stress.
+//This function returns the Hill equivalent stress.
 double Hill_stress(const py::array_t<double> &input, const py::array_t<double> &props) {
     vec v = carma::arr_to_col(input);
     vec props_cpp = carma::arr_to_col(props);
     return simcoon::Hill_stress(v, props_cpp);
 }
 
-//This function returns the derivative of the Tresca equivalent stress.
+//This function returns the derivative of the Hill equivalent stress.
 py::array_t<double> dHill_stress(const py::array_t<double> &input, const py::array_t<double> &props, const bool &copy) {
     vec v = carma::arr_to_col(input);
     vec props_cpp = carma::arr_to_col(props);    
     vec t = simcoon::dHill_stress(v, props_cpp);
     return carma::col_to_arr(t, copy);
 }
 
-//This function returns the Tresca equivalent stress.
+//This function returns the anisotropic equivalent stress.
 double Ani_stress(const py::array_t<double> &input, const py::array_t<double> &props) {
     vec v = carma::arr_to_col(input);
     vec props_cpp = carma::arr_to_col(props);    
     return simcoon::Ani_stress(v, props_cpp);
 }
 
-//This function returns the derivative of the Tresca equivalent stress.
+//This function returns the derivative of the anisotropic equivalent stress.
 py::array_t<double> dAni_stress(const py::array_t<double> &input, const py::array_t<double> &props, const bool &copy) {
     vec v = carma::arr_to_col(input);
     vec props_cpp = carma::arr_to_col(props);      
     vec t = simcoon::dAni_stress(v, props_cpp);
     return carma::col_to_arr(t, copy);
 }
 
+//This function returns the DFA equivalent stress.
+double DFA_stress(const py::array_t<double> &input, const py::array_t<double> &props) {
+    vec v = carma::arr_to_col(input);
+    vec props_cpp = carma::arr_to_col(props);
+    return simcoon::DFA_stress(v, props_cpp);
+}
+
+//This function returns the derivative of the DFA equivalent stress.
+py::array_t<double> dDFA_stress(const py::array_t<double> &input, const py::array_t<double> &props, const bool &copy) {
+    vec v = carma::arr_to_col(input);
+    vec props_cpp = carma::arr_to_col(props);
+    vec t = simcoon::dDFA_stress(v, props_cpp);
+    return carma::col_to_arr(t, copy);
+}
+
 //This function computes the selected equivalent stress function
 double Eq_stress(const py::array_t<double> &input, const string &criteria, const py::array_t<double> &props) {
     vec v = carma::arr_to_col(input);
@@ -102,4 +117,4 @@ py::array_t<double> dEq_stress(const py::array_t<double> &input, const string &c
     return carma::col_to_arr(t, copy);
 }
 
-} //namepsace simpy
+} //namepsace simpy