Skip to content

Commit 023a5b4

Browse files
committed
Apply ffmt: remove blank lines after #else/#elif continuations
1 parent 91eabae commit 023a5b4

20 files changed

Lines changed: 0 additions & 55 deletions

src/common/include/3dHardcodedIC.fpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@
140140

141141
q_prim_vf(E_idx)%sf(i, j, k) = p_th*rcut*xcut + p_am
142142
case (303) ! 3D Multijet
143-
144143
eps_smooth = 3.0_wp
145144
ux_th = 10*sqrt(1.4*0.4)
146145
ux_am = 2.5*sqrt(1.4*0.4)

src/common/m_mpi_common.fpp

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,6 @@ contains
334334
call MPI_REDUCE(Rc_min_loc, Rc_min_glb, 1, mpi_p, MPI_MIN, 0, MPI_COMM_WORLD, ierr)
335335
end if
336336
#else
337-
338337
icfl_max_glb = icfl_max_loc
339338

340339
if (viscous) then
@@ -1046,7 +1045,6 @@ contains
10461045
end if
10471046
end do
10481047
else
1049-
10501048
if (cyl_coord .and. p > 0) then
10511049
! Implement pencil processor blocking if using cylindrical coordinates so that all cells in azimuthal
10521050
! direction are stored on a single processor. This is necessary for efficient application of Fourier filter
@@ -1080,7 +1078,6 @@ contains
10801078
end if
10811079
end do
10821080
else
1083-
10841081
! Initial estimate of optimal processor topology
10851082
num_procs_x = 1
10861083
num_procs_y = 1
@@ -1206,7 +1203,6 @@ contains
12061203

12071204
! 2D Cartesian Processor Topology
12081205
else
1209-
12101206
! Initial estimate of optimal processor topology
12111207
num_procs_x = 1
12121208
num_procs_y = num_procs
@@ -1320,7 +1316,6 @@ contains
13201316

13211317
! 1D Cartesian Processor Topology
13221318
else
1323-
13241319
! Optimal processor topology
13251320
num_procs_x = num_procs
13261321

@@ -1428,20 +1423,17 @@ contains
14281423
call MPI_SENDRECV(dx(m - buff_size + 1), buff_size, mpi_p, bc_x%end, 0, dx(-buff_size), buff_size, mpi_p, &
14291424
& bc_x%beg, 0, MPI_COMM_WORLD, MPI_STATUS_IGNORE, ierr)
14301425
else ! PBC at the beginning only
1431-
14321426
! Send/receive buffer to/from bc_x%beg/bc_x%beg
14331427
call MPI_SENDRECV(dx(0), buff_size, mpi_p, bc_x%beg, 1, dx(-buff_size), buff_size, mpi_p, bc_x%beg, 0, &
14341428
& MPI_COMM_WORLD, MPI_STATUS_IGNORE, ierr)
14351429
end if
14361430
else ! PBC at the end
1437-
14381431
if (bc_x%beg >= 0) then ! PBC at the end and beginning
14391432

14401433
! Send/receive buffer to/from bc_x%beg/bc_x%end
14411434
call MPI_SENDRECV(dx(0), buff_size, mpi_p, bc_x%beg, 1, dx(m + 1), buff_size, mpi_p, bc_x%end, 1, &
14421435
& MPI_COMM_WORLD, MPI_STATUS_IGNORE, ierr)
14431436
else ! PBC at the end only
1444-
14451437
! Send/receive buffer to/from bc_x%end/bc_x%end
14461438
call MPI_SENDRECV(dx(m - buff_size + 1), buff_size, mpi_p, bc_x%end, 0, dx(m + 1), buff_size, mpi_p, &
14471439
& bc_x%end, 1, MPI_COMM_WORLD, MPI_STATUS_IGNORE, ierr)
@@ -1459,20 +1451,17 @@ contains
14591451
call MPI_SENDRECV(dy(n - buff_size + 1), buff_size, mpi_p, bc_y%end, 0, dy(-buff_size), buff_size, mpi_p, &
14601452
& bc_y%beg, 0, MPI_COMM_WORLD, MPI_STATUS_IGNORE, ierr)
14611453
else ! PBC at the beginning only
1462-
14631454
! Send/receive buffer to/from bc_y%beg/bc_y%beg
14641455
call MPI_SENDRECV(dy(0), buff_size, mpi_p, bc_y%beg, 1, dy(-buff_size), buff_size, mpi_p, bc_y%beg, 0, &
14651456
& MPI_COMM_WORLD, MPI_STATUS_IGNORE, ierr)
14661457
end if
14671458
else ! PBC at the end
1468-
14691459
if (bc_y%beg >= 0) then ! PBC at the end and beginning
14701460

14711461
! Send/receive buffer to/from bc_y%beg/bc_y%end
14721462
call MPI_SENDRECV(dy(0), buff_size, mpi_p, bc_y%beg, 1, dy(n + 1), buff_size, mpi_p, bc_y%end, 1, &
14731463
& MPI_COMM_WORLD, MPI_STATUS_IGNORE, ierr)
14741464
else ! PBC at the end only
1475-
14761465
! Send/receive buffer to/from bc_y%end/bc_y%end
14771466
call MPI_SENDRECV(dy(n - buff_size + 1), buff_size, mpi_p, bc_y%end, 0, dy(n + 1), buff_size, mpi_p, &
14781467
& bc_y%end, 1, MPI_COMM_WORLD, MPI_STATUS_IGNORE, ierr)
@@ -1482,7 +1471,6 @@ contains
14821471

14831472
! MPI Communication in z-direction
14841473
else
1485-
14861474
if (pbc_loc == -1) then ! PBC at the beginning
14871475

14881476
if (bc_z%end >= 0) then ! PBC at the beginning and end
@@ -1491,20 +1479,17 @@ contains
14911479
call MPI_SENDRECV(dz(p - buff_size + 1), buff_size, mpi_p, bc_z%end, 0, dz(-buff_size), buff_size, mpi_p, &
14921480
& bc_z%beg, 0, MPI_COMM_WORLD, MPI_STATUS_IGNORE, ierr)
14931481
else ! PBC at the beginning only
1494-
14951482
! Send/receive buffer to/from bc_z%beg/bc_z%beg
14961483
call MPI_SENDRECV(dz(0), buff_size, mpi_p, bc_z%beg, 1, dz(-buff_size), buff_size, mpi_p, bc_z%beg, 0, &
14971484
& MPI_COMM_WORLD, MPI_STATUS_IGNORE, ierr)
14981485
end if
14991486
else ! PBC at the end
1500-
15011487
if (bc_z%beg >= 0) then ! PBC at the end and beginning
15021488

15031489
! Send/receive buffer to/from bc_z%beg/bc_z%end
15041490
call MPI_SENDRECV(dz(0), buff_size, mpi_p, bc_z%beg, 1, dz(p + 1), buff_size, mpi_p, bc_z%end, 1, &
15051491
& MPI_COMM_WORLD, MPI_STATUS_IGNORE, ierr)
15061492
else ! PBC at the end only
1507-
15081493
! Send/receive buffer to/from bc_z%end/bc_z%end
15091494
call MPI_SENDRECV(dz(p - buff_size + 1), buff_size, mpi_p, bc_z%end, 0, dz(p + 1), buff_size, mpi_p, &
15101495
& bc_z%end, 1, MPI_COMM_WORLD, MPI_STATUS_IGNORE, ierr)

src/common/m_phase_change.fpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,6 @@ contains
203203
! correcting the vapor partial density
204204
q_cons_vf(vp + contxb - 1)%sf(j, k, l) = mixM*rM
205205
else
206-
207206
! returning partial pressures to what they were from the homogeneous solver liquid
208207
q_cons_vf(lp + contxb - 1)%sf(j, k, l) = m1
209208

@@ -604,7 +603,6 @@ contains
604603
! assigning Saturation temperature
605604
TSat = 0.0_wp
606605
else
607-
608606
! calculating initial estimate for temperature in the TSat procedure. I will also use this variable to iterate over the
609607
! Newton's solver
610608
TSat = TSIn

src/common/m_variables_conversion.fpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ contains
152152
pres = (energy - 0.5_wp*(mom**2._wp)/rho - pi_inf - qv - E_e)/gamma
153153
end if
154154
#:else
155-
156155
Y_rs(:) = rhoYks(:)/rho
157156
e_Per_Kg = energy/rho
158157
Pdyn_Per_Kg = dyn_p/rho
@@ -418,7 +417,6 @@ contains
418417

419418
! Simulation is 2D
420419
else
421-
422420
allocate (rho_sf(-buff_size:m + buff_size, -buff_size:n + buff_size, 0:0))
423421
allocate (gamma_sf(-buff_size:m + buff_size, -buff_size:n + buff_size, 0:0))
424422
allocate (pi_inf_sf(-buff_size:m + buff_size, -buff_size:n + buff_size, 0:0))
@@ -427,7 +425,6 @@ contains
427425

428426
! Simulation is 1D
429427
else
430-
431428
allocate (rho_sf(-buff_size:m + buff_size, 0:0, 0:0))
432429
allocate (gamma_sf(-buff_size:m + buff_size, 0:0, 0:0))
433430
allocate (pi_inf_sf(-buff_size:m + buff_size, 0:0, 0:0))

src/post_process/m_data_output.fpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@ contains
204204
205205
! Generating Binary Directory Tree
206206
else
207-
208207
! Creating the directory associated with the local process
209208
dbdir = trim(case_dir) // '/binary'
210209
@@ -451,7 +450,6 @@ contains
451450
452451
! Binary Database Format
453452
else
454-
455453
! Generating the relative path to the formatted database slave file, that is to be opened for the current time-step,
456454
! t_step
457455
write (file_loc, '(A,I0,A)') '/', t_step, '.dat'
@@ -645,7 +643,6 @@ contains
645643
! One-dimensional local grid data is written to the formatted database slave file. In addition, the local grid data
646644
! is put together by the root process and written to the master file.
647645
else
648-
649646
if (precision == 1) then
650647
write (dbfile) real(x_cb, sp)
651648
else
@@ -805,7 +802,6 @@ contains
805802
806803
! Binary Database Format
807804
else
808-
809805
! Writing the name of the flow variable and its data, associated with the local processor, to the formatted database
810806
! slave file
811807
if (precision == 1) then

src/post_process/m_global_parameters.fpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -892,7 +892,6 @@ contains
892892
! Allocating the grid variables, only used for the 1D simulations, and containing the defragmented computational domain
893893
! grid data
894894
else
895-
896895
allocate (x_root_cb(-1:m_root))
897896
allocate (x_root_cc(0:m_root))
898897

src/post_process/m_mpi_proxy.fpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,6 @@ contains
217217
call MPI_GATHERV(maxval(y_cb), 1, mpi_p, spatial_extents(4, 0), recvcounts, 4*displs, mpi_p, 0, MPI_COMM_WORLD, ierr)
218218
! Simulation is 1D
219219
else
220-
221220
! For 1D, recvcounts/displs are sized for grid defragmentation (m+1 per rank), not for scalar gathers. Use MPI_GATHER
222221
! instead.
223222
@@ -246,7 +245,6 @@ contains
246245
247246
! Binary database format
248247
else
249-
250248
call MPI_GATHERV(x_cb(0), m + 1, mpi_p, x_root_cb(0), recvcounts, displs, mpi_p, 0, MPI_COMM_WORLD, ierr)
251249
252250
if (proc_rank == 0) x_root_cb(-1) = x_cb(-1)

src/pre_process/m_grid.f90

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ impure subroutine s_generate_serial_grid
8585
y_cb(i - 1) = y_domain%beg + dy*real(2*i - 1, wp)
8686
end do
8787
else
88-
8988
dy = (y_domain%end - y_domain%beg)/real(n + 1, wp)
9089

9190
do i = 0, n

src/pre_process/m_icpp_patches.fpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ contains
145145

146146
! 1D Patch Geometries
147147
else
148-
149148
do i = 1, num_patches
150149
if (proc_rank == 0) then
151150
print *, 'Processing patch', i

src/simulation/m_bubbles_EL.fpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,6 @@ contains
586586
gas_p(k, 1) = myPb
587587
gas_mv(k, 1) = myMass_v
588588
else
589-
590589
! Radial acceleration from bubble models
591590
intfc_dveldt(k, stage) = f_rddot(myRho, myPinf, myR, myV, myR0, myPb, myPbdot, dmalf, dmntait, dmBtait, &
592591
& dm_bub_adv_src, dm_divu, myCson)

0 commit comments

Comments
 (0)