Merge pull request #23 from 3MAH/dfa_trace_param

Add 1/9 factor to K param in P_DFA
3MAH · Nov 22, 2024 · 15d7e77 · 15d7e77
2 parents d149979 + 326ddab
commit 15d7e77
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/include/simcoon/Continuum_mechanics/Functions/criteria.hpp b/include/simcoon/Continuum_mechanics/Functions/criteria.hpp
@@ -203,9 +203,9 @@ arma::mat P_Hill(const arma::vec &P_params);
     \f$ F,G,H,L,M,N,K \f$, such that
 \f[
     P_{DFA} = \left( \begin{array}{cccccc}
-        G + H + K & -H + K & -G + K & 0 & 0 & 0 \\
-        -H + K & F + H + K & -F + K & 0 & 0 & 0 \\
-        -G + K & -F + K & F + G + K & 0 & 0 & 0 \\
+        G + H + K/9 & -H + K/9 & -G + K/9 & 0 & 0 & 0 \\
+        -H + K/9 & F + H + K/9 & -F + K/9 & 0 & 0 & 0 \\
+        -G + K/9 & -F + K/9 & F + G + K/9 & 0 & 0 & 0 \\
         0 & 0 & 0 & 2 \, N & 0 & 0 \\
         0 & 0 & 0 & 0 & 2 \, M & 0 \\
         0 & 0 & 0 & 0 & 0 & 2 \, L \end{array} \right)
@@ -216,7 +216,7 @@ arma::mat P_Hill(const arma::vec &P_params);
 \f[ 
     \begin{align}    
     \sigma^{DFA} & = \left( H\, \left( \sigma_{11} - \sigma_{22} \right)^2 + G\, \left( \sigma_{11} - \sigma_{33} \right)^2 + F\, \left( \sigma_{22} - \sigma_{33} \right)^2 \right. \\
-     & + \left. 2\,L\,\sigma_{12}^2 + 2\,M\,\sigma_{13}^2 + 2\,N\,\sigma_{23}^2 \right)^{1/2} + K \left( \sigma_{11} + \sigma_{22} + \sigma_{33} \right)^2
+     & + \left. 2\,L\,\sigma_{12}^2 + 2\,M\,\sigma_{13}^2 + 2\,N\,\sigma_{23}^2 \right)^{1/2} + K \left( \left( \sigma_{11} + \sigma_{22} + \sigma_{33} \right) /9 \right)^2
     \end{align}
 \f]
     Considering the full anisotric formulation:

diff --git a/src/Continuum_mechanics/Functions/criteria.cpp b/src/Continuum_mechanics/Functions/criteria.cpp
@@ -168,15 +168,16 @@ mat P_DFA(const vec &params) { //Deshpande–Fleck–Ashby
     //param(3) = L
     //param(4) = M
     //param(5) = N
-    P(0,0) = params(1) + params(2) + params(6); //P_11 = G+H+K
-    P(1,1) = params(0) + params(2) + params(6); //P_22 = F+H+K
-    P(2,2) = params(0) + params(1) + params(6); //P_33 = F+G+K
-    P(0,1) = -1.*params(2) + params(6); //P_12 = -H+K
-    P(1,0) = -1.*params(2) + params(6); //P_12 = -H+K
-    P(0,2) = -1.*params(1) + params(6); //P_13 = -G+K
-    P(2,0) = -1.*params(1) + params(6); //P_13 = -G+K
-    P(1,2) = -1.*params(0) + params(6); //P_23 = -F+K
-    P(2,1) = -1.*params(0) + params(6); //P_23 = -F+K
+    //param(6) = K
+    P(0,0) = params(1) + params(2) + params(6)/9.; //P_11 = G+H+K/9
+    P(1,1) = params(0) + params(2) + params(6)/9.; //P_22 = F+H+K/9
+    P(2,2) = params(0) + params(1) + params(6)/9.; //P_33 = F+G+K/9
+    P(0,1) = -1.*params(2) + params(6)/9.; //P_12 = -H+K/9
+    P(1,0) = -1.*params(2) + params(6)/9.; //P_12 = -H+K/9
+    P(0,2) = -1.*params(1) + params(6)/9.; //P_13 = -G+K/9
+    P(2,0) = -1.*params(1) + params(6)/9.; //P_13 = -G+K/9
+    P(1,2) = -1.*params(0) + params(6)/9.; //P_23 = -F+K/9
+    P(2,1) = -1.*params(0) + params(6)/9.; //P_23 = -F+K/9
     P(3,3) = 2.*params(5); //P_44 = N
     P(4,4) = 2.*params(4); //P_55 = M
     P(5,5) = 2.*params(3); //P_66 = L