Merge branch 'main' into seg_relax

wortiz · Jun 14, 2024 · c9a95a5 · c9a95a5
2 parents c7cc764 + cf59e98
commit c9a95a5
Show file tree

Hide file tree

Showing 18 changed files with 769 additions and 275 deletions.
diff --git a/include/mm_as_structs.h b/include/mm_as_structs.h
@@ -3228,6 +3228,7 @@ struct Lubrication_Auxiliaries {
                                        stream shear stress */
   double dq_dgradp[DIM][DIM];       /* Flow rate sensitivities w.r.t. pressure gradient */
   double dq_dT[DIM];                /* Flow rate sensitivities w.r.t. Temperature */
+  double dq_dv[DIM][DIM][MDE];      /* Flow rate sensitivities w.r.t. velocities */
 
   double dv_avg_dh[DIM][MDE];           /* Average velocity sensitivities w.r.t. height */
   double dv_avg_dh1[DIM][MDE];          /* Average velocity sensitivities w.r.t. height */

diff --git a/include/mm_mp_const.h b/include/mm_mp_const.h
@@ -520,8 +520,10 @@ extern int Num_Var_Init_Mat[MAX_NUMBER_MATLS]; /* number of variables to overwri
 #define HYDRODYNAMIC_QTENSOR_OLD 22
 #define FICKIAN_SHELL            23 /* Shell version of Fickian diffusion equation */
 /* surface tension laws */
-#define DILATION       3
-#define GIBBS_ISOTHERM 35
+#define DILATION        3
+#define GIBBS_ISOTHERM  35
+#define TIME_RAMP       353
+#define TIME_RAMP_SIGMA 354
 
 /* species only diffusion choices */
 #define DIFF_OFF      0

diff --git a/include/mm_post_def.h b/include/mm_post_def.h
@@ -692,6 +692,7 @@ extern int THIRD_STRAINRATE_INVAR;
 extern int WALL_DISTANCE;
 extern int CONTACT_DISTANCE;
 extern int PP_FLUID_STRESS;
+extern int LUB_CONVECTION; /* Convection forces in Lubrication */
 /*
  *  Post-processing Step 1: add a new variable flag to end of mm_post_proc.h
  *

diff --git a/include/user_post.h b/include/user_post.h
@@ -41,7 +41,7 @@ EXTERN int usr_ptracking(FILE *,         /*  jfp - filename for output
                          const double[], /*  part_xold - past coords                  */
                          const double[], /*  part_vold - past velocity                */
                          const int,      /*  heading - flag for writing headings      */
-                         const double,   /*  time_value - porticle time               */
+                         const double,   /*  time_value - particle time               */
                          const double);  /*  time_step - time step                    */
 
 #endif /* GOMA_USER_POST_H */
diff --git a/src/dp_vif.c b/src/dp_vif.c
@@ -2662,6 +2662,7 @@ void noahs_ark(void) {
   ddd_add_member(n, &WALL_DISTANCE, 1, MPI_INT);
   ddd_add_member(n, &CONTACT_DISTANCE, 1, MPI_INT);
   ddd_add_member(n, &PP_FLUID_STRESS, 1, MPI_INT);
+  ddd_add_member(n, &LUB_CONVECTION, 1, MPI_INT);
   ddd_add_member(n, &USER_POST, 1, MPI_INT);
   if (len_u_post_proc > 0) {
     ddd_add_member(n, u_post_proc, len_u_post_proc, MPI_DOUBLE);

diff --git a/src/mm_fill_aux.c b/src/mm_fill_aux.c
@@ -904,16 +904,18 @@ void h_elem_siz(dbl hsquared[DIM],
     DeformingMeshShell = 1;
 
   j = Proc_Connect_Ptr[ei[pg->imtrx]->ielem];
-  for (p = 0; p < dim; p++) {
-    if (DeformingMesh || DeformingMeshShell) {
+  if (pd->gv[MESH_DISPLACEMENT1] && (DeformingMesh || DeformingMeshShell)) {
+    for (p = 0; p < dim; p++) {
       var = MESH_DISPLACEMENT1 + p;
       for (i = 0; i < ei[pd->mi[var]]->num_local_nodes; i++) {
         idof = ei[pd->mi[var]]->ln_to_dof[var][i];
         index = Proc_Elem_Connect[j + i];
         if (idof != -1)
           xnode[p][i] = Coor[p][index] + *esp->d[p][idof];
       }
-    } else {
+    }
+  } else {
+    for (p = 0; p < dim; p++) {
       for (i = 0; i < ei[pg->imtrx]->num_local_nodes; i++) {
         index = Proc_Elem_Connect[j + i];
         xnode[p][i] = Coor[p][index];