fixing PR part 4

dgvacarevelo · Dec 10, 2024 · 1fb0954 · 1fb0954
2 parents c2b40ec + 47bfb4b
commit 1fb0954
Show file tree

Hide file tree

Showing 11 changed files with 1,545 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -56,6 +56,8 @@ examples/*/workloads/
 examples/*/run-*/
 examples/*/logs/
 examples/**/*.f90
+!examples/3D_lag_bubbles_shbubcollapse/input/lag_bubbles.dat
+!examples/3D_lag_bubbles_bubblescreen/input/lag_bubbles.dat
 workloads/
 
 benchmarks/*batch/*/

diff --git a/examples/3D_lagrange_bubblescreen/input/lag_bubbles.dat b/examples/3D_lagrange_bubblescreen/input/lag_bubbles.dat
diff --git a/examples/3D_lagrange_shbubcollapse/case.py b/examples/3D_lagrange_shbubcollapse/case.py
@@ -152,7 +152,7 @@
     # Lagrangian Bubbles ===========================
      'bubbles_lagrange'                 : 'T',
      'bubble_model'                     : 2,    # Keller-Miksis model
-     'rkck_adap_dt'                     : 'F',  # Activate adaptive time stepper
+     'rkck_adap_dt'                     : 'T',  # Activate adaptive time stepper
      'rkck_tolerance'                   : 1.0e-05,
      'lag_params%nBubs_glb'             : 1,
      'lag_params%solver_approach'       : 2,    # Two-way coupled

diff --git a/examples/3D_lagrange_shbubcollapse/input/lag_bubbles.dat b/examples/3D_lagrange_shbubcollapse/input/lag_bubbles.dat
@@ -0,0 +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
diff --git a/src/simulation/m_bubbles_EL_kernels.fpp b/src/simulation/m_bubbles_EL_kernels.fpp
@@ -124,7 +124,7 @@ contains
         smearGridz = smearGrid
         if (p == 0) smearGridz = 1
 
-        !$acc parallel loop gang vector default(present) private(l, s_coord, cell, center) copyin(smearGrid, smearGridz)
+        !$acc parallel loop gang vector default(present) private(nodecoord, l, s_coord, cell, center) copyin(smearGrid, smearGridz)
         do l = 1, nBubs
             nodecoord(1:3) = 0
             center(1:3) = 0.0d0
@@ -138,7 +138,7 @@ contains
             strength_vol = volpart
             strength_vel = 4.0d0*pi*lbk_rad(l, 2)**2*lbk_vel(l, 2)
 
-            !$acc loop collapse(3) private(i, j, k, cellaux, nodecoord)
+            !$acc loop collapse(3) private(cellaux, nodecoord)
             do i = 1, smearGrid
                 do j = 1, smearGrid
                     do k = 1, smearGridz

diff --git a/tests/18A29336/golden-metadata.txt b/tests/18A29336/golden-metadata.txt
diff --git a/tests/2A2683D2/golden-metadata.txt b/tests/2A2683D2/golden-metadata.txt
diff --git a/tests/2A2683D2/golden.txt b/tests/2A2683D2/golden.txt
Original file line number	Diff line number	Diff line change
		@@ -0,0 +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