Skip to content

Commit ac005a4

Browse files
sbryngelsonsbryngelson
committed
remove more junk!
1 parent 48cca0d commit ac005a4

18 files changed

+96
-92
lines changed

‎.github/workflows/lint-source.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,7 @@ jobs:
3838
run: |
3939
! grep -iR 'double_precision\|dsqrt\|dexp\|dlog\|dble\|dabs\|double\ precision\|real(8)\|real(4)\|dprod\|dmin\|dmax\|dfloat\|dreal\|dcos\|dsin\|dtan\|dsign\|dtanh\|dsinh\|dcosh\|d0' --exclude-dir=syscheck --exclude="*nvtx*" --exclude="*precision_select*" ./src/*
4040
41+
- name: Looking for junk code
42+
run: |
43+
! grep -iR -e '\.\.\.' -e '\-\-\-' -e '===' ./src/*
44+

‎src/common/m_checker_common.fpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -339,11 +339,11 @@ contains
339339
if (any((/bc_${X}$%${VB2}$, bc_${X}$%${VB3}$/) /= 0._wp)) then
340340
call s_mpi_abort("bc_${X}$%beg must be -15 if "// &
341341
"bc_${X}$%${VB2}$ or bc_${X}$%${VB3}$ "// &
342-
"is set. Exiting ...")
342+
"is set. Exiting.")
343343
end if
344344
elseif (bc_${X}$%beg /= -16) then
345345
call s_mpi_abort("bc_${X}$%beg must be -15 or -16 if "// &
346-
"bc_${X}$%vb[1,2,3] is set. Exiting ...")
346+
"bc_${X}$%vb[1,2,3] is set. Exiting.")
347347
end if
348348
end if
349349
#:endfor
@@ -354,11 +354,11 @@ contains
354354
if (any((/bc_${X}$%${VE2}$, bc_${X}$%${VE3}$/) /= 0._wp)) then
355355
call s_mpi_abort("bc_${X}$%end must be -15 if "// &
356356
"bc_${X}$%${VE2}$ or bc_${X}$%${VE3}$ "// &
357-
"is set. Exiting ...")
357+
"is set. Exiting.")
358358
end if
359359
elseif (bc_${X}$%end /= -16) then
360360
call s_mpi_abort("bc_${X}$%end must be -15 or -16 if "// &
361-
"bc_${X}$%ve[1,2,3] is set. Exiting ...")
361+
"bc_${X}$%ve[1,2,3] is set. Exiting.")
362362
end if
363363
end if
364364
#:endfor

‎src/common/m_mpi_common.fpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ contains
4444
4545
! Checking whether the MPI environment has been properly initialized
4646
if (ierr /= MPI_SUCCESS) then
47-
print '(A)', 'Unable to initialize MPI environment. Exiting ...'
47+
print '(A)', 'Unable to initialize MPI environment. Exiting.'
4848
call MPI_ABORT(MPI_COMM_WORLD, 1, ierr)
4949
end if
5050

‎src/common/m_variables_conversion.fpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1239,7 +1239,7 @@ contains
12391239
if (proc_rank == 0) then
12401240
call s_mpi_abort('Conversion from primitive to '// &
12411241
'conservative variables not '// &
1242-
'implemented. Exiting ...')
1242+
'implemented. Exiting.')
12431243
end if
12441244
#endif
12451245
end subroutine s_convert_primitive_to_conservative_variables

‎src/post_process/m_checker.fpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ contains
141141
(/rho_wrt, E_wrt, pres_wrt, gamma_wrt, heat_ratio_wrt, pi_inf_wrt, &
142142
pres_inf_wrt, cons_vars_wrt, prim_vars_wrt, c_wrt, schlieren_wrt/), &
143143
alpha_rho_wrt, mom_wrt, vel_wrt, flux_wrt, alpha_wrt, omega_wrt]), &
144-
"None of the flow variables have been selected for post-process. Exiting ...")
144+
"None of the flow variables have been selected for post-process. Exiting.")
145145
end subroutine s_check_inputs_no_flow_variables
146146

147147
end module m_checker

‎src/post_process/m_data_input.f90‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -112,15 +112,15 @@ subroutine s_read_serial_data_files(t_step)
112112
! If the time-step directory is missing, the post-process exits.
113113
if (dir_check .neqv. .true.) then
114114
call s_mpi_abort('Time-step folder '//trim(t_step_dir)// &
115-
' is missing. Exiting ...')
115+
' is missing. Exiting.')
116116
end if
117117

118118
call my_inquire(file_loc_ib, dir_check)
119119

120120
! If the time-step directory is missing, the post-process exits.
121121
if (dir_check .neqv. .true.) then
122122
call s_mpi_abort('Time-step folder '//trim(t_step_ib_dir)// &
123-
' is missing. Exiting ...')
123+
' is missing. Exiting.')
124124
end if
125125

126126
! Reading the Grid Data File for the x-direction
@@ -137,7 +137,7 @@ subroutine s_read_serial_data_files(t_step)
137137
close (1)
138138
else
139139
call s_mpi_abort('File x_cb.dat is missing in '// &
140-
trim(t_step_dir)//'. Exiting ...')
140+
trim(t_step_dir)//'. Exiting.')
141141
end if
142142

143143
! Computing the cell-width distribution
@@ -161,7 +161,7 @@ subroutine s_read_serial_data_files(t_step)
161161
close (1)
162162
else
163163
call s_mpi_abort('File y_cb.dat is missing in '// &
164-
trim(t_step_dir)//'. Exiting ...')
164+
trim(t_step_dir)//'. Exiting.')
165165
end if
166166

167167
! Computing the cell-width distribution
@@ -185,7 +185,7 @@ subroutine s_read_serial_data_files(t_step)
185185
close (1)
186186
else
187187
call s_mpi_abort('File z_cb.dat is missing in '// &
188-
trim(t_step_dir)//'. Exiting ...')
188+
trim(t_step_dir)//'. Exiting.')
189189
end if
190190

191191
! Computing the cell-width distribution
@@ -217,7 +217,7 @@ subroutine s_read_serial_data_files(t_step)
217217
else
218218
call s_mpi_abort('File q_cons_vf'//trim(file_num)// &
219219
'.dat is missing in '//trim(t_step_dir)// &
220-
'. Exiting ...')
220+
'. Exiting.')
221221
end if
222222

223223
end do
@@ -232,7 +232,7 @@ subroutine s_read_serial_data_files(t_step)
232232
ACTION='read', &
233233
STATUS='old')
234234
else
235-
call s_mpi_abort('File '//trim(file_loc_ib)//' is missing. Exiting ...')
235+
call s_mpi_abort('File '//trim(file_loc_ib)//' is missing. Exiting.')
236236
end if
237237
end if
238238

@@ -254,7 +254,7 @@ subroutine s_read_serial_data_files(t_step)
254254
else
255255
print '(A)', 'File q_cons_vf'//trim(file_num)// &
256256
'.dat is missing in '//trim(t_step_dir)// &
257-
'. Exiting ...'
257+
'. Exiting.'
258258
call s_mpi_abort()
259259
end if
260260
end if
@@ -312,7 +312,7 @@ subroutine s_read_parallel_data_files(t_step)
312312
call MPI_FILE_READ(ifile, x_cb_glb, data_size, mpi_p, status, ierr)
313313
call MPI_FILE_CLOSE(ifile, ierr)
314314
else
315-
call s_mpi_abort('File '//trim(file_loc)//' is missing. Exiting...')
315+
call s_mpi_abort('File '//trim(file_loc)//' is missing. Exiting.')
316316
end if
317317

318318
! Assigning local cell boundary locations
@@ -333,7 +333,7 @@ subroutine s_read_parallel_data_files(t_step)
333333
call MPI_FILE_READ(ifile, y_cb_glb, data_size, mpi_p, status, ierr)
334334
call MPI_FILE_CLOSE(ifile, ierr)
335335
else
336-
call s_mpi_abort('File '//trim(file_loc)//' is missing. Exiting...')
336+
call s_mpi_abort('File '//trim(file_loc)//' is missing. Exiting.')
337337
end if
338338

339339
! Assigning local cell boundary locations
@@ -354,7 +354,7 @@ subroutine s_read_parallel_data_files(t_step)
354354
call MPI_FILE_READ(ifile, z_cb_glb, data_size, mpi_p, status, ierr)
355355
call MPI_FILE_CLOSE(ifile, ierr)
356356
else
357-
call s_mpi_abort('File '//trim(file_loc)//' is missing. Exiting...')
357+
call s_mpi_abort('File '//trim(file_loc)//' is missing. Exiting.')
358358
end if
359359

360360
! Assigning local cell boundary locations
@@ -434,12 +434,12 @@ subroutine s_read_parallel_data_files(t_step)
434434
MPI_INTEGER, status, ierr)
435435

436436
else
437-
call s_mpi_abort('File '//trim(file_loc)//' is missing. Exiting...')
437+
call s_mpi_abort('File '//trim(file_loc)//' is missing. Exiting.')
438438
end if
439439

440440
end if
441441
else
442-
call s_mpi_abort('File '//trim(file_loc)//' is missing. Exiting...')
442+
call s_mpi_abort('File '//trim(file_loc)//' is missing. Exiting.')
443443
end if
444444
else
445445
! Open the file to read conservative variables
@@ -532,11 +532,11 @@ subroutine s_read_parallel_data_files(t_step)
532532
MPI_INTEGER, status, ierr)
533533

534534
else
535-
call s_mpi_abort('File '//trim(file_loc)//' is missing. Exiting...')
535+
call s_mpi_abort('File '//trim(file_loc)//' is missing. Exiting.')
536536
end if
537537
end if
538538
else
539-
call s_mpi_abort('File '//trim(file_loc)//' is missing. Exiting...')
539+
call s_mpi_abort('File '//trim(file_loc)//' is missing. Exiting.')
540540
end if
541541
end if
542542

‎src/post_process/m_data_output.fpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ contains
500500
if (dbfile == -1) then
501501
call s_mpi_abort('Unable to create Silo-HDF5 database '// &
502502
'slave file '//trim(file_loc)//'. '// &
503-
'Exiting ...')
503+
'Exiting.')
504504
end if
505505
506506
! Next, analogous steps to the ones above are carried out by the
@@ -518,7 +518,7 @@ contains
518518
if (dbroot == -1) then
519519
call s_mpi_abort('Unable to create Silo-HDF5 database '// &
520520
'master file '//trim(file_loc)//'. '// &
521-
'Exiting ...')
521+
'Exiting.')
522522
end if
523523
524524
end if
@@ -542,7 +542,7 @@ contains
542542
! is not the case, the post-process exits.
543543
if (err /= 0) then
544544
call s_mpi_abort('Unable to create Binary database slave '// &
545-
'file '//trim(file_loc)//'. Exiting ...')
545+
'file '//trim(file_loc)//'. Exiting.')
546546
end if
547547
548548
! Further defining the structure of the formatted database slave
@@ -572,7 +572,7 @@ contains
572572
if (err /= 0) then
573573
call s_mpi_abort('Unable to create Binary database '// &
574574
'master file '//trim(file_loc)// &
575-
'. Exiting ...')
575+
'. Exiting.')
576576
end if
577577
578578
if (output_partial_domain) then
@@ -1124,7 +1124,7 @@ contains
11241124
close (9)
11251125
end if
11261126
else
1127-
print '(A)', trim(file_loc)//' is missing. Exiting ...'
1127+
print '(A)', trim(file_loc)//' is missing. Exiting.'
11281128
call s_mpi_abort
11291129
end if
11301130

‎src/post_process/m_mpi_proxy.fpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ contains
364364
if (proc_rank == 0 .and. ierr == -1) then
365365
print '(A)', 'Unable to decompose computational '// &
366366
'domain for selected number of '// &
367-
'processors. Exiting ...'
367+
'processors. Exiting.'
368368
call MPI_ABORT(MPI_COMM_WORLD, 1, ierr)
369369
end if
370370
@@ -484,7 +484,7 @@ contains
484484
if (proc_rank == 0 .and. ierr == -1) then
485485
print '(A)', 'Unable to decompose computational '// &
486486
'domain for selected number of '// &
487-
'processors. Exiting ...'
487+
'processors. Exiting.'
488488
call MPI_ABORT(MPI_COMM_WORLD, 1, ierr)
489489
end if
490490

‎src/post_process/m_start_up.f90‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ subroutine s_read_input_file
102102
read (1, fmt='(A)') line
103103
print *, 'Invalid line in namelist: '//trim(line)
104104
call s_mpi_abort('Invalid line in post_process.inp. It is '// &
105-
'likely due to a datatype mismatch. Exiting ...')
105+
'likely due to a datatype mismatch. Exiting.')
106106
end if
107107

108108
close (1)
@@ -116,7 +116,7 @@ subroutine s_read_input_file
116116
if (cfl_adap_dt .or. cfl_const_dt .or. rkck_adap_dt) cfl_dt = .true.
117117

118118
else
119-
call s_mpi_abort('File post_process.inp is missing. Exiting ...')
119+
call s_mpi_abort('File post_process.inp is missing. Exiting.')
120120
end if
121121

122122
end subroutine s_read_input_file
@@ -143,7 +143,7 @@ subroutine s_check_input_file
143143
! Constraint on the location of the case directory
144144
if (dir_check .neqv. .true.) then
145145
call s_mpi_abort('Unsupported choice for the value of '// &
146-
'case_dir. Exiting ...')
146+
'case_dir. Exiting.')
147147
end if
148148

149149
call s_check_inputs_common()

‎src/pre_process/m_check_patches.fpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ contains
6060
elseif (patch_icpp(i)%geometry == 6) then
6161
call s_mpi_abort('geometry 6 (formerly "Vortex")'// &
6262
'is no longer supported for patch '//trim(iStr)// &
63-
'. Exiting ...')
63+
'. Exiting.')
6464
elseif (patch_icpp(i)%geometry == 7) then
6565
call s_check_2D_analytical_patch_geometry(i)
6666
elseif (patch_icpp(i)%geometry == 8) then

0 commit comments

Comments
 (0)