Skip to content

Commit e576795

Browse files
author
Anand
committed
format
1 parent 66a309e commit e576795

File tree

2 files changed

+96
-96
lines changed

2 files changed

+96
-96
lines changed

‎src/simulation/m_derived_variables.fpp‎

Lines changed: 71 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ contains
102102
! Computing centered finite difference coefficients
103103
call s_compute_finite_difference_coefficients(m, x_cc, fd_coeff_x, buff_size, &
104104
fd_number, fd_order)
105-
$:GPU_UPDATE(device='[fd_coeff_x]')
105+
$:GPU_UPDATE(device='[fd_coeff_x]')
106106

107107
if (n > 0) then
108108
call s_compute_finite_difference_coefficients(n, y_cc, fd_coeff_y, buff_size, &
@@ -189,7 +189,7 @@ contains
189189
!! @param q_sf Acceleration component
190190
pure subroutine s_derive_acceleration_component(i, q_prim_vf0, q_prim_vf1, &
191191
q_prim_vf2, q_prim_vf3, q_sf)
192-
192+
193193
integer, intent(in) :: i
194194

195195
type(scalar_field), dimension(sys_size), intent(in) :: q_prim_vf0
@@ -203,171 +203,171 @@ contains
203203

204204
! Computing the acceleration component in the x-coordinate direction
205205
if (i == 1) then
206-
$:GPU_PARALLEL_LOOP(collapse=3)
206+
$:GPU_PARALLEL_LOOP(collapse=3)
207207
do l = 0, p
208208
do k = 0, n
209209
do j = 0, m
210210
q_sf(j, k, l) = (11._wp*q_prim_vf0(momxb)%sf(j, k, l) &
211211
- 18._wp*q_prim_vf1(momxb)%sf(j, k, l) &
212212
+ 9._wp*q_prim_vf2(momxb)%sf(j, k, l) &
213213
- 2._wp*q_prim_vf3(momxb)%sf(j, k, l))/(6._wp*dt)
214-
end do
215-
end do
216-
end do
214+
end do
215+
end do
216+
end do
217217

218-
if(n == 0) then
219-
$:GPU_PARALLEL_LOOP(collapse=4)
218+
if (n == 0) then
219+
$:GPU_PARALLEL_LOOP(collapse=4)
220220
do l = 0, p
221221
do k = 0, n
222222
do j = 0, m
223223
do r = -fd_number, fd_number
224-
q_sf(j, k, l) = q_sf(j, k, l) &
224+
q_sf(j, k, l) = q_sf(j, k, l) &
225225
+ q_prim_vf0(momxb)%sf(j, k, l)*fd_coeff_x(r, j)* &
226-
q_prim_vf0(momxb)%sf(r + j, k, l)
227-
end do
228-
end do
229-
end do
226+
q_prim_vf0(momxb)%sf(r + j, k, l)
227+
end do
228+
end do
229+
end do
230230
end do
231-
elseif (p == 0) then
232-
$:GPU_PARALLEL_LOOP(collapse=4)
231+
elseif (p == 0) then
232+
$:GPU_PARALLEL_LOOP(collapse=4)
233233
do l = 0, p
234234
do k = 0, n
235235
do j = 0, m
236236
do r = -fd_number, fd_number
237-
q_sf(j, k, l) = q_sf(j, k, l) &
237+
q_sf(j, k, l) = q_sf(j, k, l) &
238238
+ q_prim_vf0(momxb)%sf(j, k, l)*fd_coeff_x(r, j)* &
239239
q_prim_vf0(momxb)%sf(r + j, k, l) &
240240
+ q_prim_vf0(momxb + 1)%sf(j, k, l)*fd_coeff_y(r, k)* &
241241
q_prim_vf0(momxb)%sf(j, r + k, l)
242-
end do
243-
end do
244-
end do
242+
end do
243+
end do
244+
end do
245245
end do
246-
else
247-
if(grid_geometry == 3) then
248-
$:GPU_PARALLEL_LOOP(collapse=4)
246+
else
247+
if (grid_geometry == 3) then
248+
$:GPU_PARALLEL_LOOP(collapse=4)
249249
do l = 0, p
250250
do k = 0, n
251251
do j = 0, m
252252
do r = -fd_number, fd_number
253-
q_sf(j, k, l) = q_sf(j, k, l) &
253+
q_sf(j, k, l) = q_sf(j, k, l) &
254254
+ q_prim_vf0(momxb)%sf(j, k, l)*fd_coeff_x(r, j)* &
255255
q_prim_vf0(momxb)%sf(r + j, k, l) &
256256
+ q_prim_vf0(momxb + 1)%sf(j, k, l)*fd_coeff_y(r, k)* &
257257
q_prim_vf0(momxb)%sf(j, r + k, l) &
258258
+ q_prim_vf0(momxe)%sf(j, k, l)*fd_coeff_z(r, l)* &
259259
q_prim_vf0(momxb)%sf(j, k, r + l)/y_cc(k)
260-
end do
261-
end do
262-
end do
260+
end do
261+
end do
262+
end do
263263
end do
264264
else
265-
$:GPU_PARALLEL_LOOP(collapse=4)
265+
$:GPU_PARALLEL_LOOP(collapse=4)
266266
do l = 0, p
267267
do k = 0, n
268268
do j = 0, m
269269
do r = -fd_number, fd_number
270-
q_sf(j, k, l) = q_sf(j, k, l) &
270+
q_sf(j, k, l) = q_sf(j, k, l) &
271271
+ q_prim_vf0(momxb)%sf(j, k, l)*fd_coeff_x(r, j)* &
272272
q_prim_vf0(momxb)%sf(r + j, k, l) &
273273
+ q_prim_vf0(momxb + 1)%sf(j, k, l)*fd_coeff_y(r, k)* &
274274
q_prim_vf0(momxb)%sf(j, r + k, l) &
275275
+ q_prim_vf0(momxe)%sf(j, k, l)*fd_coeff_z(r, l)* &
276276
q_prim_vf0(momxb)%sf(j, k, r + l)
277-
end do
278-
end do
279-
end do
277+
end do
278+
end do
279+
end do
280280
end do
281281
end if
282282
end if
283-
! Computing the acceleration component in the y-coordinate direction
283+
! Computing the acceleration component in the y-coordinate direction
284284
elseif (i == 2) then
285-
$:GPU_PARALLEL_LOOP(collapse=3)
285+
$:GPU_PARALLEL_LOOP(collapse=3)
286286
do l = 0, p
287287
do k = 0, n
288288
do j = 0, m
289289
q_sf(j, k, l) = (11._wp*q_prim_vf0(momxb + 1)%sf(j, k, l) &
290290
- 18._wp*q_prim_vf1(momxb + 1)%sf(j, k, l) &
291291
+ 9._wp*q_prim_vf2(momxb + 1)%sf(j, k, l) &
292292
- 2._wp*q_prim_vf3(momxb + 1)%sf(j, k, l))/(6._wp*dt)
293-
end do
294-
end do
295-
end do
293+
end do
294+
end do
295+
end do
296296

297-
if (p == 0) then
298-
$:GPU_PARALLEL_LOOP(collapse=4)
297+
if (p == 0) then
298+
$:GPU_PARALLEL_LOOP(collapse=4)
299299
do l = 0, p
300300
do k = 0, n
301301
do j = 0, m
302302
do r = -fd_number, fd_number
303-
q_sf(j, k, l) = q_sf(j, k, l) &
303+
q_sf(j, k, l) = q_sf(j, k, l) &
304304
+ q_prim_vf0(momxb)%sf(j, k, l)*fd_coeff_x(r, j)* &
305305
q_prim_vf0(momxb + 1)%sf(r + j, k, l) &
306306
+ q_prim_vf0(momxb + 1)%sf(j, k, l)*fd_coeff_y(r, k)* &
307307
q_prim_vf0(momxb + 1)%sf(j, r + k, l)
308-
end do
309-
end do
310-
end do
308+
end do
309+
end do
310+
end do
311311
end do
312-
else
313-
if(grid_geometry == 3) then
314-
$:GPU_PARALLEL_LOOP(collapse=4)
312+
else
313+
if (grid_geometry == 3) then
314+
$:GPU_PARALLEL_LOOP(collapse=4)
315315
do l = 0, p
316316
do k = 0, n
317317
do j = 0, m
318318
do r = -fd_number, fd_number
319-
q_sf(j, k, l) = q_sf(j, k, l) &
319+
q_sf(j, k, l) = q_sf(j, k, l) &
320320
+ q_prim_vf0(momxb)%sf(j, k, l)*fd_coeff_x(r, j)* &
321321
q_prim_vf0(momxb + 1)%sf(r + j, k, l) &
322322
+ q_prim_vf0(momxb + 1)%sf(j, k, l)*fd_coeff_y(r, k)* &
323323
q_prim_vf0(momxb + 1)%sf(j, r + k, l) &
324324
+ q_prim_vf0(momxe)%sf(j, k, l)*fd_coeff_z(r, l)* &
325325
q_prim_vf0(momxb + 1)%sf(j, k, r + l)/y_cc(k) &
326326
- (q_prim_vf0(momxe)%sf(j, k, l)**2._wp)/y_cc(k)
327-
end do
328-
end do
329-
end do
327+
end do
328+
end do
329+
end do
330330
end do
331331
else
332-
$:GPU_PARALLEL_LOOP(collapse=4)
332+
$:GPU_PARALLEL_LOOP(collapse=4)
333333
do l = 0, p
334334
do k = 0, n
335335
do j = 0, m
336336
do r = -fd_number, fd_number
337-
q_sf(j, k, l) = q_sf(j, k, l) &
337+
q_sf(j, k, l) = q_sf(j, k, l) &
338338
+ q_prim_vf0(momxb)%sf(j, k, l)*fd_coeff_x(r, j)* &
339339
q_prim_vf0(momxb + 1)%sf(r + j, k, l) &
340340
+ q_prim_vf0(momxb + 1)%sf(j, k, l)*fd_coeff_y(r, k)* &
341341
q_prim_vf0(momxb + 1)%sf(j, r + k, l) &
342342
+ q_prim_vf0(momxe)%sf(j, k, l)*fd_coeff_z(r, l)* &
343343
q_prim_vf0(momxb + 1)%sf(j, k, r + l)
344-
end do
345-
end do
346-
end do
344+
end do
345+
end do
346+
end do
347347
end do
348348
end if
349349
end if
350-
! Computing the acceleration component in the z-coordinate direction
350+
! Computing the acceleration component in the z-coordinate direction
351351
else
352-
$:GPU_PARALLEL_LOOP(collapse=3)
352+
$:GPU_PARALLEL_LOOP(collapse=3)
353353
do l = 0, p
354354
do k = 0, n
355355
do j = 0, m
356356
q_sf(j, k, l) = (11._wp*q_prim_vf0(momxe)%sf(j, k, l) &
357357
- 18._wp*q_prim_vf1(momxe)%sf(j, k, l) &
358358
+ 9._wp*q_prim_vf2(momxe)%sf(j, k, l) &
359359
- 2._wp*q_prim_vf3(momxe)%sf(j, k, l))/(6._wp*dt)
360-
end do
361-
end do
362-
end do
363-
364-
if(grid_geometry == 3) then
365-
$:GPU_PARALLEL_LOOP(collapse=4)
360+
end do
361+
end do
362+
end do
363+
364+
if (grid_geometry == 3) then
365+
$:GPU_PARALLEL_LOOP(collapse=4)
366366
do l = 0, p
367367
do k = 0, n
368368
do j = 0, m
369369
do r = -fd_number, fd_number
370-
q_sf(j, k, l) = q_sf(j, k, l) &
370+
q_sf(j, k, l) = q_sf(j, k, l) &
371371
+ q_prim_vf0(momxb)%sf(j, k, l)*fd_coeff_x(r, j)* &
372372
q_prim_vf0(momxe)%sf(r + j, k, l) &
373373
+ q_prim_vf0(momxb + 1)%sf(j, k, l)*fd_coeff_y(r, k)* &
@@ -376,26 +376,26 @@ contains
376376
q_prim_vf0(momxe)%sf(j, k, r + l)/y_cc(k) &
377377
+ (q_prim_vf0(momxe)%sf(j, k, l)* &
378378
q_prim_vf0(momxb + 1)%sf(j, k, l))/y_cc(k)
379-
end do
380-
end do
381-
end do
379+
end do
380+
end do
381+
end do
382382
end do
383383
else
384-
$:GPU_PARALLEL_LOOP(collapse=4)
384+
$:GPU_PARALLEL_LOOP(collapse=4)
385385
do l = 0, p
386386
do k = 0, n
387387
do j = 0, m
388388
do r = -fd_number, fd_number
389-
q_sf(j, k, l) = q_sf(j, k, l) &
389+
q_sf(j, k, l) = q_sf(j, k, l) &
390390
+ q_prim_vf0(momxb)%sf(j, k, l)*fd_coeff_x(r, j)* &
391391
q_prim_vf0(momxe)%sf(r + j, k, l) &
392392
+ q_prim_vf0(momxb + 1)%sf(j, k, l)*fd_coeff_y(r, k)* &
393393
q_prim_vf0(momxe)%sf(j, r + k, l) &
394394
+ q_prim_vf0(momxe)%sf(j, k, l)*fd_coeff_z(r, l)* &
395395
q_prim_vf0(momxe)%sf(j, k, r + l)
396-
end do
397-
end do
398-
end do
396+
end do
397+
end do
398+
end do
399399
end do
400400
end if
401401
end if

‎src/simulation/m_time_steppers.fpp‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1077,59 +1077,59 @@ contains
10771077
if (t_step == t_step_start) then
10781078
$:GPU_PARALLEL_LOOP(collapse=4)
10791079
do i = 1, sys_size
1080-
do l = 0, p
1081-
do k = 0, n
1082-
do j = 0, m
1080+
do l = 0, p
1081+
do k = 0, n
1082+
do j = 0, m
10831083
q_prim_ts(3)%vf(i)%sf(j, k, l) = q_prim_vf(i)%sf(j, k, l)
1084-
end do
1085-
end do
1084+
end do
1085+
end do
10861086
end do
10871087
end do
10881088
elseif (t_step == t_step_start + 1) then
10891089
$:GPU_PARALLEL_LOOP(collapse=4)
10901090
do i = 1, sys_size
1091-
do l = 0, p
1092-
do k = 0, n
1093-
do j = 0, m
1091+
do l = 0, p
1092+
do k = 0, n
1093+
do j = 0, m
10941094
q_prim_ts(2)%vf(i)%sf(j, k, l) = q_prim_vf(i)%sf(j, k, l)
1095-
end do
1096-
end do
1095+
end do
1096+
end do
10971097
end do
10981098
end do
10991099
elseif (t_step == t_step_start + 2) then
11001100
$:GPU_PARALLEL_LOOP(collapse=4)
11011101
do i = 1, sys_size
1102-
do l = 0, p
1103-
do k = 0, n
1104-
do j = 0, m
1102+
do l = 0, p
1103+
do k = 0, n
1104+
do j = 0, m
11051105
q_prim_ts(1)%vf(i)%sf(j, k, l) = q_prim_vf(i)%sf(j, k, l)
1106-
end do
1107-
end do
1106+
end do
1107+
end do
11081108
end do
11091109
end do
11101110
elseif (t_step == t_step_start + 3) then
11111111
$:GPU_PARALLEL_LOOP(collapse=4)
11121112
do i = 1, sys_size
1113-
do l = 0, p
1114-
do k = 0, n
1115-
do j = 0, m
1113+
do l = 0, p
1114+
do k = 0, n
1115+
do j = 0, m
11161116
q_prim_ts(0)%vf(i)%sf(j, k, l) = q_prim_vf(i)%sf(j, k, l)
1117-
end do
1118-
end do
1117+
end do
1118+
end do
11191119
end do
11201120
end do
11211121
else ! All other timesteps
11221122
$:GPU_PARALLEL_LOOP(collapse=4)
11231123
do i = 1, sys_size
1124-
do l = 0, p
1125-
do k = 0, n
1126-
do j = 0, m
1124+
do l = 0, p
1125+
do k = 0, n
1126+
do j = 0, m
11271127
q_prim_ts(3)%vf(i)%sf(j, k, l) = q_prim_ts(2)%vf(i)%sf(j, k, l)
11281128
q_prim_ts(2)%vf(i)%sf(j, k, l) = q_prim_ts(1)%vf(i)%sf(j, k, l)
11291129
q_prim_ts(1)%vf(i)%sf(j, k, l) = q_prim_ts(0)%vf(i)%sf(j, k, l)
11301130
q_prim_ts(0)%vf(i)%sf(j, k, l) = q_prim_vf(i)%sf(j, k, l)
1131-
end do
1132-
end do
1131+
end do
1132+
end do
11331133
end do
11341134
end do
11351135
end if

0 commit comments

Comments
 (0)