MAINT: Moved the computation of the determinants from tardigradeVecto…

…rTools to Eigen::Map
UCBoulder · Mar 27, 2024 · ce114ab · ce114ab
1 parent 9a27fb5
commit ce114ab
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/docs/sphinx/changelog.rst b/docs/sphinx/changelog.rst
@@ -13,6 +13,7 @@ Internal Changes
 ================
 - Changed the fuzzyEquals in the tests to use BOOST_TEST (:pull:`7`). By `Nathan Miller`_.
 - Completed first pass of improving the computational efficiency (:pull:`9`). By `Nathan Miller`_.
+- Moved the computation of the determinants to exposed Eigen::Map rather than tardigradeVectorTools (:pull:`10`). By `Nathan Miller`_.
 
 Breaking changes
 ================

diff --git a/src/cpp/tardigrade_micromorphic_tools.cpp b/src/cpp/tardigrade_micromorphic_tools.cpp
@@ -622,7 +622,8 @@ namespace tardigradeMicromorphicTools{
 
         microStress = variableVector( dim * dim, 0 );
 
-        detF = tardigradeVectorTools::determinant( deformationGradient, dim, dim );
+        Eigen::Map< const Eigen::Matrix< variableType, dim, dim, Eigen::RowMajor > > map( deformationGradient.data( ), dim, dim );
+        detF = map.determinant( );
 
         microStress = tardigradeVectorTools::matrixMultiply( deformationGradient, referenceMicroStress, dim, dim, dim, dim );
         microStress = tardigradeVectorTools::matrixMultiply( microStress, deformationGradient, dim, dim, dim, dim, false, true );
@@ -724,7 +725,7 @@ namespace tardigradeMicromorphicTools{
             return result;
         }
 
-        //Assemble the jacobian of the determinant of the deformation gradient
+        //Assemble the inverse deformation gradient
         variableVector inverseDeformationGradient = deformationGradient;
         Eigen::Map< Eigen::Matrix< variableType, dim, dim, Eigen::RowMajor > > map( inverseDeformationGradient.data( ), dim, dim );
         map = map.inverse( ).eval( );
@@ -826,7 +827,9 @@ namespace tardigradeMicromorphicTools{
 
         referenceMicroStress = variableVector( dim * dim, 0 );
 
-        detF = tardigradeVectorTools::determinant( deformationGradient, dim, dim );
+        Eigen::Map< const Eigen::Matrix< variableType, dim, dim, Eigen::RowMajor > > cmap( deformationGradient.data( ), dim, dim );
+        detF = cmap.determinant( );
+
         inverseDeformationGradient = deformationGradient;
         Eigen::Map< Eigen::Matrix< variableType, dim, dim, Eigen::RowMajor > > map( inverseDeformationGradient.data( ), dim, dim );
         map = map.inverse( ).eval( );
@@ -1025,7 +1028,8 @@ namespace tardigradeMicromorphicTools{
             return new errorNode( "pushForwardHigherOrderStress", "The micro-deformation doesn't have the correct size" );
         }
 
-        detF = tardigradeVectorTools::determinant( deformationGradient, dim, dim );
+        Eigen::Map< const Eigen::Matrix< variableType, dim, dim, Eigen::RowMajor > > map( deformationGradient.data( ), dim, dim );
+        detF = map.determinant( );
 
         higherOrderStress = variableVector( dim * dim * dim, 0 );
 
@@ -1176,7 +1180,7 @@ namespace tardigradeMicromorphicTools{
             return result;
         }
 
-        //Assemble the jacobian of the determinant of the deformation gradient
+        //Assemble the inverse of the deformation gradient
         variableVector inverseDeformationGradient = deformationGradient;
         Eigen::Map< Eigen::Matrix< variableType, dim, dim, Eigen::RowMajor > > map( inverseDeformationGradient.data( ), dim, dim );
         map = map.inverse( ).eval( );
@@ -1299,7 +1303,9 @@ namespace tardigradeMicromorphicTools{
             return new errorNode( "pushForwardHigherOrderStress", "The micro-deformation doesn't have the correct size" );
         }
 
-        detF = tardigradeVectorTools::determinant( deformationGradient, dim, dim );
+        Eigen::Map< const Eigen::Matrix< variableType, dim, dim, Eigen::RowMajor > > cmap( deformationGradient.data( ), dim, dim );
+        detF = cmap.determinant( );
+
         inverseDeformationGradient = deformationGradient;
         Eigen::Map< Eigen::Matrix< variableType, dim, dim, Eigen::RowMajor > > map( inverseDeformationGradient.data( ), dim, dim );
         map = map.inverse( ).eval( );