Skip to content

Commit fc85a76

Browse files
authored
Removal of ! ------ (#486)
1 parent 7827d8f commit fc85a76

35 files changed

+462
-460
lines changed

src/common/m_helper.fpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ contains
104104
105105
end if
106106
107-
end subroutine s_compute_finite_difference_coefficients ! --------------
107+
end subroutine s_compute_finite_difference_coefficients
108108
109109
!> Computes the bubble number density n from the primitive variables
110110
!! @param vftmp is the void fraction

src/common/m_mpi_common.fpp

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ contains
3030
!> The subroutine initializes the MPI execution environment
3131
!! and queries both the number of processors which will be
3232
!! available for the job and the local processor rank.
33-
subroutine s_mpi_initialize ! ----------------------------------------
33+
subroutine s_mpi_initialize
3434
3535
#ifndef MFC_MPI
3636
@@ -58,9 +58,11 @@ contains
5858
5959
#endif
6060
61-
end subroutine s_mpi_initialize ! --------------------------------------
61+
end subroutine s_mpi_initialize
6262
63-
subroutine s_initialize_mpi_data(q_cons_vf, ib_markers) ! --------------------------
63+
!! @param q_cons_vf Conservative variables
64+
!! @param ib_markers track if a cell is within the immersed boundary
65+
subroutine s_initialize_mpi_data(q_cons_vf, ib_markers)
6466
6567
type(scalar_field), &
6668
dimension(sys_size), &
@@ -188,7 +190,7 @@ contains
188190
189191
#endif
190192
191-
end subroutine s_initialize_mpi_data ! ---------------------------------
193+
end subroutine s_initialize_mpi_data
192194
193195
subroutine mpi_bcast_time_step_values(proc_time, time_avg)
194196
@@ -217,7 +219,7 @@ contains
217219
!! @param icfl_max_glb Global maximum ICFL stability criterion
218220
!! @param vcfl_max_glb Global maximum VCFL stability criterion
219221
!! @param Rc_min_glb Global minimum Rc stability criterion
220-
subroutine s_mpi_reduce_stability_criteria_extrema(icfl_max_loc, & ! --
222+
subroutine s_mpi_reduce_stability_criteria_extrema(icfl_max_loc, &
221223
vcfl_max_loc, &
222224
ccfl_max_loc, &
223225
Rc_min_loc, &
@@ -257,7 +259,7 @@ contains
257259
#endif
258260
#endif
259261
260-
end subroutine s_mpi_reduce_stability_criteria_extrema ! ---------------
262+
end subroutine s_mpi_reduce_stability_criteria_extrema
261263
262264
!> The following subroutine takes the input local variable
263265
!! from all processors and reduces to the sum of all
@@ -266,7 +268,7 @@ contains
266268
!! @param var_loc Some variable containing the local value which should be
267269
!! reduced amongst all the processors in the communicator.
268270
!! @param var_glb The globally reduced value
269-
subroutine s_mpi_allreduce_sum(var_loc, var_glb) ! ---------------------
271+
subroutine s_mpi_allreduce_sum(var_loc, var_glb)
270272
271273
real(kind(0d0)), intent(in) :: var_loc
272274
real(kind(0d0)), intent(out) :: var_glb
@@ -279,7 +281,7 @@ contains
279281
280282
#endif
281283
282-
end subroutine s_mpi_allreduce_sum ! -----------------------------------
284+
end subroutine s_mpi_allreduce_sum
283285
284286
!> The following subroutine takes the input local variable
285287
!! from all processors and reduces to the minimum of all
@@ -288,7 +290,7 @@ contains
288290
!! @param var_loc Some variable containing the local value which should be
289291
!! reduced amongst all the processors in the communicator.
290292
!! @param var_glb The globally reduced value
291-
subroutine s_mpi_allreduce_min(var_loc, var_glb) ! ---------------------
293+
subroutine s_mpi_allreduce_min(var_loc, var_glb)
292294
293295
real(kind(0d0)), intent(in) :: var_loc
294296
real(kind(0d0)), intent(out) :: var_glb
@@ -301,7 +303,7 @@ contains
301303
302304
#endif
303305
304-
end subroutine s_mpi_allreduce_min ! -----------------------------------
306+
end subroutine s_mpi_allreduce_min
305307
306308
!> The following subroutine takes the input local variable
307309
!! from all processors and reduces to the maximum of all
@@ -310,7 +312,7 @@ contains
310312
!! @param var_loc Some variable containing the local value which should be
311313
!! reduced amongst all the processors in the communicator.
312314
!! @param var_glb The globally reduced value
313-
subroutine s_mpi_allreduce_max(var_loc, var_glb) ! ---------------------
315+
subroutine s_mpi_allreduce_max(var_loc, var_glb)
314316
315317
real(kind(0d0)), intent(in) :: var_loc
316318
real(kind(0d0)), intent(out) :: var_glb
@@ -323,15 +325,15 @@ contains
323325
324326
#endif
325327
326-
end subroutine s_mpi_allreduce_max ! -----------------------------------
328+
end subroutine s_mpi_allreduce_max
327329
328330
!> The following subroutine takes the inputted variable and
329331
!! determines its minimum value on the entire computational
330332
!! domain. The result is stored back into inputted variable.
331333
!! @param var_loc holds the local value to be reduced among
332334
!! all the processors in communicator. On output, the variable holds
333335
!! the minimum value, reduced amongst all of the local values.
334-
subroutine s_mpi_reduce_min(var_loc) ! ---------------------------------
336+
subroutine s_mpi_reduce_min(var_loc)
335337
336338
real(kind(0d0)), intent(inout) :: var_loc
337339
@@ -352,7 +354,7 @@ contains
352354
353355
#endif
354356
355-
end subroutine s_mpi_reduce_min ! --------------------------------------
357+
end subroutine s_mpi_reduce_min
356358
357359
!> The following subroutine takes the first element of the
358360
!! 2-element inputted variable and determines its maximum
@@ -366,7 +368,7 @@ contains
366368
!! On output, this variable holds the maximum value, reduced amongst
367369
!! all of the local values, and the process rank to which the value
368370
!! belongs.
369-
subroutine s_mpi_reduce_maxloc(var_loc) ! ------------------------------
371+
subroutine s_mpi_reduce_maxloc(var_loc)
370372
371373
real(kind(0d0)), dimension(2), intent(inout) :: var_loc
372374
@@ -388,10 +390,11 @@ contains
388390
389391
#endif
390392
391-
end subroutine s_mpi_reduce_maxloc ! -----------------------------------
393+
end subroutine s_mpi_reduce_maxloc
392394
393395
!> The subroutine terminates the MPI execution environment.
394-
subroutine s_mpi_abort(prnt) ! ---------------------------------------------
396+
!! @param prnt error message to be printed
397+
subroutine s_mpi_abort(prnt)
395398
396399
character(len=*), intent(in), optional :: prnt
397400
@@ -412,10 +415,10 @@ contains
412415
413416
#endif
414417
415-
end subroutine s_mpi_abort ! -------------------------------------------
418+
end subroutine s_mpi_abort
416419
417420
!>Halts all processes until all have reached barrier.
418-
subroutine s_mpi_barrier ! -------------------------------------------
421+
subroutine s_mpi_barrier
419422
420423
#ifdef MFC_MPI
421424
@@ -424,10 +427,10 @@ contains
424427
425428
#endif
426429
427-
end subroutine s_mpi_barrier ! -----------------------------------------
430+
end subroutine s_mpi_barrier
428431
429432
!> The subroutine finalizes the MPI execution environment.
430-
subroutine s_mpi_finalize ! ------------------------------------------
433+
subroutine s_mpi_finalize
431434
432435
#ifdef MFC_MPI
433436
@@ -436,6 +439,6 @@ contains
436439
437440
#endif
438441
439-
end subroutine s_mpi_finalize ! ----------------------------------------
442+
end subroutine s_mpi_finalize
440443
441444
end module m_mpi_common

src/common/m_phase_change.fpp

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,19 @@ module m_phase_change
2828

2929
implicit none
3030

31-
private; public :: s_initialize_phasechange_module, &
32-
s_relaxation_solver, &
33-
s_infinite_relaxation_k, &
34-
s_finalize_relaxation_solver_module
31+
private;
32+
public :: s_initialize_phasechange_module, &
33+
s_relaxation_solver, &
34+
s_infinite_relaxation_k, &
35+
s_finalize_relaxation_solver_module
3536

3637
!> @name Abstract interface for creating function pointers
3738
!> @{
3839
abstract interface
3940

4041
!> @name Abstract subroutine for the infinite relaxation solver
4142
!> @{
42-
subroutine s_abstract_relaxation_solver(q_cons_vf) ! -------
43+
subroutine s_abstract_relaxation_solver(q_cons_vf)
4344
import :: scalar_field, sys_size
4445
type(scalar_field), dimension(sys_size), intent(inout) :: q_cons_vf
4546
end subroutine
@@ -86,14 +87,14 @@ contains
8687
D = ((gs_min(lp) - 1.0d0)*cvs(lp)) &
8788
/((gs_min(vp) - 1.0d0)*cvs(vp))
8889

89-
end subroutine s_initialize_phasechange_module !-------------------------------
90+
end subroutine s_initialize_phasechange_module
9091

9192
!> This subroutine is created to activate either the pT- (N fluids) or the
9293
!! pTg-equilibrium (2 fluids for g-equilibrium)
9394
!! model, also considering mass depletion, depending on the incoming
9495
!! state conditions.
9596
!! @param q_cons_vf Cell-average conservative variables
96-
subroutine s_infinite_relaxation_k(q_cons_vf) ! ----------------
97+
subroutine s_infinite_relaxation_k(q_cons_vf)
9798

9899
type(scalar_field), dimension(sys_size), intent(inout) :: q_cons_vf
99100
real(kind(0.0d0)) :: pS, pSOV, pSSL !< equilibrium pressure for mixture, overheated vapor, and subcooled liquid
@@ -283,7 +284,7 @@ contains
283284
end do
284285
end do
285286

286-
end subroutine s_infinite_relaxation_k ! ----------------
287+
end subroutine s_infinite_relaxation_k
287288

288289
!> This auxiliary subroutine is created to activate the pT-equilibrium for N fluids
289290
!! @param j generic loop iterator for x direction
@@ -387,7 +388,7 @@ contains
387388
! common temperature
388389
TS = (rhoe + pS - mQ)/mCP
389390

390-
end subroutine s_infinite_pt_relaxation_k ! -----------------------
391+
end subroutine s_infinite_pt_relaxation_k
391392

392393
!> This auxiliary subroutine is created to activate the pTg-equilibrium for N fluids under pT
393394
!! and 2 fluids under pTg-equilibrium. There is a final common p and T during relaxation
@@ -510,7 +511,7 @@ contains
510511
511512
! common temperature
512513
TS = (rhoe + pS - mQ)/mCP
513-
end subroutine s_infinite_ptg_relaxation_k ! -----------------------
514+
end subroutine s_infinite_ptg_relaxation_k
514515
515516
!> This auxiliary subroutine corrects the partial densities of the REACTING fluids in case one of them is negative
516517
!! but their sum is positive. Inert phases are not corrected at this moment
@@ -782,7 +783,7 @@ contains
782783
end subroutine s_TSat
783784

784785
!> This subroutine finalizes the phase change module
785-
subroutine s_finalize_relaxation_solver_module()
786+
subroutine s_finalize_relaxation_solver_module
786787
end subroutine
787788

788789
#endif

src/common/m_variables_conversion.fpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ contains
216216
qv_sf(i, j, k) = qv
217217
#endif
218218

219-
end subroutine s_convert_mixture_to_mixture_variables ! ----------------
219+
end subroutine s_convert_mixture_to_mixture_variables
220220

221221
!> This procedure is used alongside with the gamma/pi_inf
222222
!! model to transfer the density, the specific heat ratio
@@ -341,7 +341,7 @@ contains
341341
qv_sf(j, k, l) = qv
342342
#endif
343343

344-
end subroutine s_convert_species_to_mixture_variables_bubbles ! ----------------
344+
end subroutine s_convert_species_to_mixture_variables_bubbles
345345

346346
!> This subroutine is designed for the volume fraction model
347347
!! and provided a set of either conservative or primitive
@@ -440,7 +440,7 @@ contains
440440
qv_sf(k, l, r) = qv
441441
#endif
442442

443-
end subroutine s_convert_species_to_mixture_variables ! ----------------
443+
end subroutine s_convert_species_to_mixture_variables
444444

445445
subroutine s_convert_species_to_mixture_variables_acc(rho_K, &
446446
gamma_K, pi_inf_K, qv_K, &
@@ -523,7 +523,7 @@ contains
523523
end if
524524
#endif
525525

526-
end subroutine s_convert_species_to_mixture_variables_acc ! ----------------
526+
end subroutine s_convert_species_to_mixture_variables_acc
527527

528528
subroutine s_convert_species_to_mixture_variables_bubbles_acc(rho_K, &
529529
gamma_K, pi_inf_K, qv_K, &
@@ -596,7 +596,7 @@ contains
596596
!> The computation of parameters, the allocation of memory,
597597
!! the association of pointers and/or the execution of any
598598
!! other procedures that are necessary to setup the module.
599-
subroutine s_initialize_variables_conversion_module ! ----------------
599+
subroutine s_initialize_variables_conversion_module
600600

601601
integer :: i, j
602602

@@ -752,7 +752,7 @@ contains
752752
s_convert_to_mixture_variables => &
753753
s_convert_species_to_mixture_variables
754754
end if
755-
end subroutine s_initialize_variables_conversion_module ! --------------
755+
end subroutine s_initialize_variables_conversion_module
756756

757757
!Initialize mv at the quadrature nodes based on the initialized moments and sigma
758758
subroutine s_initialize_mv(qK_cons_vf, mv)
@@ -1014,7 +1014,7 @@ contains
10141014
end do
10151015
!$acc end parallel loop
10161016

1017-
end subroutine s_convert_conservative_to_primitive_variables ! ---------
1017+
end subroutine s_convert_conservative_to_primitive_variables
10181018

10191019
!> The following procedure handles the conversion between
10201020
!! the primitive variables and the conservative variables.
@@ -1175,7 +1175,7 @@ contains
11751175
end if
11761176
#endif
11771177

1178-
end subroutine s_convert_primitive_to_conservative_variables ! ---------
1178+
end subroutine s_convert_primitive_to_conservative_variables
11791179

11801180
!> The following subroutine handles the conversion between
11811181
!! the primitive variables and the Eulerian flux variables.
@@ -1185,7 +1185,7 @@ contains
11851185
!! @param ix Index bounds in the first coordinate direction
11861186
!! @param iy Index bounds in the second coordinate direction
11871187
!! @param iz Index bounds in the third coordinate direction
1188-
subroutine s_convert_primitive_to_flux_variables(qK_prim_vf, & ! ------
1188+
subroutine s_convert_primitive_to_flux_variables(qK_prim_vf, &
11891189
FK_vf, &
11901190
FK_src_vf, &
11911191
is1, is2, is3, s2b, s3b)
@@ -1309,9 +1309,9 @@ contains
13091309
end do
13101310
#endif
13111311

1312-
end subroutine s_convert_primitive_to_flux_variables ! -----------------
1312+
end subroutine s_convert_primitive_to_flux_variables
13131313

1314-
subroutine s_finalize_variables_conversion_module ! ------------------
1314+
subroutine s_finalize_variables_conversion_module
13151315

13161316
! Deallocating the density, the specific heat ratio function and the
13171317
! liquid stiffness function
@@ -1335,6 +1335,6 @@ contains
13351335
! computing the mixture/species variables to the mixture variables
13361336
s_convert_to_mixture_variables => null()
13371337

1338-
end subroutine s_finalize_variables_conversion_module ! ----------------
1338+
end subroutine s_finalize_variables_conversion_module
13391339

13401340
end module m_variables_conversion

0 commit comments

Comments
 (0)