Skip to content

Commit 721cd77

Browse files
wilfonbawilfonba
committed
abbreviate some if conditions
1 parent 8311260 commit 721cd77

File tree

1 file changed

+26
-108
lines changed

1 file changed

+26
-108
lines changed

‎src/post_process/m_data_output.fpp‎

Lines changed: 26 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -676,7 +676,6 @@ contains
676676
! database master file.
677677
if (num_procs > 1) then
678678
call s_mpi_gather_spatial_extents(spatial_extents)
679-
680679
elseif (p > 0) then
681680
if (grid_geometry == 3) then
682681
spatial_extents(:, 0) = (/minval(y_cb), minval(z_cb), &
@@ -687,13 +686,10 @@ contains
687686
minval(z_cb), maxval(x_cb), &
688687
maxval(y_cb), maxval(z_cb)/)
689688
end if
690-
691689
elseif (n > 0) then
692690
spatial_extents(:, 0) = (/minval(x_cb), minval(y_cb), &
693691
maxval(x_cb), maxval(y_cb)/)
694-
695692
else
696-
697693
spatial_extents(:, 0) = (/minval(x_cb), maxval(x_cb)/)
698694
end if
699695
@@ -1171,7 +1167,6 @@ contains
11711167
inputvals(1:20) = MPI_IO_DATA_lg_bubbles(i, 2:21)
11721168
if (id > 0) then
11731169
write (29, '(100(A))', advance='no') ''
1174-
11751170
if (lag_id_wrt) write (29, '(I6, A)', advance='no') id, ', '
11761171
if (lag_pos_wrt) write (29, '(3(E15.7, A))', advance='no') inputvals(1), ', ', inputvals(2), ', ', inputvals(3), ', '
11771172
if (lag_pos_prev_wrt) write (29, '(3(E15.7, A))', advance='no') inputvals(4), ', ', inputvals(5), ', ', inputvals(6), ', '
@@ -1359,61 +1354,23 @@ contains
13591354
px, py, pz, nBub, &
13601355
DB_DOUBLE, DB_F77NULL, ierr)
13611356
1362-
if (lag_id_wrt) then
1363-
call s_write_lag_variable_to_formatted_database_file('part_id', t_step, bub_id, nBub)
1364-
end if
1365-
1357+
if (lag_id_wrt) call s_write_lag_variable_to_formatted_database_file('part_id', t_step, bub_id, nBub)
13661358
if (lag_vel_wrt) then
13671359
call s_write_lag_variable_to_formatted_database_file('part_vel1', t_step, vx, nBub)
13681360
call s_write_lag_variable_to_formatted_database_file('part_vel2', t_step, vy, nBub)
1369-
if (p > 0) then
1370-
call s_write_lag_variable_to_formatted_database_file('part_vel3', t_step, vz, nBub)
1371-
end if
1372-
end if
1373-
1374-
if (lag_rad_wrt) then
1375-
call s_write_lag_variable_to_formatted_database_file('part_radius', t_step, radius, nBub)
1376-
end if
1377-
1378-
if (lag_rvel_wrt) then
1379-
call s_write_lag_variable_to_formatted_database_file('part_rdot', t_step, rvel, nBub)
1380-
end if
1381-
1382-
if (lag_r0_wrt) then
1383-
call s_write_lag_variable_to_formatted_database_file('part_r0', t_step, rnot, nBub)
1384-
end if
1385-
1386-
if (lag_rmax_wrt) then
1387-
call s_write_lag_variable_to_formatted_database_file('part_rmax', t_step, rmax, nBub)
1388-
end if
1389-
1390-
if (lag_rmin_wrt) then
1391-
call s_write_lag_variable_to_formatted_database_file('part_rmin', t_step, rmin, nBub)
1392-
end if
1393-
1394-
if (lag_dphidt_wrt) then
1395-
call s_write_lag_variable_to_formatted_database_file('part_dphidt', t_step, dphidt, nBub)
1396-
end if
1397-
1398-
if (lag_pres_wrt) then
1399-
call s_write_lag_variable_to_formatted_database_file('part_pressure', t_step, pressure, nBub)
1400-
end if
1401-
1402-
if (lag_mv_wrt) then
1403-
call s_write_lag_variable_to_formatted_database_file('part_mv', t_step, mv, nBub)
1404-
end if
1405-
1406-
if (lag_mg_wrt) then
1407-
call s_write_lag_variable_to_formatted_database_file('part_mg', t_step, mg, nBub)
1408-
end if
1409-
1410-
if (lag_betaT_wrt) then
1411-
call s_write_lag_variable_to_formatted_database_file('part_betaT', t_step, betaT, nBub)
1412-
end if
1413-
1414-
if (lag_betaC_wrt) then
1415-
call s_write_lag_variable_to_formatted_database_file('part_betaC', t_step, betaC, nBub)
1361+
if (p > 0) call s_write_lag_variable_to_formatted_database_file('part_vel3', t_step, vz, nBub)
14161362
end if
1363+
if (lag_rad_wrt) call s_write_lag_variable_to_formatted_database_file('part_radius', t_step, radius, nBub)
1364+
if (lag_rvel_wrt) call s_write_lag_variable_to_formatted_database_file('part_rdot', t_step, rvel, nBub)
1365+
if (lag_r0_wrt) call s_write_lag_variable_to_formatted_database_file('part_r0', t_step, rnot, nBub)
1366+
if (lag_rmax_wrt) call s_write_lag_variable_to_formatted_database_file('part_rmax', t_step, rmax, nBub)
1367+
if (lag_rmin_wrt) call s_write_lag_variable_to_formatted_database_file('part_rmin', t_step, rmin, nBub)
1368+
if (lag_dphidt_wrt) call s_write_lag_variable_to_formatted_database_file('part_dphidt', t_step, dphidt, nBub)
1369+
if (lag_pres_wrt) call s_write_lag_variable_to_formatted_database_file('part_pressure', t_step, pressure, nBub)
1370+
if (lag_mv_wrt) call s_write_lag_variable_to_formatted_database_file('part_mv', t_step, mv, nBub)
1371+
if (lag_mg_wrt) call s_write_lag_variable_to_formatted_database_file('part_mg', t_step, mg, nBub)
1372+
if (lag_betaT_wrt) call s_write_lag_variable_to_formatted_database_file('part_betaT', t_step, betaT, nBub)
1373+
if (lag_betaC_wrt) call s_write_lag_variable_to_formatted_database_file('part_betaC', t_step, betaC, nBub)
14171374
14181375
deallocate (bub_id, px, py, pz, ppx, ppy, ppz, vx, vy, vz, radius, &
14191376
rvel, rnot, rmax, rmin, dphidt, pressure, mv, mg, &
@@ -1455,62 +1412,23 @@ contains
14551412
dummy_data, dummy_data, dummy_data, 0, &
14561413
DB_DOUBLE, DB_F77NULL, ierr)
14571414
1458-
if (lag_id_wrt) then
1459-
call s_write_lag_variable_to_formatted_database_file('part_id', t_step)
1460-
end if
1461-
1415+
if (lag_id_wrt) call s_write_lag_variable_to_formatted_database_file('part_id', t_step)
14621416
if (lag_vel_wrt) then
14631417
call s_write_lag_variable_to_formatted_database_file('part_vel1', t_step)
14641418
call s_write_lag_variable_to_formatted_database_file('part_vel2', t_step)
1465-
if (p > 0) then
1466-
call s_write_lag_variable_to_formatted_database_file('part_vel3', t_step)
1467-
end if
1468-
end if
1469-
1470-
if (lag_rad_wrt) then
1471-
call s_write_lag_variable_to_formatted_database_file('part_radius', t_step)
1472-
end if
1473-
1474-
if (lag_rvel_wrt) then
1475-
call s_write_lag_variable_to_formatted_database_file('part_rdot', t_step)
1476-
end if
1477-
1478-
if (lag_r0_wrt) then
1479-
call s_write_lag_variable_to_formatted_database_file('part_r0', t_step)
1480-
end if
1481-
1482-
if (lag_rmax_wrt) then
1483-
call s_write_lag_variable_to_formatted_database_file('part_rmax', t_step)
1484-
end if
1485-
1486-
if (lag_rmin_wrt) then
1487-
call s_write_lag_variable_to_formatted_database_file('part_rmin', t_step)
1488-
end if
1489-
1490-
if (lag_dphidt_wrt) then
1491-
call s_write_lag_variable_to_formatted_database_file('part_dphidt', t_step)
1492-
end if
1493-
1494-
if (lag_pres_wrt) then
1495-
call s_write_lag_variable_to_formatted_database_file('part_pressure', t_step)
1496-
end if
1497-
1498-
if (lag_mv_wrt) then
1499-
call s_write_lag_variable_to_formatted_database_file('part_mv', t_step)
1419+
if (p > 0) call s_write_lag_variable_to_formatted_database_file('part_vel3', t_step)
15001420
end if
1501-
1502-
if (lag_mg_wrt) then
1503-
call s_write_lag_variable_to_formatted_database_file('part_mg', t_step)
1504-
end if
1505-
1506-
if (lag_betaT_wrt) then
1507-
call s_write_lag_variable_to_formatted_database_file('part_betaT', t_step)
1508-
end if
1509-
1510-
if (lag_betaC_wrt) then
1511-
call s_write_lag_variable_to_formatted_database_file('part_betaC', t_step)
1512-
end if
1513-
1421+
if (lag_rad_wrt) call s_write_lag_variable_to_formatted_database_file('part_radius', t_step)
1422+
if (lag_rvel_wrt) call s_write_lag_variable_to_formatted_database_file('part_rdot', t_step)
1423+
if (lag_r0_wrt) call s_write_lag_variable_to_formatted_database_file('part_r0', t_step)
1424+
if (lag_rmax_wrt) call s_write_lag_variable_to_formatted_database_file('part_rmax', t_step)
1425+
if (lag_rmin_wrt) call s_write_lag_variable_to_formatted_database_file('part_rmin', t_step)
1426+
if (lag_dphidt_wrt) call s_write_lag_variable_to_formatted_database_file('part_dphidt', t_step)
1427+
if (lag_pres_wrt) call s_write_lag_variable_to_formatted_database_file('part_pressure', t_step)
1428+
if (lag_mv_wrt) call s_write_lag_variable_to_formatted_database_file('part_mv', t_step)
1429+
if (lag_mg_wrt) call s_write_lag_variable_to_formatted_database_file('part_mg', t_step)
1430+
if (lag_betaT_wrt) call s_write_lag_variable_to_formatted_database_file('part_betaT', t_step)
1431+
if (lag_betaC_wrt) call s_write_lag_variable_to_formatted_database_file('part_betaC', t_step)
15141432
end if
15151433
15161434
#endif

0 commit comments

Comments
 (0)