[PL/TH2M] Rename dfW_4 to specific dfW_4_LWpG_.

Needed before adding the dfW_4_LWpC parts.

ProcessLib/TH2M/ConstitutiveVariables.h

@@ -34,12 +34,12 @@ struct ConstitutiveVariables
     DisplacementDimVector drho_LR_h_w_eff_dp_cap_Npart;
     DisplacementDimMatrix drho_LR_h_w_eff_dp_cap_gradNpart;
     DisplacementDimVector drho_GR_h_w_eff_dT;
-    DisplacementDimMatrix dfW_4a_dp_GR;
-    DisplacementDimMatrix dfW_4a_dp_cap;
-    DisplacementDimMatrix dfW_4a_dT;
-    DisplacementDimMatrix dfW_4d_dp_GR;
-    DisplacementDimMatrix dfW_4d_dp_cap;
-    DisplacementDimMatrix dfW_4d_dT;
+    DisplacementDimMatrix dfW_4_LWpG_a_dp_GR;
+    DisplacementDimMatrix dfW_4_LWpG_a_dp_cap;
+    DisplacementDimMatrix dfW_4_LWpG_a_dT;
+    DisplacementDimMatrix dfW_4_LWpG_d_dp_GR;
+    DisplacementDimMatrix dfW_4_LWpG_d_dp_cap;
+    DisplacementDimMatrix dfW_4_LWpG_d_dT;
     DisplacementDimMatrix dfC_4_LCpG_dT;
     DisplacementDimMatrix dadvection_C_dp_GR;
     DisplacementDimMatrix dk_over_mu_G_dp_cap;

ProcessLib/TH2M/TH2MFEM-impl.h

@@ -650,17 +650,17 @@ TH2MLocalAssembler<ShapeFunctionDisplacement, ShapeFunctionPressure,
             ip_cv.ds_L_dp_cap * rho_W_LR_dot - s_L * c.drho_W_LR_dp_LR / dt;
         ip_cv.dfW_3a_dT = s_G * c.drho_W_GR_dT / dt + s_L * c.drho_W_LR_dT / dt;
 
-        ip_cv.dfW_4a_dp_GR = c.drho_W_GR_dp_GR * k_over_mu_G;
-        ip_cv.dfW_4a_dp_cap = -c.drho_W_LR_dp_LR * k_over_mu_L;
-        ip_cv.dfW_4a_dT =
+        ip_cv.dfW_4_LWpG_a_dp_GR = c.drho_W_GR_dp_GR * k_over_mu_G;
+        ip_cv.dfW_4_LWpG_a_dp_cap = -c.drho_W_LR_dp_LR * k_over_mu_L;
+        ip_cv.dfW_4_LWpG_a_dT =
             c.drho_W_GR_dT * k_over_mu_G + c.drho_W_LR_dT * k_over_mu_L;
 
         // TODO (naumov) for dxmW*/d* != 0
-        ip_cv.dfW_4d_dp_GR =
+        ip_cv.dfW_4_LWpG_d_dp_GR =
             Eigen::Matrix<double, DisplacementDim, DisplacementDim>::Zero();
-        ip_cv.dfW_4d_dp_cap =
+        ip_cv.dfW_4_LWpG_d_dp_cap =
             Eigen::Matrix<double, DisplacementDim, DisplacementDim>::Zero();
-        ip_cv.dfW_4d_dT =
+        ip_cv.dfW_4_LWpG_d_dT =
             Eigen::Matrix<double, DisplacementDim, DisplacementDim>::Zero();
     }
 
@@ -1540,18 +1540,19 @@ void TH2MLocalAssembler<ShapeFunctionDisplacement, ShapeFunctionPressure,
 
         // fW_4 LWpG' parts; LWpG = \int grad (a + d) grad
         local_Jac.template block<W_size, C_size>(W_index, C_index).noalias() -=
-            gradNpT * (ip_cv.dfW_4a_dp_GR + ip_cv.dfW_4d_dp_GR) * gradpGR * Np *
-            w;
+            gradNpT * (ip_cv.dfW_4_LWpG_a_dp_GR + ip_cv.dfW_4_LWpG_d_dp_GR) *
+            gradpGR * Np * w;
 
         local_Jac.template block<W_size, W_size>(W_index, W_index).noalias() -=
-            gradNpT * (ip_cv.dfW_4a_dp_cap + ip_cv.dfW_4d_dp_cap) * gradpGR *
-            Np * w;
+            gradNpT * (ip_cv.dfW_4_LWpG_a_dp_cap + ip_cv.dfW_4_LWpG_d_dp_cap) *
+            gradpGR * Np * w;
 
         local_Jac
             .template block<W_size, temperature_size>(W_index,
                                                       temperature_index)
-            .noalias() -=
-            gradNpT * (ip_cv.dfW_4a_dT + ip_cv.dfW_4d_dT) * gradpGR * NT * w;
+            .noalias() -= gradNpT *
+                          (ip_cv.dfW_4_LWpG_a_dT + ip_cv.dfW_4_LWpG_d_dT) *
+                          gradpGR * NT * w;
 
         LWpC.noalias() -=
             gradNpT * (advection_W_L + diffusion_W_L_p) * gradNp * w;