save

Author: henryleberre

src/simulation/m_chemistry.fpp

@@ -17,10 +17,8 @@ module m_chemistry
 
     implicit none
 
-    type(int_bounds_info), private :: ix, iy, iz
     type(scalar_field), private :: grads(1:3)
 
-    !$acc declare create(ix, iy, iz)
     !$acc declare create(grads)
 
 contains
@@ -29,16 +27,11 @@ contains
 
         integer :: i
 
-        ix%beg = -buff_size
-        if (n > 0) then; iy%beg = -buff_size; else; iy%beg = 0; end if
-        if (p > 0) then; iz%beg = -buff_size; else; iz%beg = 0; end if
-
-        ix%end = m - ix%beg; iy%end = n - iy%beg; iz%end = p - iz%beg
-
-        !$acc update device(ix, iy, iz)
-
         do i = 1, 3
-            @:ALLOCATE(grads(i)%sf(ix%beg:ix%end, iy%beg:iy%end, iz%beg:iz%end))
+            @:ALLOCATE(grads(i)%sf(&
+                & idwbuff(1)%beg:idwbuff(1)%end, &
+                & idwbuff(2)%beg:idwbuff(2)%end, &
+                & idwbuff(3)%beg:idwbuff(3)%end))
         end do
 
         !$acc kernels
@@ -78,9 +71,9 @@ contains
         #:if chemistry
 
             !$acc parallel loop collapse(3) private(rho)
-            do x = 0, m
-                do y = 0, n
-                    do z = 0, p
+            do x = idwint(1)%beg, idwint(1)%end
+                do y = idwint(2)%beg, idwint(2)%end
+                    do z = idwint(3)%beg, idwint(3)%end
 
                         rho = 0d0
                         do eqn = chemxb, chemxe
@@ -133,9 +126,9 @@ contains
         integer :: eqn
 
         !$acc parallel loop collapse(4)
-        do x = 0, m
-            do y = 0, n
-                do z = 0, p
+        do x = idwint(1)%beg, idwint(1)%end
+            do y = idwint(2)%beg, idwint(2)%end
+                do z = idwint(3)%beg, idwint(3)%end
 
                     do eqn = chemxb, chemxe
                         q_cons_qp(eqn)%sf(x, y, z) = max(0d0, q_cons_qp(eqn)%sf(x, y, z))

src/simulation/m_global_parameters.fpp

@@ -238,6 +238,15 @@ module m_global_parameters
 
     !$acc declare create(bub_idx)
 
+    
+    ! Cell Indices for the interior points (O-m, O-n, 0-p).
+    type(int_bounds_info) :: idwint(1:3)
+    !$acc declare create(idwint)
+
+    ! Cell Indices for the entire domain, including the buffer region.
+    type(int_bounds_info) :: idwbuff(1:3)
+    !$acc declare create(idwbuff)
+
     !> @name The number of fluids, along with their identifying indexes, respectively,
     !! for which viscous effects, e.g. the shear and/or the volume Reynolds (Re)
     !! numbers, will be non-negligible.
@@ -703,8 +712,6 @@ contains
         integer :: i, j, k
         integer :: fac
 
-        type(int_bounds_info) :: ix, iy, iz
-
         #:if not MFC_CASE_OPTIMIZATION
             ! Determining the degree of the WENO polynomials
             weno_polyn = (weno_order - 1)/2
@@ -1038,18 +1045,30 @@ contains
         end if
 
         ! Configuring Coordinate Direction Indexes =========================
-        if (bubbles) then
-            ix%beg = -buff_size; iy%beg = 0; iz%beg = 0
-            if (n > 0) then
-                iy%beg = -buff_size
-                if (p > 0) then
-                    iz%beg = -buff_size
-                end if
+        idwint(1)%beg = 0; idwint(2)%beg = 0; idwint(3)%beg = 0
+        idwint(1)%end = m; idwint(2)%end = n; idwint(3)%end = p
+
+        idwbuff(1)%beg = -buff_size
+        idwbuff(1)%end = m + buff_size
+        if (num_dims > 1) then
+            idwbuff(2)%beg = -buff_size
+            idwbuff(2)%end = n + buff_size
+            if (num_dims > 2) then
+                idwbuff(3)%beg = -buff_size
+                idwbuff(3)%end = p + buff_size
             end if
+        end if
+
+        !$acc update device(idwint, idwbuff)
 
-            ix%end = m - ix%beg; iy%end = n - iy%beg; iz%end = p - iz%beg
+        ! ==================================================================
 
-            @:ALLOCATE_GLOBAL(ptil(ix%beg:ix%end, iy%beg:iy%end, iz%beg:iz%end))
+        ! Configuring Coordinate Direction Indexes =========================
+        if (bubbles) then
+            @:ALLOCATE_GLOBAL(ptil(&
+                & idwbuff(1)%beg:idwbuff(1)%end, &
+                & idwbuff(2)%beg:idwbuff(2)%end, &
+                & idwbuff(3)%beg:idwbuff(3)%end))
         end if
 
         if (probe_wrt) then

src/simulation/m_rhs.fpp

@@ -172,12 +172,6 @@ module m_rhs
     type(int_bounds_info) :: ix, iy, iz
     !$acc declare create(ix, iy, iz)
 
-    type(int_bounds_info) :: ibounds_interior(1:3)
-    !$acc declare create(ibounds_interior)
-
-    type(int_bounds_info) :: ibounds_wbuffer(1:3)
-    !$acc declare create(ibounds_wbuffer)
-
     type(int_bounds_info) :: is1, is2, is3
     !$acc declare create(is1, is2, is3)
 
@@ -241,25 +235,10 @@ contains
 
         integer :: i, j, k, l, id !< Generic loop iterators
 
-        ! Configuring Coordinate Direction Indexes =========================
-        ibounds_interior(1)%beg = 0; ibounds_interior(2)%beg = 0; ibounds_interior(3)%beg = 0
-        ibounds_interior(1)%end = m; ibounds_interior(2)%end = n; ibounds_interior(3)%end = p
-
-        ibounds_wbuffer(1)%beg = -buff_size
-        ibounds_wbuffer(2)%beg = 0
-        ibounds_wbuffer(3)%beg = 0
-        if (num_dims > 1) then ibounds_wbuffer(2)%beg = -buff_size; end if
-        if (num_dims > 2) then ibounds_wbuffer(3)%beg = -buff_size; end if
-
-        ibounds_wbuffer(1)%end = m + buff_size
-        ibounds_wbuffer(2)%end = n + buff_size
-        ibounds_wbuffer(3)%end = p + buff_size
-
-        ix = ibounds_interior(1); iy = ibounds_interior(2); iz = ibounds_interior(3)
-        ! ==================================================================
+        !$acc enter data copyin(idwint, idwbuff, ix, iy, iz)
+        !$acc update device(idwint, idwbuff, ix, iy, iz)
 
-        !$acc enter data copyin(ibounds_interior, ibounds_wbuffer, ix, iy, iz)
-        !$acc update device(ibounds_interior, ibounds_wbuffer, ix, iy, iz)
+        ix = idwbuff(1); iy = idwbuff(2); iz = idwbuff(3)
 
         ixt = ix; iyt = iy; izt = iz
 
@@ -819,7 +798,7 @@ contains
             q_cons_qp%vf, &
             q_prim_qp%vf, &
             gm_alpha_qp%vf, &
-            ibounds_interior(1), ibounds_interior(2), ibounds_interior(3))
+            idwint(1), idwint(2), idwint(3))
         call nvtxEndRange
 
         call nvtxStartRange("RHS-MPI")