merging conflicts

Author: mcarcana

src/post_process/m_start_up.f90

@@ -395,7 +395,7 @@ subroutine s_save_data(t_step, varname, pres, c, H)
                 end if
                 if (prim_vars_wrt) then
                     q_sf = q_prim_vf(xiend+1)%sf( &
-                            -offset_x%beg:m + offset_x%end, &
+                           -offset_x%beg:m + offset_x%end, &
                            -offset_y%beg:n + offset_y%end, &
                            -offset_z%beg:p + offset_z%end)
                     write (varname, '(A,I0)') 'vonMises'

submit_hyper.sh

@@ -2,3 +2,8 @@
 
 #./mfc.sh run /scratch/bciv/rodrigu1/cav2024/hyper/hyper_gel.py -p gpuA40x4 -N 1 -n 1 -g 1 -w 01:00:00 -# test1 -t post_process -a bciv-delta-gpu -c delta
 ./mfc.sh run /projects/bciv/mcarcanabarbosa/kymo/geldef.py -p gpuA100x4 -N 1 -n 4 -g 1 -w 01:00:00 -# test1 -t post_process -a bciv-delta-gpu -c delta
+#./mfc.sh run ./examples/3D_hyperelasticity/hyper_gel.py -p batch -N 1 -n 4 -g 0 -w 01:00:00 -# test1 -t pre_process -c oscar
+#./mfc.sh run ./examples/3D_hyperelasticity/hyper_gel.py -p batch -N 1 -n 4 -g 0 -w 01:00:00 -# test1 -t simulation -c oscar
+#./mfc.sh run /scratch/bciv/rodrigu1/cav2024/hyper/hyper_gel.py -p gpuA40x4 -N 1 -n 1 -g 1 -w 01:00:00 -# test1 -t post_process -a bciv-delta-gpu -c delta
+
+#./mfc.sh run /projects/bciv/mcarcanabarbosa/ctr/gel/geldef.py -p gpuA100x4 -N 1 -n 4 -g 1 -w 01:00:00 -#gel25 -t post_process -a bciv-delta-gpu -c delta