Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions src/common/m_boundary_common.fpp
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 5 additions & 0 deletions src/common/m_mpi_common.fpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions src/common/m_variables_conversion.fpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 12 additions & 10 deletions src/simulation/m_derived_variables.fpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions src/simulation/m_global_parameters.fpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions src/simulation/m_hyperelastic.fpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
12 changes: 4 additions & 8 deletions src/simulation/m_ibm.fpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
29 changes: 27 additions & 2 deletions src/simulation/m_rhs.fpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
23 changes: 23 additions & 0 deletions src/simulation/m_time_steppers.fpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Binary file removed tests/coverage_map.json.gz
Binary file not shown.
Loading