Skip to content

Commit 1fb0954

Browse files
author
Diego Vaca
committed
fixing PR part 4
2 parents c2b40ec + 47bfb4b commit 1fb0954

File tree

11 files changed

+1545
-18
lines changed

11 files changed

+1545
-18
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ examples/*/workloads/
5656
examples/*/run-*/
5757
examples/*/logs/
5858
examples/**/*.f90
59+
!examples/3D_lag_bubbles_shbubcollapse/input/lag_bubbles.dat
60+
!examples/3D_lag_bubbles_bubblescreen/input/lag_bubbles.dat
5961
workloads/
6062

6163
benchmarks/*batch/*/

examples/3D_lagrange_bubblescreen/input/lag_bubbles.dat

Lines changed: 1194 additions & 0 deletions
Large diffs are not rendered by default.

examples/3D_lagrange_shbubcollapse/case.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
# Lagrangian Bubbles ===========================
153153
'bubbles_lagrange' : 'T',
154154
'bubble_model' : 2, # Keller-Miksis model
155-
'rkck_adap_dt' : 'F', # Activate adaptive time stepper
155+
'rkck_adap_dt' : 'T', # Activate adaptive time stepper
156156
'rkck_tolerance' : 1.0e-05,
157157
'lag_params%nBubs_glb' : 1,
158158
'lag_params%solver_approach' : 2, # Two-way coupled
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.000000E+00 0.080000E-01 0.000000E+00

src/simulation/m_bubbles_EL_kernels.fpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ contains
124124
smearGridz = smearGrid
125125
if (p == 0) smearGridz = 1
126126

127-
!$acc parallel loop gang vector default(present) private(l, s_coord, cell, center) copyin(smearGrid, smearGridz)
127+
!$acc parallel loop gang vector default(present) private(nodecoord, l, s_coord, cell, center) copyin(smearGrid, smearGridz)
128128
do l = 1, nBubs
129129
nodecoord(1:3) = 0
130130
center(1:3) = 0.0d0
@@ -138,7 +138,7 @@ contains
138138
strength_vol = volpart
139139
strength_vel = 4.0d0*pi*lbk_rad(l, 2)**2*lbk_vel(l, 2)
140140

141-
!$acc loop collapse(3) private(i, j, k, cellaux, nodecoord)
141+
!$acc loop collapse(3) private(cellaux, nodecoord)
142142
do i = 1, smearGrid
143143
do j = 1, smearGrid
144144
do k = 1, smearGridz

tests/18A29336/golden-metadata.txt

Lines changed: 15 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/2A2683D2/golden-metadata.txt

Lines changed: 150 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/2A2683D2/golden.txt

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)