From b3686a7241bebeebb7cd9fa07efa520c8dc348d7 Mon Sep 17 00:00:00 2001 From: wilfonba Date: Sun, 9 Mar 2025 18:25:45 -0400 Subject: [PATCH] Frontier fix --- src/common/m_boundary_conditions.fpp | 14 +++++++------- src/common/m_mpi_common.fpp | 3 +-- src/pre_process/m_perturbation.fpp | 2 -- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/common/m_boundary_conditions.fpp b/src/common/m_boundary_conditions.fpp index 252f68875..391fed133 100644 --- a/src/common/m_boundary_conditions.fpp +++ b/src/common/m_boundary_conditions.fpp @@ -215,7 +215,7 @@ contains subroutine s_ghost_cell_extrapolation(q_prim_vf, pb, mv, bc_dir, bc_loc) type(scalar_field), dimension(sys_size), intent(inout) :: q_prim_vf - real(wp), dimension(idwbuff(1)%beg:, idwbuff(2)%beg:, idwbuff(3)%beg:, 1:, 1:), intent(inout) :: pb, mv + real(wp), optional, dimension(idwbuff(1)%beg:, idwbuff(2)%beg:, idwbuff(3)%beg:, 1:, 1:), intent(inout) :: pb, mv integer, intent(in) :: bc_dir, bc_loc integer :: j, k, l, q, i @@ -325,7 +325,7 @@ contains subroutine s_symmetry(q_prim_vf, pb, mv, bc_dir, bc_loc) type(scalar_field), dimension(sys_size), intent(inout) :: q_prim_vf - real(wp), dimension(idwbuff(1)%beg:, idwbuff(2)%beg:, idwbuff(3)%beg:, 1:, 1:), intent(inout) :: pb, mv + real(wp), optional, dimension(idwbuff(1)%beg:, idwbuff(2)%beg:, idwbuff(3)%beg:, 1:, 1:), intent(inout) :: pb, mv integer, intent(in) :: bc_dir, bc_loc integer :: j, k, l, q, i @@ -638,7 +638,7 @@ contains subroutine s_periodic(q_prim_vf, pb, mv, bc_dir, bc_loc) type(scalar_field), dimension(sys_size), intent(inout) :: q_prim_vf - real(wp), dimension(idwbuff(1)%beg:, idwbuff(2)%beg:, idwbuff(3)%beg:, 1:, 1:), intent(inout) :: pb, mv + real(wp), optional, dimension(idwbuff(1)%beg:, idwbuff(2)%beg:, idwbuff(3)%beg:, 1:, 1:), intent(inout) :: pb, mv integer, intent(in) :: bc_dir, bc_loc integer :: j, k, l, q, i @@ -857,7 +857,7 @@ contains subroutine s_axis(q_prim_vf, pb, mv, bc_dir, bc_loc) type(scalar_field), dimension(sys_size), intent(inout) :: q_prim_vf - real(wp), dimension(idwbuff(1)%beg:, idwbuff(2)%beg:, idwbuff(3)%beg:, 1:, 1:), intent(inout) :: pb, mv + real(wp), optional, dimension(idwbuff(1)%beg:, idwbuff(2)%beg:, idwbuff(3)%beg:, 1:, 1:), intent(inout) :: pb, mv integer, intent(in) :: bc_dir, bc_loc integer :: j, k, l, q, i @@ -930,7 +930,7 @@ contains subroutine s_slip_wall(q_prim_vf, pb, mv, bc_dir, bc_loc) type(scalar_field), dimension(sys_size), intent(inout) :: q_prim_vf - real(wp), dimension(idwbuff(1)%beg:, idwbuff(2)%beg:, idwbuff(3)%beg:, 1:, 1:), intent(inout) :: pb, mv + real(wp), optional, dimension(idwbuff(1)%beg:, idwbuff(2)%beg:, idwbuff(3)%beg:, 1:, 1:), intent(inout) :: pb, mv integer, intent(in) :: bc_dir, bc_loc integer :: j, k, l, q, i @@ -1071,7 +1071,7 @@ contains subroutine s_no_slip_wall(q_prim_vf, pb, mv, bc_dir, bc_loc) type(scalar_field), dimension(sys_size), intent(inout) :: q_prim_vf - real(wp), dimension(idwbuff(1)%beg:, idwbuff(2)%beg:, idwbuff(3)%beg:, 1:, 1:), intent(inout) :: pb, mv + real(wp), optional, dimension(idwbuff(1)%beg:, idwbuff(2)%beg:, idwbuff(3)%beg:, 1:, 1:), intent(inout) :: pb, mv integer, intent(in) :: bc_dir, bc_loc integer :: j, k, l, q, i @@ -1247,7 +1247,7 @@ contains subroutine s_qbmm_extrapolation(pb, mv, bc_dir, bc_loc) - real(wp), dimension(idwbuff(1)%beg:, idwbuff(2)%beg:, idwbuff(3)%beg:, 1:, 1:), intent(inout) :: pb, mv + real(wp), optional, dimension(idwbuff(1)%beg:, idwbuff(2)%beg:, idwbuff(3)%beg:, 1:, 1:), intent(inout) :: pb, mv integer, intent(in) :: bc_dir, bc_loc integer :: j, k, l, q, i diff --git a/src/common/m_mpi_common.fpp b/src/common/m_mpi_common.fpp index 8083275fa..f4c3bf871 100644 --- a/src/common/m_mpi_common.fpp +++ b/src/common/m_mpi_common.fpp @@ -647,7 +647,7 @@ contains #ifdef MFC_MPI call nvtxStartRange("RHS-COMM-PACKBUF") - !$acc update device(v_size) +!$acc update device(v_size) #ifdef MFC_SIMULATION if (qbmm .and. .not. polytropic) then @@ -874,7 +874,6 @@ contains p_recv, buffer_count, mpi_p, src_proc, recv_tag, & MPI_COMM_WORLD, MPI_STATUS_IGNORE, ierr) - call nvtxEndRange ! RHS-MPI-SENDRECV-(NO)-RDMA #:if rdma_mpi diff --git a/src/pre_process/m_perturbation.fpp b/src/pre_process/m_perturbation.fpp index c21a90764..79d352ea3 100644 --- a/src/pre_process/m_perturbation.fpp +++ b/src/pre_process/m_perturbation.fpp @@ -629,7 +629,6 @@ contains call s_populate_variables_buffers(q_prim_vf) ! Perform smoothing and store in temp array - if (n == 0) then do j = 0, m do i = 1, sys_size @@ -675,7 +674,6 @@ contains end do end do end do - end do end subroutine s_elliptic_smoothing