Skip to content

Commit fd482ed

Browse files
danieljvickersdanieljvickers
committed
This builds
1 parent f8dd4cd commit fd482ed

33 files changed

+378
-378
lines changed

‎src/common/include/parallel_macros.fpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
#if defined(MFC_OpenACC)
4040
#:set end_directive = '!$acc end parallel loop'
4141
#elif defined(MFC_OpenMP)
42-
#:set end_directive = END_OMP_PARALLEL_LOOP(code, collapse, private, parallelism, default, firstprivate, reduction, reductionOp, copy, copyin, copyinReadOnly, copyout, create, no_create, present, deviceptr, attach, extraOmpArgs)
42+
#:set end_directive = END_OMP_PARALLEL_LOOP()
4343
#endif
4444

4545
$:end_directive

‎src/common/m_boundary_common.fpp‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ contains
112112
end if
113113
end do
114114
end do
115-
$:END_GPU_PARALLEL_LOOP
115+
$:END_GPU_PARALLEL_LOOP()
116116
end if
117117

118118
if (bc_x%end >= 0) then
@@ -142,7 +142,7 @@ contains
142142
end if
143143
end do
144144
end do
145-
$:END_GPU_PARALLEL_LOOP
145+
$:END_GPU_PARALLEL_LOOP()
146146
end if
147147

148148
! Population of Buffers in y-direction
@@ -179,7 +179,7 @@ contains
179179
end if
180180
end do
181181
end do
182-
$:END_GPU_PARALLEL_LOOP
182+
$:END_GPU_PARALLEL_LOOP()
183183
end if
184184

185185
if (bc_y%end >= 0) then
@@ -209,7 +209,7 @@ contains
209209
end if
210210
end do
211211
end do
212-
$:END_GPU_PARALLEL_LOOP
212+
$:END_GPU_PARALLEL_LOOP()
213213
end if
214214

215215
! Population of Buffers in z-direction
@@ -243,7 +243,7 @@ contains
243243
end if
244244
end do
245245
end do
246-
$:END_GPU_PARALLEL_LOOP
246+
$:END_GPU_PARALLEL_LOOP()
247247
end if
248248

249249
if (bc_z%end >= 0) then
@@ -273,7 +273,7 @@ contains
273273
end if
274274
end do
275275
end do
276-
$:END_GPU_PARALLEL_LOOP
276+
$:END_GPU_PARALLEL_LOOP()
277277
end if
278278
! END: Population of Buffers in z-direction
279279

@@ -1178,7 +1178,7 @@ contains
11781178
end select
11791179
end do
11801180
end do
1181-
$:END_GPU_PARALLEL_LOOP
1181+
$:END_GPU_PARALLEL_LOOP()
11821182
end if
11831183

11841184
if (bc_x%end >= 0) then
@@ -1197,7 +1197,7 @@ contains
11971197
end select
11981198
end do
11991199
end do
1200-
$:END_GPU_PARALLEL_LOOP
1200+
$:END_GPU_PARALLEL_LOOP()
12011201
end if
12021202

12031203
if (n == 0) return
@@ -1219,7 +1219,7 @@ contains
12191219
end select
12201220
end do
12211221
end do
1222-
$:END_GPU_PARALLEL_LOOP
1222+
$:END_GPU_PARALLEL_LOOP()
12231223
end if
12241224

12251225
if (bc_y%end >= 0) then
@@ -1238,7 +1238,7 @@ contains
12381238
end select
12391239
end do
12401240
end do
1241-
$:END_GPU_PARALLEL_LOOP
1241+
$:END_GPU_PARALLEL_LOOP()
12421242
end if
12431243

12441244
if (p == 0) return
@@ -1260,7 +1260,7 @@ contains
12601260
end select
12611261
end do
12621262
end do
1263-
$:END_GPU_PARALLEL_LOOP
1263+
$:END_GPU_PARALLEL_LOOP()
12641264
end if
12651265

12661266
if (bc_z%end >= 0) then
@@ -1279,7 +1279,7 @@ contains
12791279
end select
12801280
end do
12811281
end do
1282-
$:END_GPU_PARALLEL_LOOP
1282+
$:END_GPU_PARALLEL_LOOP()
12831283
end if
12841284
end subroutine s_populate_capillary_buffers
12851285

@@ -1501,7 +1501,7 @@ contains
15011501
end select
15021502
end do
15031503
end do
1504-
$:END_GPU_PARALLEL_LOOP
1504+
$:END_GPU_PARALLEL_LOOP()
15051505

15061506
end if
15071507

@@ -1527,7 +1527,7 @@ contains
15271527
end select
15281528
end do
15291529
end do
1530-
$:END_GPU_PARALLEL_LOOP
1530+
$:END_GPU_PARALLEL_LOOP()
15311531

15321532
end if
15331533

@@ -1555,7 +1555,7 @@ contains
15551555
end select
15561556
end do
15571557
end do
1558-
$:END_GPU_PARALLEL_LOOP
1558+
$:END_GPU_PARALLEL_LOOP()
15591559

15601560
end if
15611561

@@ -1581,7 +1581,7 @@ contains
15811581
end select
15821582
end do
15831583
end do
1584-
$:END_GPU_PARALLEL_LOOP
1584+
$:END_GPU_PARALLEL_LOOP()
15851585
end if
15861586

15871587
if (p == 0) then
@@ -1608,7 +1608,7 @@ contains
16081608
end select
16091609
end do
16101610
end do
1611-
$:END_GPU_PARALLEL_LOOP
1611+
$:END_GPU_PARALLEL_LOOP()
16121612
end if
16131613

16141614
if (bc_z%end >= 0) then
@@ -1633,7 +1633,7 @@ contains
16331633
end select
16341634
end do
16351635
end do
1636-
$:END_GPU_PARALLEL_LOOP
1636+
$:END_GPU_PARALLEL_LOOP()
16371637
end if
16381638

16391639
end subroutine s_populate_F_igr_buffers

‎src/common/m_chemistry.fpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ contains
159159
end do
160160
end do
161161
end do
162-
$:END_GPU_PARALLEL_LOOP
162+
$:END_GPU_PARALLEL_LOOP()
163163

164164
end subroutine s_compute_chemistry_reaction_flux
165165

@@ -298,7 +298,7 @@ contains
298298
end do
299299
end do
300300
end do
301-
$:END_GPU_PARALLEL_LOOP
301+
$:END_GPU_PARALLEL_LOOP()
302302
end if
303303

304304
end subroutine s_compute_chemistry_diffusion_flux

‎src/common/m_compute_levelset.fpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ contains
6262

6363
end do
6464
end do
65-
$:END_GPU_PARALLEL_LOOP
65+
$:END_GPU_PARALLEL_LOOP()
6666

6767
end subroutine s_circle_levelset
6868

@@ -148,7 +148,7 @@ contains
148148
149149
end do
150150
end do
151-
$:END_GPU_PARALLEL_LOOP
151+
$:END_GPU_PARALLEL_LOOP()
152152
153153
end subroutine s_airfoil_levelset
154154
@@ -255,7 +255,7 @@ contains
255255
end do
256256
end do
257257
end do
258-
$:END_GPU_PARALLEL_LOOP
258+
$:END_GPU_PARALLEL_LOOP()
259259

260260
end subroutine s_3D_airfoil_levelset
261261

@@ -332,7 +332,7 @@ contains
332332
end if
333333
end do
334334
end do
335-
$:END_GPU_PARALLEL_LOOP
335+
$:END_GPU_PARALLEL_LOOP()
336336

337337
end subroutine s_rectangle_levelset
338338

@@ -441,7 +441,7 @@ contains
441441
end do
442442
end do
443443
end do
444-
$:END_GPU_PARALLEL_LOOP
444+
$:END_GPU_PARALLEL_LOOP()
445445
446446
end subroutine s_cuboid_levelset
447447
@@ -479,7 +479,7 @@ contains
479479
end do
480480
end do
481481
end do
482-
$:END_GPU_PARALLEL_LOOP
482+
$:END_GPU_PARALLEL_LOOP()
483483
484484
end subroutine s_sphere_levelset
485485
@@ -560,7 +560,7 @@ contains
560560
end do
561561
end do
562562
end do
563-
$:END_GPU_PARALLEL_LOOP
563+
$:END_GPU_PARALLEL_LOOP()
564564

565565
end subroutine s_cylinder_levelset
566566

‎src/common/m_finite_differences.fpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ contains
5656
end do
5757
end do
5858
end do
59-
$:END_GPU_PARALLEL_LOOP
59+
$:END_GPU_PARALLEL_LOOP()
6060

6161
end subroutine s_compute_fd_divergence
6262

‎src/common/m_ib_patches.fpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ contains
173173
end if
174174
end do
175175
end do
176-
$:END_GPU_PARALLEL_LOOP
176+
$:END_GPU_PARALLEL_LOOP()
177177

178178
end subroutine s_ib_circle
179179

@@ -325,7 +325,7 @@ contains
325325
end if
326326
end do
327327
end do
328-
$:END_GPU_PARALLEL_LOOP
328+
$:END_GPU_PARALLEL_LOOP()
329329
330330
end subroutine s_ib_airfoil
331331
@@ -475,7 +475,7 @@ contains
475475
end do
476476
end do
477477
end do
478-
$:END_GPU_PARALLEL_LOOP
478+
$:END_GPU_PARALLEL_LOOP()
479479

480480
end subroutine s_ib_3D_airfoil
481481

@@ -541,7 +541,7 @@ contains
541541
end if
542542
end do
543543
end do
544-
$:END_GPU_PARALLEL_LOOP
544+
$:END_GPU_PARALLEL_LOOP()
545545
546546
end subroutine s_ib_rectangle
547547
@@ -602,7 +602,7 @@ contains
602602
end do
603603
end do
604604
end do
605-
$:END_GPU_PARALLEL_LOOP
605+
$:END_GPU_PARALLEL_LOOP()
606606
607607
end subroutine s_ib_sphere
608608
@@ -673,7 +673,7 @@ contains
673673
end do
674674
end do
675675
end do
676-
$:END_GPU_PARALLEL_LOOP
676+
$:END_GPU_PARALLEL_LOOP()
677677
678678
end subroutine s_ib_cuboid
679679
@@ -758,7 +758,7 @@ contains
758758
end do
759759
end do
760760
end do
761-
$:END_GPU_PARALLEL_LOOP
761+
$:END_GPU_PARALLEL_LOOP()
762762
763763
end subroutine s_ib_cylinder
764764

0 commit comments

Comments
 (0)