Merge branch 'MFlowCode:master' into master

Author: haochey

src/simulation/m_cbc.fpp

@@ -638,6 +638,7 @@ contains
         if (cbc_dir == ${CBC_DIR}$) then
 
             ! PI2 of flux_rs_vf and flux_src_rs_vf at j = 1/2 ==================
+
             if (weno_order == 3) then
 
                 call s_convert_primitive_to_flux_variables(q_prim_rs${XYZ}$_vf, &
@@ -720,6 +721,7 @@ contains
             end if
             ! ==================================================================
 
+
             ! FD2 or FD4 of RHS at j = 0 =======================================
             !$acc parallel loop collapse(2) gang vector default(present) private(alpha_rho, vel, adv, mf, dvel_ds, dadv_ds, Re_cbc, dalpha_rho_ds,dvel_dt, dadv_dt, dalpha_rho_dt,L, lambda)
             do r = is3%beg, is3%end
@@ -952,6 +954,7 @@ contains
 
                 end do
             end do
+
         end if
         #:endfor
 
@@ -1063,7 +1066,7 @@ contains
 
             if(riemann_solver == 1) then
 !$acc parallel loop collapse(4) gang vector default(present)
-                do i = 1, advxe
+                do i = advxb, advxe
                     do r = is3%beg, is3%end
                         do k = is2%beg, is2%end
                             do j = -1, buff_size
@@ -1087,7 +1090,6 @@ contains
             end if
 
 
-
             ! END: Reshaping Inputted Data in x-direction ======================
 
             ! Reshaping Inputted Data in y-direction ===========================
@@ -1141,7 +1143,7 @@ contains
 
             if(riemann_solver == 1) then
 !$acc parallel loop collapse(4) gang vector default(present)
-                do i = 1, advxe
+                do i = advxb, advxe
                     do r = is3%beg, is3%end
                         do k = is2%beg, is2%end
                             do j = -1, buff_size
@@ -1162,7 +1164,7 @@ contains
                         end do
                     end do
                 end do
-            end if                
+            end if           
 
 
             ! END: Reshaping Inputted Data in y-direction ======================
@@ -1218,7 +1220,7 @@ contains
 
             if(riemann_solver == 1) then
 !$acc parallel loop collapse(4) gang vector default(present)
-                do i = 1, advxe
+                do i = advxb, advxe
                     do r = is3%beg, is3%end
                         do k = is2%beg, is2%end
                             do j = -1, buff_size
@@ -1241,7 +1243,6 @@ contains
                 end do                
             end if
 
-
         end if
         ! END: Reshaping Inputted Data in z-direction ======================
 
@@ -1303,7 +1304,7 @@ contains
 
             if(riemann_solver == 1) then
 !$acc parallel loop collapse(4) gang vector default(present)
-                do i = 1, advxe
+                do i = advxb, advxe
                     do r = is3%beg, is3%end
                         do k = is2%beg, is2%end
                             do j = -1, buff_size
@@ -1355,7 +1356,7 @@ contains
 
             if(riemann_solver == 1) then
 !$acc parallel loop collapse(4) gang vector default(present)
-                do i = 1, advxe
+                do i = advxb, advxe
                     do r = is3%beg, is3%end
                         do k = is2%beg, is2%end
                             do j = -1, buff_size
@@ -1408,7 +1409,7 @@ contains
 
             if(riemann_solver == 1) then
 !$acc parallel loop collapse(4) gang vector default(present)
-                do i = 1, advxe
+                do i = advxb, advxe
                     do r = is3%beg, is3%end
                         do k = is2%beg, is2%end
                             do j = -1, buff_size

src/simulation/m_rhs.fpp

@@ -540,7 +540,7 @@ contains
                     flux_src_n(i)%vf(l)%sf => &
                         flux_src_n(1)%vf(l)%sf
 
-                    !$acc enter data attach(flux_n(i)%vf(l)%sf,flux_src_n(i)%vf(l)%sf)
+                    !$acc enter data attach(flux_n(i)%vf(l)%sf, flux_src_n(i)%vf(l)%sf)
                 end do
 
             end if
@@ -666,6 +666,7 @@ contains
             end do
         end do
 
+
         call nvtxStartRange("RHS-MPI")
         call s_populate_conservative_variables_buffers()
         call nvtxEndRange
@@ -735,7 +736,7 @@ contains
             ix%end = m - ix%beg; iy%end = n - iy%beg; iz%end = p - iz%beg
             ! ===============================================================
             ! Reconstructing Primitive/Conservative Variables ===============
-            
+
             if (all(Re_size == 0)) then
                     iv%beg = 1; iv%end = sys_size
                 !call nvtxStartRange("RHS-WENO")
@@ -830,7 +831,6 @@ contains
 
             ! ===============================================================
 
-
             if (alt_soundspeed) then
 !$acc parallel loop collapse(3) gang vector default(present)
                 do l = 0, p
@@ -856,13 +856,16 @@ contains
             end if
 
             call nvtxStartRange("RHS_Flux_Add")
-            if (id == 1) then
 
+            
+            if (id == 1) then
+                
                 if (bc_x%beg <= -5) then
                     call s_cbc(q_prim_qp%vf, flux_n(id)%vf, &
                                flux_src_n(id)%vf, id, -1, ix, iy, iz)
                 end if
 
+
                 if (bc_x%end <= -5) then
                     call s_cbc(q_prim_qp%vf, flux_n(id)%vf, &
                                flux_src_n(id)%vf, id, 1, ix, iy, iz)
@@ -1648,12 +1651,14 @@ contains
             ! RHS additions for hypoelasticity
             call nvtxStartRange("RHS_Hypoelasticity")
 
+
             if (hypoelasticity) then
 
                 call s_compute_hypoelastic_rhs(id, q_prim_qp%vf, rhs_vf)
 
             end if
             call nvtxEndRange
+
         end do
         ! END: Dimensional Splitting Loop =================================