Skip to content

Commit

Permalink
clean
Browse files Browse the repository at this point in the history
  • Loading branch information
sbryngelson committed Dec 26, 2024
1 parent ac3f717 commit 1cdc886
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 77 deletions.
2 changes: 0 additions & 2 deletions src/simulation/m_sim_helpers.f90
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
module m_sim_helpers

! Dependencies =============================================================
use m_derived_types !< Definitions of the derived types

use m_global_parameters

use m_variables_conversion
! ==========================================================================

implicit none

Expand Down
31 changes: 11 additions & 20 deletions src/simulation/m_start_up.fpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
!! setting up the time stepping, domain decomposition and I/O procedures.
module m_start_up

! Dependencies =============================================================
use m_derived_types !< Definitions of the derived types

use m_global_parameters !< Definitions of the global parameters
Expand Down Expand Up @@ -82,8 +81,6 @@ module m_start_up

use m_body_forces

! ==========================================================================

implicit none

private; public :: s_read_input_file, &
Expand Down Expand Up @@ -225,15 +222,14 @@ contains
! Logical used to check the existence of the current directory file
logical :: file_exist

! Logistics ========================================================
! Logistics
file_path = trim(case_dir)//'/.'

call my_inquire(file_path, file_exist)

if (file_exist .neqv. .true.) then
call s_mpi_abort(trim(file_path)//' is missing. Exiting ...')
end if
! ==================================================================

call s_check_inputs_common()
call s_check_inputs()
Expand Down Expand Up @@ -278,7 +274,7 @@ contains
call s_mpi_abort(trim(file_path)//' is missing. Exiting ...')
end if

! Cell-boundary Locations in x-direction ===========================
! Cell-boundary Locations in x-direction
file_path = trim(t_step_dir)//'/x_cb.dat'

inquire (FILE=trim(file_path), EXIST=file_exist)
Expand All @@ -303,9 +299,8 @@ contains
end if
end do
end if
! ==================================================================

! Cell-boundary Locations in y-direction ===========================
! Cell-boundary Locations in y-direction
if (n > 0) then

file_path = trim(t_step_dir)//'/y_cb.dat'
Expand All @@ -326,9 +321,8 @@ contains
y_cc(0:n) = y_cb(-1:n - 1) + dy(0:n)/2._wp

end if
! ==================================================================

! Cell-boundary Locations in z-direction ===========================
! Cell-boundary Locations in z-direction
if (p > 0) then

file_path = trim(t_step_dir)//'/z_cb.dat'
Expand All @@ -349,7 +343,6 @@ contains
z_cc(0:p) = z_cb(-1:p - 1) + dz(0:p)/2._wp

end if
! ==================================================================

do i = 1, sys_size
write (file_path, '(A,I0,A)') &
Expand Down Expand Up @@ -403,10 +396,8 @@ contains
end do
end if
end if
! ==================================================================

! Read IBM Data ====================================================

! Read IBM Data
if (ib) then
! Read IB markers
write (file_path, '(A,I0,A)') &
Expand Down Expand Up @@ -949,7 +940,7 @@ contains

integer :: i !< Generic loop iterator

! Population of Buffers in x-direction =============================
! Population of Buffers in x-direction

! Populating cell-width distribution buffer, at the beginning of the
! coordinate direction, based on the selected boundary condition. In
Expand Down Expand Up @@ -1013,9 +1004,9 @@ contains
x_cc(m + i) = x_cc(m + (i - 1)) + (dx(m + (i - 1)) + dx(m + i))/2._wp
end do

! END: Population of Buffers in x-direction ========================
! END: Population of Buffers in x-direction

! Population of Buffers in y-direction =============================
! Population of Buffers in y-direction

! Populating cell-width distribution buffer, at the beginning of the
! coordinate direction, based on the selected boundary condition. In
Expand Down Expand Up @@ -1081,9 +1072,9 @@ contains
y_cc(n + i) = y_cc(n + (i - 1)) + (dy(n + (i - 1)) + dy(n + i))/2._wp
end do

! END: Population of Buffers in y-direction ========================
! END: Population of Buffers in y-direction

! Population of Buffers in z-direction =============================
! Population of Buffers in z-direction

! Populating cell-width distribution buffer, at the beginning of the
! coordinate direction, based on the selected boundary condition. In
Expand Down Expand Up @@ -1149,7 +1140,7 @@ contains
z_cc(p + i) = z_cc(p + (i - 1)) + (dz(p + (i - 1)) + dz(p + i))/2._wp
end do

! END: Population of Buffers in z-direction ========================
! END: Population of Buffers in z-direction

end subroutine s_populate_grid_variables_buffers

Expand Down
5 changes: 1 addition & 4 deletions src/simulation/m_surface_tension.fpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
!> @brief This module is used to compute source terms for surface tension model
module m_surface_tension

! Dependencies =============================================================

use m_derived_types !< Definitions of the derived types

use m_global_parameters !< Definitions of the global parameters
Expand All @@ -19,7 +17,6 @@ module m_surface_tension
use m_helper

use m_boundary_conditions
! ==========================================================================

implicit none

Expand Down Expand Up @@ -314,7 +311,7 @@ contains

integer :: i, j, k, l

! Reconstruction in s1-direction ===================================
! Reconstruction in s1-direction

if (norm_dir == 1) then
is1 = idwbuff(1); is2 = idwbuff(2); is3 = idwbuff(3)
Expand Down
21 changes: 8 additions & 13 deletions src/simulation/m_viscous.fpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
!> @brief The module contains the subroutines used to compute viscous terms.
module m_viscous

! Dependencies =============================================================
use m_derived_types !< Definitions of the derived types

use m_global_parameters !< Definitions of the global parameters
Expand All @@ -16,7 +15,6 @@ module m_viscous
use m_helper

use m_finite_differences
! ==========================================================================

private; public s_get_viscous, &
s_compute_viscous_stress_tensor, &
Expand Down Expand Up @@ -978,7 +976,7 @@ contains

integer :: i, j, k, l

! Reconstruction in s1-direction ===================================
! Reconstruction in s1-direction

if (norm_dir == 1) then
is1_viscous = ix; is2_viscous = iy; is3_viscous = iz
Expand Down Expand Up @@ -1060,8 +1058,6 @@ contains
end if
end if

! ==================================================================

end subroutine s_reconstruct_cell_boundary_values_visc

subroutine s_reconstruct_cell_boundary_values_visc_deriv(v_vf, vL_x, vL_y, vL_z, vR_x, vR_y, vR_z, &
Expand All @@ -1077,7 +1073,7 @@ contains
integer :: weno_dir !< Coordinate direction of the WENO reconstruction

integer :: i, j, k, l
! Reconstruction in s1-direction ===================================
! Reconstruction in s1-direction

if (norm_dir == 1) then
is1_viscous = ix; is2_viscous = iy; is3_viscous = iz
Expand Down Expand Up @@ -1160,7 +1156,6 @@ contains
end if
end if
end if
! ==================================================================

end subroutine s_reconstruct_cell_boundary_values_visc_deriv

Expand Down Expand Up @@ -1202,7 +1197,7 @@ contains

!$acc update device(is1_viscous, is2_viscous, is3_viscous, iv)

! First-Order Spatial Derivatives in x-direction ===================
! First-Order Spatial Derivatives in x-direction
if (norm_dir == 1) then

! A general application of the scalar divergence theorem that
Expand All @@ -1228,9 +1223,9 @@ contains
end do
end do

! END: First-Order Spatial Derivatives in x-direction ==============
! END: First-Order Spatial Derivatives in x-direction

! First-Order Spatial Derivatives in y-direction ===================
! First-Order Spatial Derivatives in y-direction
elseif (norm_dir == 2) then

! A general application of the scalar divergence theorem that
Expand All @@ -1256,9 +1251,9 @@ contains
end do
end do

! END: First-Order Spatial Derivatives in y-direction ==============
! END: First-Order Spatial Derivatives in y-direction

! First-Order Spatial Derivatives in z-direction ===================
! First-Order Spatial Derivatives in z-direction
else

! A general application of the scalar divergence theorem that
Expand All @@ -1285,7 +1280,7 @@ contains
end do

end if
! END: First-Order Spatial Derivatives in z-direction ==============
! END: First-Order Spatial Derivatives in z-direction

end subroutine s_apply_scalar_divergence_theorem

Expand Down
Loading

0 comments on commit 1cdc886

Please sign in to comment.