diff --git a/src/common/m_boundary_common.fpp b/src/common/m_boundary_common.fpp index 575e2fa1fb..8689680370 100644 --- a/src/common/m_boundary_common.fpp +++ b/src/common/m_boundary_common.fpp @@ -171,23 +171,22 @@ contains subroutine s_finalize_boundary_common_module() if (bc_io) then - deallocate (bc_buffers(1, 1)%sf) - deallocate (bc_buffers(1, 2)%sf) + @:DEALLOCATE(bc_buffers(1, 1)%sf) + @:DEALLOCATE(bc_buffers(1, 2)%sf) #:if not MFC_CASE_OPTIMIZATION or num_dims > 1 if (n > 0) then - deallocate (bc_buffers(2, 1)%sf) - deallocate (bc_buffers(2, 2)%sf) + @:DEALLOCATE(bc_buffers(2, 1)%sf) + @:DEALLOCATE(bc_buffers(2, 2)%sf) #:if not MFC_CASE_OPTIMIZATION or num_dims > 2 if (p > 0) then - deallocate (bc_buffers(3, 1)%sf) - deallocate (bc_buffers(3, 2)%sf) + @:DEALLOCATE(bc_buffers(3, 1)%sf) + @:DEALLOCATE(bc_buffers(3, 2)%sf) end if #:endif end if #:endif end if - - deallocate (bc_buffers) + @:DEALLOCATE(bc_buffers) end subroutine s_finalize_boundary_common_module diff --git a/src/common/m_mpi_common.fpp b/src/common/m_mpi_common.fpp index a4b4a52563..50d3205211 100644 --- a/src/common/m_mpi_common.fpp +++ b/src/common/m_mpi_common.fpp @@ -1505,7 +1505,12 @@ contains impure subroutine s_finalize_mpi_common_module #ifdef MFC_MPI +#ifndef __NVCOMPILER_GPU_UNIFIED_MEM + @:DEALLOCATE(buff_send, buff_recv) +#else + $:GPU_EXIT_DATA(delete='[buff_send, buff_recv]') deallocate (buff_send, buff_recv) +#endif #endif end subroutine s_finalize_mpi_common_module diff --git a/src/common/m_variables_conversion.fpp b/src/common/m_variables_conversion.fpp index db7f80faf2..fe17b89c27 100644 --- a/src/common/m_variables_conversion.fpp +++ b/src/common/m_variables_conversion.fpp @@ -1237,6 +1237,9 @@ contains if (bubbles_euler) then @:DEALLOCATE(bubrs_vc) end if + if (viscous) then + @:DEALLOCATE(Res_vc) + end if #else @:DEALLOCATE(gammas, gs_min, pi_infs, ps_inf, cvs, qvs, qvps, Gs_vc) if (bubbles_euler) then diff --git a/src/simulation/m_derived_variables.fpp b/src/simulation/m_derived_variables.fpp index 6fc1518b58..bf1837813c 100644 --- a/src/simulation/m_derived_variables.fpp +++ b/src/simulation/m_derived_variables.fpp @@ -508,22 +508,24 @@ contains end if end if - if (probe_wrt) then - deallocate (accel_mag, x_accel) + if (probe_wrt .or. ib) then + @:DEALLOCATE(accel_mag) + @:DEALLOCATE(x_accel) if (n > 0) then - deallocate (y_accel) + @:DEALLOCATE(y_accel) if (p > 0) then - deallocate (z_accel) + @:DEALLOCATE(z_accel) end if end if + @:DEALLOCATE(fd_coeff_x) + if (n > 0) then + @:DEALLOCATE(fd_coeff_y) + end if + if (p > 0) then + @:DEALLOCATE(fd_coeff_z) + end if end if - ! Deallocating the variables that might have been used to bookkeep the finite-difference coefficients in the x-, y- and - ! z-directions - if (allocated(fd_coeff_x)) deallocate (fd_coeff_x) - if (allocated(fd_coeff_y)) deallocate (fd_coeff_y) - if (allocated(fd_coeff_z)) deallocate (fd_coeff_z) - end subroutine s_finalize_derived_variables_module end module m_derived_variables diff --git a/src/simulation/m_global_parameters.fpp b/src/simulation/m_global_parameters.fpp index a51ffd897b..7e22e8736a 100644 --- a/src/simulation/m_global_parameters.fpp +++ b/src/simulation/m_global_parameters.fpp @@ -934,6 +934,7 @@ contains @:DEALLOCATE(fluid_inv_re) if (bubbles_euler) then + @:DEALLOCATE(ptil) @:DEALLOCATE(qbmm_idx%rs, qbmm_idx%vs, qbmm_idx%ps, qbmm_idx%ms) if (qbmm) then @:DEALLOCATE(qbmm_idx%moms) diff --git a/src/simulation/m_hyperelastic.fpp b/src/simulation/m_hyperelastic.fpp index 90e78d04df..e0017a3685 100644 --- a/src/simulation/m_hyperelastic.fpp +++ b/src/simulation/m_hyperelastic.fpp @@ -256,6 +256,7 @@ contains do i = 1, b_size @:DEALLOCATE(btensor%vf(i)%sf) end do + @:DEALLOCATE(Gs_hyper) @:DEALLOCATE(fd_coeff_x_hyper) if (n > 0) then @:DEALLOCATE(fd_coeff_y_hyper) diff --git a/src/simulation/m_ibm.fpp b/src/simulation/m_ibm.fpp index 5d0380f981..d82fdcaefe 100644 --- a/src/simulation/m_ibm.fpp +++ b/src/simulation/m_ibm.fpp @@ -1519,17 +1519,13 @@ contains @:DEALLOCATE(ib_airfoil_grids(i)%lower) end if end do - if (allocated(models)) then - if (size(models) > 0) then - @:DEALLOCATE(models) - else - deallocate (models) - end if + @:DEALLOCATE(models) + end if + if (allocated(ghost_points)) then + @:DEALLOCATE(ghost_points) end if - if (collision_model > 0) call s_finalize_collisions_module() - #ifdef MFC_MPI if (num_procs > 1) then @:DEALLOCATE(send_ids, send_ft) diff --git a/src/simulation/m_rhs.fpp b/src/simulation/m_rhs.fpp index fae3b8be6b..0ab59a8454 100644 --- a/src/simulation/m_rhs.fpp +++ b/src/simulation/m_rhs.fpp @@ -1794,8 +1794,7 @@ contains end if if (mpp_lim .and. bubbles_euler) then - $:GPU_EXIT_DATA(delete='[alf_sum%sf]') - deallocate (alf_sum%sf) + @:DEALLOCATE(alf_sum%sf) end if if (.not. igr) then @@ -1839,6 +1838,32 @@ contains end do @:DEALLOCATE(flux_n, flux_src_n, flux_gsrc_n) + do i = 1, num_dims + do l = eqn_idx%mom%beg, eqn_idx%mom%end + @:DEALLOCATE(qL_prim(i)%vf(l)%sf) + @:DEALLOCATE(qR_prim(i)%vf(l)%sf) + end do + @:DEALLOCATE(qL_prim(i)%vf, qR_prim(i)%vf) + end do + @:DEALLOCATE(qL_prim, qR_prim) + end if + + if (alt_soundspeed) then + @:DEALLOCATE(blkmod1) + end if + + if (qbmm) then + do i = 0, 2 + do j = 0, 2 + do l = 1, nb + @:DEALLOCATE(mom_3d(i, j, l)%sf) + end do + end do + end do + do i = 1, nmomsp + @:DEALLOCATE(mom_sp(i)%sf) + end do + @:DEALLOCATE(mom_sp, mom_3d) end if end subroutine s_finalize_rhs_module diff --git a/src/simulation/m_time_steppers.fpp b/src/simulation/m_time_steppers.fpp index 7420404ef2..53b6db6740 100644 --- a/src/simulation/m_time_steppers.fpp +++ b/src/simulation/m_time_steppers.fpp @@ -977,6 +977,29 @@ contains call s_close_run_time_information_file() end if + if (chemistry) then + @:DEALLOCATE(q_T_sf%sf) + end if + @:DEALLOCATE(pb_ts(1)%sf) + @:DEALLOCATE(pb_ts(2)%sf) + @:DEALLOCATE(rhs_pb) + @:DEALLOCATE(pb_ts) + @:DEALLOCATE(mv_ts(1)%sf) + @:DEALLOCATE(mv_ts(2)%sf) + @:DEALLOCATE(rhs_mv) + @:DEALLOCATE(mv_ts) + if (cfl_dt) then + @:DEALLOCATE(max_dt) + end if + do i = 1, num_dims + @:DEALLOCATE(bc_type(i,1)%sf) + @:DEALLOCATE(bc_type(i,2)%sf) + end do + @:DEALLOCATE(bc_type) + if (any(time_stepper == (/1, 2, 3/))) then + @:DEALLOCATE(rk_coef) + end if + end subroutine s_finalize_time_steppers_module end module m_time_steppers diff --git a/tests/coverage_map.json.gz b/tests/coverage_map.json.gz deleted file mode 100644 index ee478b6a9f..0000000000 Binary files a/tests/coverage_map.json.gz and /dev/null differ