MAINT: Removed remaining matrixMultiply

UCBoulder · Aug 1, 2024 · b2194b4 · b2194b4
1 parent aa09704
commit b2194b4
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/cpp/tardigrade_hydraLinearViscoelasticity.cpp b/src/cpp/tardigrade_hydraLinearViscoelasticity.cpp
@@ -1053,7 +1053,13 @@ namespace tardigradeHydra{
 
             TARDIGRADE_ERROR_TOOLS_CATCH_NODE_POINTER( tardigradeConstitutiveTools::computeGreenLagrangeStrain( *previousFehat, previousIsochoricStrain, previousdEehatdFehat ) );
 
-            fourthOrderTensor dEehatdFe = tardigradeVectorTools::matrixMultiply( dEehatdFehat, *dFehatdFe, sot_dim, sot_dim, sot_dim, sot_dim );
+            Eigen::Map< const Eigen::Matrix< floatType, sot_dim, sot_dim, Eigen::RowMajor > > map_dEehatdFehat( dEehatdFehat.data( ), sot_dim, sot_dim );
+            Eigen::Map< const Eigen::Matrix< floatType, sot_dim, sot_dim, Eigen::RowMajor > > map_dFehatdFe(    dFehatdFe->data( ),   sot_dim, sot_dim );
+
+            fourthOrderTensor dEehatdFe( sot_dim * sot_dim, 0 );
+            Eigen::Map< Eigen::Matrix< floatType, sot_dim, sot_dim, Eigen::RowMajor > > map_dEehatdFe( dEehatdFe.data( ), sot_dim, sot_dim );
+
+            map_dEehatdFe = ( map_dEehatdFehat * map_dFehatdFe ).eval( );
 
             // Get the previous state variable values
 
@@ -1130,8 +1136,6 @@ namespace tardigradeHydra{
 
             Eigen::Map< const Eigen::Matrix< floatType, sot_dim, sot_dim, Eigen::RowMajor > > map_dPK2IsochoricStressdEe( dPK2IsochoricStressdEe.data( ), sot_dim, sot_dim );
 
-            Eigen::Map< const Eigen::Matrix< floatType, sot_dim, sot_dim, Eigen::RowMajor > > map_dEehatdFe( dEehatdFe.data( ), sot_dim, sot_dim );
-
             dPK2IsochoricStressdFe.zero( sot_dim * sot_dim );
             Eigen::Map< Eigen::Matrix< floatType, sot_dim, sot_dim, Eigen::RowMajor > > map_dPK2IsochoricStressdFe( dPK2IsochoricStressdFe.value->data( ), sot_dim, sot_dim );