Skip to content

Commit d355280

Browse files
committed
Merge branch 'CI-pmd' of https://github.com/Malmahrouqi3/MFC-mo2 into CI-pmd
2 parents 93b3e4b + 9e425be commit d355280

26 files changed

+1640
-5120
lines changed

src/common/include/macros.fpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
#:def DEALLOCATE(*args)
2020
@:LOG({'@:DEALLOCATE(${re.sub(' +', ' ', ', '.join(args))}$)'})
21-
deallocate (${', '.join(args)}$)
2221
!$acc exit data delete(${', '.join(args)}$)
22+
deallocate (${', '.join(args)}$)
2323
#:enddef DEALLOCATE
2424

2525
#:def ACC_SETUP_VFs(*args)

src/common/m_boundary_common.fpp

Lines changed: 581 additions & 118 deletions
Large diffs are not rendered by default.

src/common/m_mpi_common.fpp

Lines changed: 723 additions & 326 deletions
Large diffs are not rendered by default.

src/common/m_variables_conversion.fpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1138,6 +1138,10 @@ contains
11381138

11391139
if (cont_damage) qK_prim_vf(damage_idx)%sf(j, k, l) = qK_cons_vf(damage_idx)%sf(j, k, l)
11401140

1141+
#ifdef MFC_POST_PROCESS
1142+
if (bubbles_lagrange) qK_prim_vf(beta_idx)%sf(j, k, l) = qK_cons_vf(beta_idx)%sf(j, k, l)
1143+
#endif
1144+
11411145
end do
11421146
end do
11431147
end do

0 commit comments

Comments
 (0)