Memory fix

wilfonba · Feb 19, 2025 · 0a26135 · 0a26135
1 parent 87023bf
commit 0a26135
Showing 1 changed file with 54 additions and 53 deletions.
diff --git a/src/simulation/m_igr.fpp b/src/simulation/m_igr.fpp
@@ -53,76 +53,77 @@ contains
         !bcxb = -1; bcxe = -1; bcyb = -1; bcye = -1; bczb = -1; bcze = -1
         !$acc update device(bcxb, bcxe, bcyb, bcye, bczb, bcze)
 
-
-        #:for VAR in ['rho_igr', 'dux', 'duy', 'dvx', 'dvy', 'jac', 'jac_rhs', &
-                    & 'jac_old', 'fd_coeff']
-            @:ALLOCATE(${VAR}$(idwbuff(1)%beg:idwbuff(1)%end, &
-                         idwbuff(2)%beg:idwbuff(2)%end, &
-                         idwbuff(3)%beg:idwbuff(3)%end))
-        #:endfor
-
-        if (p > 0) then
-            #:for VAR in ['duz', 'dvz', 'dwx', 'dwy', 'dwz']
-                @:ALLOCATE(${VAR}$(idwbuff(1)%beg:idwbuff(1)%end, &
-                         idwbuff(2)%beg:idwbuff(2)%end, &
-                         idwbuff(3)%beg:idwbuff(3)%end))
-
-            #:endfor
+        if (viscous) then
+            @:ALLOCATE(Res(1:2, 1:maxval(Re_size)))
+            do i = 1, 2
+                do j = 1, Re_size(i)
+                    Res(i, j) = fluid_pp(Re_idx(i, j))%Re(i)
+                end do
+            end do
+            !$acc update device(Res, Re_idx, Re_size)
         end if
 
-        @:ALLOCATE(qL_rs_vf(idwbuff(1)%beg:idwbuff(1)%end, &
-                            idwbuff(2)%beg:idwbuff(2)%end, &
-                            idwbuff(3)%beg:idwbuff(3)%end, &
-                            1:sys_size))
-        @:ALLOCATE(qR_rs_vf(idwbuff(1)%beg:idwbuff(1)%end, &
+        if(igr) then 
+
+            @:ALLOCATE(qL_rs_vf(idwbuff(1)%beg:idwbuff(1)%end, &
                             idwbuff(2)%beg:idwbuff(2)%end, &
                             idwbuff(3)%beg:idwbuff(3)%end, &
-                            1:sys_size))
-
-        if(viscous) then
-            #:for VAR in ['duLx', 'duLy', 'dvLx', 'dvLy', 'duRx', 'duRy', &
-                        & 'dvRx', 'dvRy']
+                                1:sys_size))
+            @:ALLOCATE(qR_rs_vf(idwbuff(1)%beg:idwbuff(1)%end, &
+                                idwbuff(2)%beg:idwbuff(2)%end, &
+                                idwbuff(3)%beg:idwbuff(3)%end, &
+                                1:sys_size))
+            #:for VAR in ['rho_igr', 'dux', 'duy', 'dvx', 'dvy', 'jac', 'jac_rhs', &
+                        & 'jac_old', 'fd_coeff']
                 @:ALLOCATE(${VAR}$(idwbuff(1)%beg:idwbuff(1)%end, &
-                                  idwbuff(2)%beg:idwbuff(2)%end, &
-                                  idwbuff(3)%beg:idwbuff(3)%end))
+                             idwbuff(2)%beg:idwbuff(2)%end, &
+                             idwbuff(3)%beg:idwbuff(3)%end))
             #:endfor
 
             if (p > 0) then
-                #:for VAR in ['duLz', 'dvLz', 'dwLz', 'dwLx', 'dwLy', &
-                            & 'duRz', 'dvRz', 'dwRz', 'dwRx', 'dwRy']
+                #:for VAR in ['duz', 'dvz', 'dwx', 'dwy', 'dwz']
+                    @:ALLOCATE(${VAR}$(idwbuff(1)%beg:idwbuff(1)%end, &
+                             idwbuff(2)%beg:idwbuff(2)%end, &
+                             idwbuff(3)%beg:idwbuff(3)%end))
+
+                #:endfor
+            end if
+
+            if(viscous) then
+                #:for VAR in ['duLx', 'duLy', 'dvLx', 'dvLy', 'duRx', 'duRy', &
+                            & 'dvRx', 'dvRy']
                     @:ALLOCATE(${VAR}$(idwbuff(1)%beg:idwbuff(1)%end, &
                                       idwbuff(2)%beg:idwbuff(2)%end, &
                                       idwbuff(3)%beg:idwbuff(3)%end))
                 #:endfor
+
+                if (p > 0) then
+                    #:for VAR in ['duLz', 'dvLz', 'dwLz', 'dwLx', 'dwLy', &
+                                & 'duRz', 'dvRz', 'dwRz', 'dwRx', 'dwRy']
+                        @:ALLOCATE(${VAR}$(idwbuff(1)%beg:idwbuff(1)%end, &
+                                          idwbuff(2)%beg:idwbuff(2)%end, &
+                                          idwbuff(3)%beg:idwbuff(3)%end))
+                    #:endfor
+                end if
             end if
-        end if
 
-        @:ALLOCATE(FR(idwbuff(1)%beg:idwbuff(1)%end, &
-                      idwbuff(2)%beg:idwbuff(2)%end, &
-                      idwbuff(3)%beg:idwbuff(3)%end))
-        @:ALLOCATE(FL(idwbuff(1)%beg:idwbuff(1)%end, &
-                      idwbuff(2)%beg:idwbuff(2)%end, &
-                      idwbuff(3)%beg:idwbuff(3)%end))
+            @:ALLOCATE(FR(idwbuff(1)%beg:idwbuff(1)%end, &
+                          idwbuff(2)%beg:idwbuff(2)%end, &
+                          idwbuff(3)%beg:idwbuff(3)%end))
+            @:ALLOCATE(FL(idwbuff(1)%beg:idwbuff(1)%end, &
+                          idwbuff(2)%beg:idwbuff(2)%end, &
+                          idwbuff(3)%beg:idwbuff(3)%end))
 
-        !$acc parallel loop collapse(3) gang vector default(present)
-        do l = idwbuff(3)%beg, idwbuff(3)%end
-            do k = idwbuff(2)%beg, idwbuff(2)%end
-                do j = idwbuff(1)%beg, idwbuff(1)%end
-                    jac(j, k, l) = 0._wp
-                    jac_old(j, k, l) = 0._wp
-                    jac_rhs(j, k, l) = 0._wp
-               end do
-            end do
-        end do
-
-        if (viscous) then
-            @:ALLOCATE(Res(1:2, 1:maxval(Re_size)))
-            do i = 1, 2
-                do j = 1, Re_size(i)
-                    Res(i, j) = fluid_pp(Re_idx(i, j))%Re(i)
+            !$acc parallel loop collapse(3) gang vector default(present)
+            do l = idwbuff(3)%beg, idwbuff(3)%end
+                do k = idwbuff(2)%beg, idwbuff(2)%end
+                    do j = idwbuff(1)%beg, idwbuff(1)%end
+                        jac(j, k, l) = 0._wp
+                        jac_old(j, k, l) = 0._wp
+                        jac_rhs(j, k, l) = 0._wp
+                   end do
                 end do
             end do
-            !$acc update device(Res, Re_idx, Re_size)
         end if
 
     end subroutine s_initialize_igr_module