Skip to content

Commit 98bcbf9

Browse files
sbryngelsonsbryngelson
committed
fix linter
1 parent 3cb6462 commit 98bcbf9

7 files changed

Lines changed: 73 additions & 345 deletions

File tree

‎.ffmt_cache/hashes‎

Lines changed: 0 additions & 249 deletions
This file was deleted.

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,3 +114,4 @@ cce_*/
114114
cce_*.log
115115
run_cce_*.sh
116116
.ffmt_cache/
117+
**/.ffmt_cache/

‎src/common/m_boundary_common.fpp‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
!! @file
33
!! Contains module m_boundary_common
44

5-
!> Noncharacteristic and processor boundary condition application for ghost cells and buffer regions
5+
!> @brief Noncharacteristic and processor boundary condition application for ghost cells and buffer regions
66
#:include 'case.fpp'
77
#:include 'macros.fpp'
88

@@ -97,7 +97,6 @@ contains
9797
type(integer_field), dimension(1:num_dims,1:2), intent(in) :: bc_type
9898
integer :: k, l
9999

100-
101100
if (bc_x%beg >= 0) then
102101
call s_mpi_sendrecv_variables_buffers(q_prim_vf, 1, -1, sys_size, pb_in, mv_in)
103102
else
@@ -156,7 +155,6 @@ contains
156155
$:END_GPU_PARALLEL_LOOP()
157156
end if
158157

159-
160158
if (n == 0) return
161159

162160
#:if not MFC_CASE_OPTIMIZATION or num_dims > 1
@@ -222,7 +220,6 @@ contains
222220
end if
223221
#:endif
224222

225-
226223
if (p == 0) return
227224

228225
#:if not MFC_CASE_OPTIMIZATION or num_dims > 2
@@ -342,7 +339,8 @@ contains
342339

343340
end subroutine s_ghost_cell_extrapolation
344341

345-
!> Applies reflective (symmetry) boundary conditions by mirroring primitive variables and flipping the normal velocity component.
342+
!> Applies reflective (symmetry) boundary conditions by mirroring primitive variables and flipping the normal velocity
343+
!! component.
346344
subroutine s_symmetry(q_prim_vf, bc_dir, bc_loc, k, l, pb_in, mv_in)
347345

348346
$:GPU_ROUTINE(parallelism='[seq]')
@@ -2278,7 +2276,6 @@ contains
22782276
#endif
22792277

22802278
#ifndef MFC_PRE_PROCESS
2281-
22822279
! Populating cell-width distribution buffer at bc_x%beg
22832280
if (bc_x%beg >= 0) then
22842281
call s_mpi_sendrecv_grid_variables_buffers(1, -1)
@@ -2331,7 +2328,6 @@ contains
23312328
x_cc(m + i) = x_cc(m + (i - 1)) + (dx(m + (i - 1)) + dx(m + i))/2._wp
23322329
end do
23332330

2334-
23352331
! Populating cell-width distribution buffer at bc_y%beg
23362332
if (n == 0) then
23372333
return
@@ -2386,7 +2382,6 @@ contains
23862382
y_cc(n + i) = y_cc(n + (i - 1)) + (dy(n + (i - 1)) + dy(n + i))/2._wp
23872383
end do
23882384

2389-
23902385
! Populating cell-width distribution buffer at bc_z%beg
23912386
if (p == 0) then
23922387
return

‎src/pre_process/m_global_parameters.fpp‎

Lines changed: 27 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#:include 'case.fpp'
66

7-
!> Defines global parameters for the computational domain, simulation algorithm, and initial conditions
7+
!> @brief Defines global parameters for the computational domain, simulation algorithm, and initial conditions
88
module m_global_parameters
99

1010
#ifdef MFC_MPI
@@ -112,32 +112,31 @@ module m_global_parameters
112112
! Cell Indices for the entire (local) domain. In simulation and post_process, this includes the buffer region. idwbuff and
113113
! idwint are the same otherwise. Stands for "InDices With BUFFer".
114114
type(int_bounds_info) :: idwbuff(1:3)
115-
116-
integer :: fd_order !< Finite-difference order for CoM/probe derivative approximations
117-
integer :: fd_number !< FD half-stencil size: MAX(1, fd_order/2)
115+
integer :: fd_order !< Finite-difference order for CoM/probe derivative approximations
116+
integer :: fd_number !< FD half-stencil size: MAX(1, fd_order/2)
118117

119118
!> @name lagrangian subgrid bubble parameters
120119
!> @{!
121120
type(bubbles_lagrange_parameters) :: lag_params !< Lagrange bubbles' parameters
122121
!> @}
123122
124-
type(int_bounds_info) :: bc_x, bc_y, bc_z !< Boundary conditions in the x-, y- and z-coordinate directions
125-
integer :: shear_num !< Number of shear stress components
126-
integer, dimension(3) :: shear_indices !< Indices of the stress components that represent shear stress
127-
integer :: shear_BC_flip_num !< Number of shear stress components to reflect for boundary conditions
128-
integer, dimension(3, 2) :: shear_BC_flip_indices !< Shear stress BC reflection indices (1:3, 1:shear_BC_flip_num)
129-
logical :: parallel_io !< Format of the data files
130-
logical :: file_per_process !< type of data output
131-
integer :: precision !< Precision of output files
132-
logical :: down_sample !< Down-sample the output data
133-
logical :: mixlayer_vel_profile !< Set hyperbolic tangent streamwise velocity profile
134-
real(wp) :: mixlayer_vel_coef !< Coefficient for the hyperbolic tangent streamwise velocity profile
135-
logical :: mixlayer_perturb !< Superimpose instability waves to surrounding fluid flow
136-
integer :: mixlayer_perturb_nk !< Number of Fourier modes for perturbation with mixlayer_perturb flag
137-
real(wp) :: mixlayer_perturb_k0 !< Peak wavenumber for mixlayer perturbation (default: most unstable mode)
123+
type(int_bounds_info) :: bc_x, bc_y, bc_z !< Boundary conditions in the x-, y- and z-coordinate directions
124+
integer :: shear_num !< Number of shear stress components
125+
integer, dimension(3) :: shear_indices !< Indices of the stress components that represent shear stress
126+
integer :: shear_BC_flip_num !< Number of shear stress components to reflect for boundary conditions
127+
integer, dimension(3, 2) :: shear_BC_flip_indices !< Shear stress BC reflection indices (1:3, 1:shear_BC_flip_num)
128+
logical :: parallel_io !< Format of the data files
129+
logical :: file_per_process !< type of data output
130+
integer :: precision !< Precision of output files
131+
logical :: down_sample !< Down-sample the output data
132+
logical :: mixlayer_vel_profile !< Set hyperbolic tangent streamwise velocity profile
133+
real(wp) :: mixlayer_vel_coef !< Coefficient for the hyperbolic tangent streamwise velocity profile
134+
logical :: mixlayer_perturb !< Superimpose instability waves to surrounding fluid flow
135+
integer :: mixlayer_perturb_nk !< Number of Fourier modes for perturbation with mixlayer_perturb flag
136+
real(wp) :: mixlayer_perturb_k0 !< Peak wavenumber for mixlayer perturbation (default: most unstable mode)
138137
logical :: simplex_perturb
139138
type(simplex_noise_params) :: simplex_params
140-
real(wp) :: pi_fac !< Factor for artificial pi_inf
139+
real(wp) :: pi_fac !< Factor for artificial pi_inf
141140
logical :: viscous
142141
logical :: bubbles_lagrange
143142
@@ -152,9 +151,8 @@ module m_global_parameters
152151
integer :: elliptic_smoothing_iters
153152
integer, allocatable, dimension(:) :: proc_coords !< Processor coordinates in MPI_CART_COMM
154153
type(int_bounds_info), dimension(3) :: nidx
155-
integer, allocatable, dimension(:,:,:) :: neighbor_ranks !< Neighbor ranks
156-
157-
integer, allocatable, dimension(:) :: start_idx !< Starting cell-center index of local processor in global grid
154+
integer, allocatable, dimension(:,:,:) :: neighbor_ranks !< Neighbor ranks
155+
integer, allocatable, dimension(:) :: start_idx !< Starting cell-center index of local processor in global grid
158156
159157
#ifdef MFC_MPI
160158
type(mpi_io_var), public :: MPI_IO_DATA
@@ -164,12 +162,10 @@ module m_global_parameters
164162
165163
! Initial Condition Parameters
166164
integer :: num_patches !< Number of patches composing initial condition
167-
168-
type(ic_patch_parameters), dimension(num_patches_max) :: patch_icpp !< IC patch parameters (max: num_patches_max)
169-
integer :: num_bc_patches !< Number of boundary condition patches
170-
logical :: bc_io !< whether or not to save BC data
165+
type(ic_patch_parameters), dimension(num_patches_max) :: patch_icpp !< IC patch parameters (max: num_patches_max)
166+
integer :: num_bc_patches !< Number of boundary condition patches
167+
logical :: bc_io !< whether or not to save BC data
171168
type(bc_patch_parameters), dimension(num_bc_patches_max) :: patch_bc !< BC patch parameters
172-
173169
type(physical_parameters), dimension(num_fluids_max) :: fluid_pp !< Stiffened gas EOS parameters and Reynolds numbers per fluid
174170
175171
! Subgrid Bubble Parameters
@@ -233,11 +229,10 @@ module m_global_parameters
233229
integer, allocatable, dimension(:,:,:) :: logic_grid
234230
type(pres_field) :: pb
235231
type(pres_field) :: mv
236-
real(wp) :: Bx0 !< Constant magnetic field in the x-direction (1D)
237-
238-
integer :: buff_size !< Number of ghost cells for boundary condition storage
239-
logical :: fft_wrt
240-
logical :: dummy !< AMDFlang workaround for case-optimization + GPU-kernel bug
232+
real(wp) :: Bx0 !< Constant magnetic field in the x-direction (1D)
233+
integer :: buff_size !< Number of ghost cells for boundary condition storage
234+
logical :: fft_wrt
235+
logical :: dummy !< AMDFlang workaround for case-optimization + GPU-kernel bug
241236
242237
! Variables for hardcoded initial conditions that are read from input files
243238
character(LEN=2*path_len) :: interface_file

‎src/simulation/m_data_output.fpp‎

Lines changed: 33 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#:include 'macros.fpp'
66
#:include 'case.fpp'
77

8-
!> Writes solution data, run-time stability diagnostics (ICFL, VCFL, CCFL, Rc), and probe/center-of-mass files
8+
!> @brief Writes solution data, run-time stability diagnostics (ICFL, VCFL, CCFL, Rc), and probe/center-of-mass files
99
module m_data_output
1010

1111
use m_derived_types
@@ -305,7 +305,6 @@ contains
305305
integer :: i, j, k, l, r
306306
real(wp) :: gamma, lit_gamma, pi_inf, qv !< Temporary EOS params
307307

308-
309308
write (t_step_dir, '(A,I0,A,I0)') trim(case_dir) // '/p_all'
310309

311310
write (t_step_dir, '(a,i0,a,i0)') trim(case_dir) // '/p_all/p', proc_rank, '/', t_step
@@ -779,7 +778,6 @@ contains
779778

780779
call MPI_FILE_CLOSE(ifile, ierr)
781780
else
782-
783781
if (ib) then
784782
call s_initialize_mpi_data(q_cons_vf, ib_markers)
785783
else if (present(beta)) then
@@ -863,7 +861,6 @@ contains
863861
character(LEN=path_len + 2*name_len) :: file_path
864862
character(LEN=path_len + 2*name_len) :: t_step_dir
865863

866-
867864
write (t_step_dir, '(A,I0,A,I0)') trim(case_dir) // '/p_all'
868865
write (t_step_dir, '(a,i0,a,i0)') trim(case_dir) // '/p_all/p', proc_rank, '/', time_step
869866
write (file_path, '(A,I0,A)') trim(t_step_dir) // '/ib_data.dat'
@@ -945,7 +942,6 @@ contains
945942
integer :: i !< Generic loop iterator
946943
real(wp) :: nondim_time !< Non-dimensional time
947944

948-
949945
if (t_step_old /= dflt_int) then
950946
nondim_time = real(t_step + t_step_old, wp)*dt
951947
else
@@ -980,39 +976,38 @@ contains
980976
real(wp), dimension(-1:m) :: distx
981977
real(wp), dimension(-1:n) :: disty
982978
real(wp), dimension(-1:p) :: distz
983-
984-
real(wp) :: lit_gamma, nbub
985-
real(wp) :: rho
986-
real(wp), dimension(num_vels) :: vel
987-
real(wp) :: pres
988-
real(wp) :: ptilde
989-
real(wp) :: ptot
990-
real(wp) :: alf
991-
real(wp) :: alfgr
992-
real(wp), dimension(num_fluids) :: alpha
993-
real(wp) :: gamma
994-
real(wp) :: pi_inf
995-
real(wp) :: qv
996-
real(wp) :: c
997-
real(wp) :: M00, M10, M01, M20, M11, M02
998-
real(wp) :: varR, varV
999-
real(wp), dimension(Nb) :: nR, R, nRdot, Rdot
1000-
real(wp) :: nR3
1001-
real(wp) :: accel
1002-
real(wp) :: int_pres
1003-
real(wp) :: max_pres
1004-
real(wp), dimension(2) :: Re
1005-
real(wp), dimension(6) :: tau_e
1006-
real(wp) :: G_local
1007-
real(wp) :: dyn_p, T
1008-
real(wp) :: damage_state
1009-
integer :: i, j, k, l, s, d !< Generic loop iterator
1010-
real(wp) :: nondim_time !< Non-dimensional time
1011-
real(wp) :: tmp !< Temporary variable to store quantity for mpi_allreduce
1012-
integer :: npts !< Number of included integral points
1013-
real(wp) :: rad, thickness !< For integral quantities
1014-
logical :: trigger !< For integral quantities
1015-
real(wp) :: rhoYks(1:num_species)
979+
real(wp) :: lit_gamma, nbub
980+
real(wp) :: rho
981+
real(wp), dimension(num_vels) :: vel
982+
real(wp) :: pres
983+
real(wp) :: ptilde
984+
real(wp) :: ptot
985+
real(wp) :: alf
986+
real(wp) :: alfgr
987+
real(wp), dimension(num_fluids) :: alpha
988+
real(wp) :: gamma
989+
real(wp) :: pi_inf
990+
real(wp) :: qv
991+
real(wp) :: c
992+
real(wp) :: M00, M10, M01, M20, M11, M02
993+
real(wp) :: varR, varV
994+
real(wp), dimension(Nb) :: nR, R, nRdot, Rdot
995+
real(wp) :: nR3
996+
real(wp) :: accel
997+
real(wp) :: int_pres
998+
real(wp) :: max_pres
999+
real(wp), dimension(2) :: Re
1000+
real(wp), dimension(6) :: tau_e
1001+
real(wp) :: G_local
1002+
real(wp) :: dyn_p, T
1003+
real(wp) :: damage_state
1004+
integer :: i, j, k, l, s, d !< Generic loop iterator
1005+
real(wp) :: nondim_time !< Non-dimensional time
1006+
real(wp) :: tmp !< Temporary variable to store quantity for mpi_allreduce
1007+
integer :: npts !< Number of included integral points
1008+
real(wp) :: rad, thickness !< For integral quantities
1009+
logical :: trigger !< For integral quantities
1010+
real(wp) :: rhoYks(1:num_species)
10161011

10171012
T = dflt_T_guess
10181013

‎src/simulation/m_global_parameters.fpp‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#:include 'case.fpp'
66
#:include 'macros.fpp'
77

8-
!> Global parameters for the computational domain, fluid properties, and simulation algorithm configuration
8+
!> @brief Global parameters for the computational domain, fluid properties, and simulation algorithm configuration
99
module m_global_parameters
1010

1111
#ifdef MFC_MPI
@@ -19,9 +19,8 @@ module m_global_parameters
1919

2020
implicit none
2121

22-
real(wp) :: wall_time = 0
23-
real(wp) :: wall_time_avg = 0
24-
22+
real(wp) :: wall_time = 0
23+
real(wp) :: wall_time_avg = 0
2524
integer :: num_procs !< Number of processors
2625
character(LEN=path_len) :: case_dir !< Case folder location
2726
logical :: run_time_info !< Run-time output flag
@@ -330,9 +329,9 @@ module m_global_parameters
330329

331330
$:GPU_DECLARE(create='[buff_size]')
332331

333-
integer :: shear_num !< Number of shear stress components
334-
integer, dimension(3) :: shear_indices !< Indices of the stress components that represent shear stress
335-
integer :: shear_BC_flip_num !< Number of shear stress components to reflect for boundary conditions
332+
integer :: shear_num !< Number of shear stress components
333+
integer, dimension(3) :: shear_indices !< Indices of the stress components that represent shear stress
334+
integer :: shear_BC_flip_num !< Number of shear stress components to reflect for boundary conditions
336335
integer, dimension(3, 2) :: shear_BC_flip_indices !< Shear stress BC reflection indices (1:3, 1:shear_BC_flip_num)
337336

338337
$:GPU_DECLARE(create='[shear_num, shear_indices, shear_BC_flip_num, shear_BC_flip_indices]')
@@ -345,9 +344,8 @@ module m_global_parameters
345344

346345
! Subgrid Bubble Parameters
347346
type(subgrid_bubble_physical_parameters) :: bub_pp
348-
349-
integer :: fd_order !< Finite-difference order for CoM and flow probe derivatives
350-
integer :: fd_number !< FD half-stencil size: MAX(1, fd_order/2)
347+
integer :: fd_order !< Finite-difference order for CoM and flow probe derivatives
348+
integer :: fd_number !< FD half-stencil size: MAX(1, fd_order/2)
351349
$:GPU_DECLARE(create='[fd_order, fd_number]')
352350

353351
logical :: probe_wrt

0 commit comments

Comments
 (0)