Skip to content

Commit 5a31612

Browse files
committed
making hyper only if MFC_SIMULATION in boundary conditions, source now builds, was broken before
1 parent 18f6673 commit 5a31612

File tree

1 file changed

+32
-27
lines changed

1 file changed

+32
-27
lines changed

src/common/m_boundary_conditions.fpp

Lines changed: 32 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -237,14 +237,14 @@ contains
237237
end do
238238
end do
239239
end do
240-
240+
#ifdef MFC_SIMULATION
241241
if (hyperelasticity) then
242242
!$acc parallel loop collapse(4) gang vector default(present), private(bc_sum)
243243
do j = 1, buff_size
244244
do l = 0, p
245245
do k = 0, n
246246
do i = xibeg, xiend
247-
bc_sum = 0_wp
247+
bc_sum = 0._wp
248248
!$acc loop seq
249249
do q = 1, j
250250
bc_sum = bc_sum - dx(-q)
@@ -257,7 +257,7 @@ contains
257257
end do
258258
!$acc end parallel loop
259259
end if
260-
260+
#endif
261261
else !< bc_x%end
262262

263263
!$acc parallel loop collapse(4) gang vector default(present)
@@ -271,14 +271,14 @@ contains
271271
end do
272272
end do
273273
end do
274-
274+
#ifdef MFC_SIMULATION
275275
if (hyperelasticity) then
276276
!$acc parallel loop collapse(4) gang vector default(present), private(bc_sum)
277277
do j = 1, buff_size
278278
do l = 0, p
279279
do k = 0, n
280280
do i = xibeg, xiend
281-
bc_sum = 0_wp
281+
bc_sum = 0._wp
282282
!$acc loop seq
283283
do q = 1, j
284284
bc_sum = bc_sum + dx(m + q)
@@ -291,9 +291,10 @@ contains
291291
end do
292292
!$acc end parallel loop
293293
end if
294+
#endif
294295
end if
295-
296-
!< y-direction
296+
297+
!< y-direction
297298
elseif (bc_dir == 2) then !< y-direction
298299

299300
if (bc_loc == -1) then !< bc_y%beg
@@ -309,14 +310,14 @@ contains
309310
end do
310311
end do
311312
end do
312-
313+
#ifdef MFC_SIMULATION
313314
if (hyperelasticity) then
314315
!$acc parallel loop collapse(4) gang vector default(present), private(bc_sum)
315316
do j = 1, buff_size
316317
do l = -buff_size, m + buff_size
317318
do k = 0, p
318319
do i = xibeg, xiend
319-
bc_sum = 0_wp
320+
bc_sum = 0._wp
320321
!$acc loop seq
321322
do q = 1, j
322323
bc_sum = bc_sum - dy(-q)
@@ -329,7 +330,7 @@ contains
329330
end do
330331
!$acc end parallel loop
331332
end if
332-
333+
#endif
333334
else !< bc_y%end
334335

335336
!$acc parallel loop collapse(4) gang vector default(present)
@@ -343,14 +344,14 @@ contains
343344
end do
344345
end do
345346
end do
346-
347+
#ifdef MFC_SIMULATION
347348
if (hyperelasticity) then
348349
!$acc parallel loop collapse(4) gang vector default(present), private(bc_sum)
349350
do j = 1, buff_size
350351
do l = -buff_size, m + buff_size
351352
do k = 0, p
352353
do i = xibeg, xiend
353-
bc_sum = 0_wp
354+
bc_sum = 0._wp
354355
!$acc loop seq
355356
do q = 1, j
356357
bc_sum = bc_sum + dy(n + q)
@@ -363,7 +364,7 @@ contains
363364
end do
364365
!$acc end parallel loop
365366
end if
366-
367+
#endif
367368
end if
368369

369370
!< z-direction
@@ -382,14 +383,14 @@ contains
382383
end do
383384
end do
384385
end do
385-
386+
#ifdef MFC_SIMULATION
386387
if (hyperelasticity) then
387388
!$acc parallel loop collapse(4) gang vector default(present), private(bc_sum)
388389
do j = 1, buff_size
389390
do l = -buff_size, n + buff_size
390391
do k = -buff_size, m + buff_size
391392
do i = xibeg, xiend
392-
bc_sum = 0_wp
393+
bc_sum = 0._wp
393394
!$acc loop seq
394395
do q = 1, j
395396
bc_sum = bc_sum - dx(-q)
@@ -402,8 +403,8 @@ contains
402403
end do
403404
!$acc end parallel loop
404405
end if
406+
#endif
405407
else !< bc_z%end
406-
407408
!$acc parallel loop collapse(4) gang vector default(present)
408409
do i = 1, sys_size
409410
do j = 1, buff_size
@@ -415,14 +416,14 @@ contains
415416
end do
416417
end do
417418
end do
418-
419+
#ifdef MFC_SIMULATION
419420
if (hyperelasticity) then
420421
!$acc parallel loop collapse(4) gang vector default(present), private(bc_sum)
421422
do j = 1, buff_size
422423
do l = -buff_size, n + buff_size
423424
do k = -buff_size, m + buff_size
424425
do i = xibeg, xiend
425-
bc_sum = 0_wp
426+
bc_sum = 0._wp
426427
!$acc loop seq
427428
do q = 1, j
428429
bc_sum = bc_sum + dz(p + q)
@@ -435,7 +436,7 @@ contains
435436
end do
436437
!$acc end parallel loop
437438
end if
438-
439+
#endif
439440
end if
440441

441442
end if
@@ -473,12 +474,12 @@ contains
473474
q_prim_vf(i)%sf(-j, k, l) = &
474475
q_prim_vf(i)%sf(j - 1, k, l)
475476
end do
476-
477+
#ifdef MFC_SIMULATION
477478
if (hyperelasticity) then
478479
q_prim_vf(xibeg)%sf(-j, k, l) = &
479480
-q_prim_vf(xibeg)%sf(j - 1, k, l)
480481
end if
481-
482+
#endif
482483
end do
483484
end do
484485
end do
@@ -523,12 +524,12 @@ contains
523524
q_prim_vf(i)%sf(m + j, k, l) = &
524525
q_prim_vf(i)%sf(m - (j - 1), k, l)
525526
end do
526-
527+
#ifdef MFC_SIMULATION
527528
if (hyperelasticity) then
528529
q_prim_vf(xibeg)%sf(m + j, k, l) = &
529530
-q_prim_vf(xibeg)%sf(m - (j - 1), k, l)
530531
end if
531-
532+
#endif
532533
end do
533534
end do
534535
end do
@@ -576,11 +577,12 @@ contains
576577
q_prim_vf(i)%sf(l, -j, k) = &
577578
q_prim_vf(i)%sf(l, j - 1, k)
578579
end do
579-
580+
#ifdef MFC_SIMULATION
580581
if (hyperelasticity) then
581582
q_prim_vf(xibeg + 1)%sf(l, -j, k) = &
582583
-q_prim_vf(xibeg + 1)%sf(l, j - 1, k)
583584
end if
585+
#endif
584586
end do
585587
end do
586588
end do
@@ -623,11 +625,12 @@ contains
623625
q_prim_vf(i)%sf(l, n + j, k) = &
624626
q_prim_vf(i)%sf(l, n - (j - 1), k)
625627
end do
626-
628+
#ifdef MFC_SIMULATION
627629
if (hyperelasticity) then
628630
q_prim_vf(xibeg + 1)%sf(l, n + j, k) = &
629631
-q_prim_vf(xibeg + 1)%sf(l, n - (j - 1), k)
630632
end if
633+
#endif
631634
end do
632635
end do
633636
end do
@@ -675,11 +678,12 @@ contains
675678
q_prim_vf(i)%sf(k, l, -j) = &
676679
q_prim_vf(i)%sf(k, l, j - 1)
677680
end do
678-
681+
#ifdef MFC_SIMULATION
679682
if (hyperelasticity) then
680683
q_prim_vf(xiend)%sf(k, l, -j) = &
681684
-q_prim_vf(xiend)%sf(k, l, j - 1)
682685
end if
686+
#endif
683687
end do
684688
end do
685689
end do
@@ -722,11 +726,12 @@ contains
722726
q_prim_vf(i)%sf(k, l, p + j) = &
723727
q_prim_vf(i)%sf(k, l, p - (j - 1))
724728
end do
725-
729+
#ifdef MFC_SIMULATION
726730
if (hyperelasticity) then
727731
q_prim_vf(xiend)%sf(k, l, p + j) = &
728732
-q_prim_vf(xiend)%sf(k, l, p - (j - 1))
729733
end if
734+
#endif
730735
end do
731736
end do
732737
end do

0 commit comments

Comments
 (0)