bug fixes for run_time.inf

Author: wilfonba

src/common/m_mpi_common.fpp

@@ -453,8 +453,8 @@ contains
         end if
 
         if (surface_tension) then
-            call MPI_REDUCE(Rc_min_loc, Rc_min_glb, 1, &
-                            mpi_p, MPI_MIN, 0, &
+            call MPI_REDUCE(ccfl_max_loc, ccfl_max_glb, 1, &
+                            mpi_p, MPI_MAX, 0, &
                             MPI_COMM_WORLD, ierr)
         end if
 

src/pre_process/include/3dHardcodedIC.fpp

@@ -46,6 +46,28 @@
         end if
     end if
 
+    if (patch_icpp(patch_id)%hcid == 304) then
+        allocate(ih(0:n_glb, 0:0))
+        if (interface_file == '.') then
+            call s_mpi_abort("Error: interface_file must be specified for hcid=304")
+        else
+            inquire (file=trim(interface_file), exist=file_exist)
+            if (file_exist) then
+                open(unit=10, file=trim(interface_file), status="old", action="read")
+                do i = 0, n_glb
+                    read(10, '(A)') line  ! Read a full line as a string
+                    value = trim(line)
+                    read(value, *) ih(i, 0)  ! Convert string to numeric value
+                    if (.not. f_is_default(normMag)) ih(i, 0) = ih(i, 0) * normMag
+                    if (.not. f_is_default(normFac)) ih(i, 0) = ih(i, 0) + normFac
+                end do
+                close(10)
+            else
+                call s_mpi_abort("Error: interface_file specified for hcid=304 does not exist")
+            end if
+        end if
+    end if
+
     eps = 1e-9_wp
 
 #:enddef
@@ -125,10 +147,27 @@
 
         q_prim_vf(E_idx)%sf(i, j, k) = p_th*f_cut_on(r - r_th, eps_smooth)*f_cut_on(x_cc(i), eps_smooth) + p_am
 
-    case (303) ! 3D Interface from file
+    case (303) ! 3D Interface from file cartesian
+
+        alph = 0.5_wp * (1 + (1._wp - 2._wp * eps) * &
+                    tanh((ih(start_idx(1) + i,start_idx(3) + k)  - y_cc(j))*(0.5_wp / dx)))
+
+        q_prim_vf(advxb)%sf(i,j,k) = alph
+        q_prim_vf(advxe)%sf(i,j,k) = 1._wp - alph
+
+        q_prim_vf(contxb)%sf(i,j,k) = q_prim_vf(advxb)%sf(i,j,k) * 1._wp
+        q_prim_vf(contxe)%sf(i,j,k) = q_prim_vf(advxe)%sf(i,j,k) * (1._wp / 950._wp)
+
+        q_prim_vf(E_idx)%sf(i,j,k) = p0 + &
+            (q_prim_vf(contxb)%sf(i,j,k) + q_prim_vf(contxe)%sf(i,j,k)) * g0 * &
+            (ih(start_idx(1) + i, start_idx(3) + k) - y_cc(j))
+
+        if (surface_tension) q_prim_vf(c_idx)%sf(i,j,k) = alph
+
+    case (304) ! 3D Interface from file axisymmetric
 
         alph = 0.5_wp * (1 + (1._wp - 2._wp * eps) * &
-                    tanh((ih(start_idx(1) + i,start_idx(3) + k)  - y_cc(j))*0.1_wp))
+                    tanh((ih(start_idx(2) + j,0)  - x_cc(i))*(0.01_wp / dx)))
 
         q_prim_vf(advxb)%sf(i,j,k) = alph
         q_prim_vf(advxe)%sf(i,j,k) = 1._wp - alph

src/pre_process/m_assign_variables.fpp

@@ -684,7 +684,7 @@ contains
 
         if (surface_tension) then
             q_prim_vf(c_idx)%sf(j, k, l) = eta*patch_icpp(patch_id)%cf_val + &
-                                           (1._wp - eta)*patch_icpp(smooth_patch_id)%cf_val
+                                           (1._wp - eta)*orig_prim_vf(c_idx)
         end if
 
         ! Updating the patch identities bookkeeping variable

src/simulation/m_data_output.fpp

@@ -157,8 +157,8 @@ contains
         write (3, '(A)') ''; write (3, '(A)') ''
 
         ! Generating table header for the stability criteria to be outputted
-        write (3, '(13X,A8,13X,A10,13X,A10,13X,A10,)', advance="no") &
-            trim('Time-steps'), trim('dt'), trim('Time'), trim('ICFL Max')
+        write (3, '(13X,A9,13X,A10,13X,A10,13X,A10,)', advance="no") &
+            trim('Time-step'), trim('dt'), trim('Time'), trim('ICFL Max')
 
         if (viscous) then
             write(3, '(13X,A10,13X,A16)', advance="no") &
@@ -309,7 +309,7 @@ contains
 
         ! Determining local stability criteria extrema at current time-step
 
-#ifdef _CRAYFTN
+!#ifdef _CRAYFTN
         $:GPU_UPDATE(host='[icfl_sf]')
         icfl_max_loc = maxval(icfl_sf)
 
@@ -323,23 +323,23 @@ contains
             $:GPU_UPDATE(host='[ccfl_sf]')
             ccfl_max_loc = maxval(ccfl_sf)
         end if
-#else
-        #:call GPU_PARALLEL(copyout='[icfl_max_loc]', copyin='[icfl_sf]')
-            icfl_max_loc = maxval(icfl_sf)
-        #:endcall GPU_PARALLEL
-        if (viscous) then
-            #:call GPU_PARALLEL(copyout='[vcfl_max_loc, Rc_min_loc]', copyin='[vcfl_sf,Rc_sf]')
-                vcfl_max_loc = maxval(vcfl_sf)
-                Rc_min_loc = minval(Rc_sf)
-            #:endcall GPU_PARALLEL
-        end if
-
-        if (surface_tension) then
-            #:call GPU_PARALLEL(copyout='[ccfl_max_loc]', copyin='[ccfl_sf]')
-                ccfl_max_loc = maxval(ccfl_sf)
-            #:endcall GPU_PARALLEL
-        end if
-#endif
+!#else
+        !#:call GPU_PARALLEL(copyout='[icfl_max_loc]', copyin='[icfl_sf]')
+            !icfl_max_loc = maxval(icfl_sf)
+        !#:endcall GPU_PARALLEL
+        !if (viscous) then
+            !#:call GPU_PARALLEL(copyout='[vcfl_max_loc, Rc_min_loc]', copyin='[vcfl_sf,Rc_sf]')
+                !vcfl_max_loc = maxval(vcfl_sf)
+                !Rc_min_loc = minval(Rc_sf)
+            !#:endcall GPU_PARALLEL
+        !end if
+
+        !if (surface_tension) then
+            !#:call GPU_PARALLEL(copyout='[ccfl_max_loc]', copyin='[ccfl_sf]')
+                !ccfl_max_loc = maxval(ccfl_sf)
+            !#:endcall GPU_PARALLEL
+        !end if
+!#endif
 
         ! Determining global stability criteria extrema at current time-step
         if (num_procs > 1) then
@@ -372,8 +372,8 @@ contains
 
         ! Outputting global stability criteria extrema at current time-step
         if (proc_rank == 0) then
-            write (3, '(13X,I8,13X,F10.6,13X,F10.6,13X,F10.6)', advance="no") &
-                t_step, dt, t_step*dt, icfl_max_glb
+            write (3, '(13X,I9,13X,F10.6,13X,F10.6,13X,F10.6)', advance="no") &
+                t_step, dt, mytime, icfl_max_glb
 
             if (viscous) then
                 write (3, '(13X,F10.6,13X,ES16.6)', advance="no") &

src/simulation/m_sim_helpers.fpp

@@ -235,12 +235,12 @@ contains
             if (p > 0) then ! 3D
                 if (grid_geometry == 3) then
                     fltr_dtheta = f_compute_filtered_dtheta(k, l)
-                    ccfl_sf(j, k, l) = dt/sqrt(rho * max(dx(j), dy(k), fltr_dtheta)**3._wp / sigma)
+                    ccfl_sf(j, k, l) = dt/sqrt(rho * min(dx(j), dy(k), fltr_dtheta)**3._wp / sigma)
                 else
-                    ccfl_sf(j, k, l) = dt/sqrt(rho * max(dx(j), dy(k), dz(l))**3._wp / sigma)
+                    ccfl_sf(j, k, l) = dt/sqrt(rho * min(dx(j), dy(k), dz(l))**3._wp / sigma)
                 end if
             elseif (n > 0) then ! 2D
-                ccfl_sf(j, k, l) = dt/sqrt(rho * max(dx(j), dy(k))**3._wp / sigma)
+                ccfl_sf(j, k, l) = dt/sqrt(rho * min(dx(j), dy(k))**3._wp / sigma)
             end if
         end if
 
@@ -296,12 +296,12 @@ contains
             if (p > 0) then ! 3D
                 if (grid_geometry == 3) then
                     fltr_dtheta = f_compute_filtered_dtheta(k, l)
-                    ccfl_dt = cfl_target*sqrt(rho * max(dx(j), dy(k), fltr_dtheta)**3._wp / sigma)
+                    ccfl_dt = cfl_target*sqrt(rho * min(dx(j), dy(k), fltr_dtheta)**3._wp / sigma)
                 else
-                    ccfl_dt = cfl_target*sqrt(rho * max(dx(j), dy(k), dz(l))**3._wp / sigma)
+                    ccfl_dt = cfl_target*sqrt(rho * min(dx(j), dy(k), dz(l))**3._wp / sigma)
                 end if
             elseif (n > 0) then ! 2D
-                ccfl_dt = cfl_target*sqrt(rho * max(dx(j), dy(k))**3._wp / sigma)
+                ccfl_dt = cfl_target*sqrt(rho * min(dx(j), dy(k))**3._wp / sigma)
             end if
         end if