Removed MixedElasticity from compilation

cardmech/src/elasticity/assemble/CMakeLists.txt

@@ -2,7 +2,7 @@ add_library(ELASTICITY_ASSEMBLE STATIC
         TimeScheme.cpp
         FiniteElasticity.cpp
         LagrangeElasticity.cpp
-        MixedElasticity.cpp
+        #MixedElasticity.cpp
         )
 
 target_link_libraries(ELASTICITY_ASSEMBLE ELASTICITY_PROBLEMS)
\ No newline at end of file

cardmech/src/elasticity/assemble/MixedElasticity.cpp

@@ -30,7 +30,8 @@ void MixedElasticity::Energy(const cell &c, const Vector &W, double &energy) con
     Tensor Du = E.VelocityFieldGradient(q, W);
     Tensor F = FA_inv + Q * Du * FA_inv * QI;
 
-    energy += w * mat::isochoric_energy(eProblem.GetMaterial(d_part < 2), Q * F * QI);
+    energy += w * mat::isochoric_energy(eProblem.GetMaterial(d_part < 2), <#initializer#>,
+                                        Q * F * QI);
     energy += w * p * mat::volumetric_energy(eProblem.GetMaterial(d_part < 2), det(F));
   }
 }
@@ -100,7 +101,8 @@ void MixedElasticity::Jacobi(const cell &c, const Vector &W, Matrix &A) const {
 
             // Deviatoric Piola Kirchhoff Stress
             A_c(E.VelocityIndex(), E.VelocityIndex(), i, j, k, l) -=
-                w * mat::isochoric_second_derivative(eProblem.GetMaterial(d_part < 2), F,
+                w * mat::isochoric_second_derivative(eProblem.GetMaterial(d_part < 2),
+                                                     Q, F,
                                                      Q * F_ik * FA_inv * QI,
                                                      Q * F_jl * FA_inv * QI);
             // Volumetric Piola Kirchhoff Stress
@@ -172,6 +174,7 @@ void MixedElasticity::Residual(const cell &c, const Vector &W, Vector &r) const
         // Deviatoric Piola Kirchhoff Stress
         r_c(E.VelocityIndex(), i, k) -= w *
                                         mat::isochoric_derivative(eProblem.GetMaterial(d_part < 2),
+                                                                  <#initializer#>,
                                                                   F, Q * F_ik * FA_inv * QI);
         // Volumetric Piola Kirchhoff Stress
         r_c(E.VelocityIndex(), i, k) -= w * p *
@@ -238,7 +241,7 @@ void MixedElasticity::GetStress(const Vector &W, Vector &stress) const {
       Tensor F = FA_inv + Q * DeformationGradient(Du) * FA_inv * QI;
 
       //double W = mProblem.GetMaterial(d_part < 2)->W(F, Q, FA_inv);
-      double W = w * mat::isochoric_energy(eProblem.GetMaterial(d_part < 2), F);
+      double W = w * mat::isochoric_energy(eProblem.GetMaterial(d_part < 2), <#initializer#>, F);
 
       for (int i = 0; i < E.VelocitySize(); ++i) {
         // Acceleration