Skip to content

Commit 88f1bd0

Browse files
sbryngelsonsbryngelson
authored
Merge branch 'master' into BB-src
2 parents 6d355bc + 6742230 commit 88f1bd0

20 files changed

+292
-304
lines changed

‎src/common/include/macros.fpp‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,6 @@
2222
!$acc exit data delete(${', '.join(args)}$)
2323
#:enddef DEALLOCATE
2424

25-
#:def ALLOCATE_GLOBAL(*args)
26-
@:LOG({'@:ALLOCATE_GLOBAL(${re.sub(' +', ' ', ', '.join(args))}$)'})
27-
28-
allocate (${', '.join(args)}$)
29-
30-
#:enddef ALLOCATE_GLOBAL
31-
32-
#:def DEALLOCATE_GLOBAL(*args)
33-
@:LOG({'@:DEALLOCATE_GLOBAL(${re.sub(' +', ' ', ', '.join(args))}$)'})
34-
35-
deallocate (${', '.join(args)}$)
36-
37-
#:enddef DEALLOCATE_GLOBAL
38-
3925
#:def ACC_SETUP_VFs(*args)
4026
#ifdef _CRAYFTN
4127
block

‎src/common/m_helper.fpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,9 @@ contains
121121
rhol0 = rhoref
122122
pl0 = pref
123123
#ifdef MFC_SIMULATION
124-
@:ALLOCATE_GLOBAL(pb0(nb), mass_n0(nb), mass_v0(nb), Pe_T(nb))
125-
@:ALLOCATE_GLOBAL(k_n(nb), k_v(nb), omegaN(nb))
126-
@:ALLOCATE_GLOBAL(Re_trans_T(nb), Re_trans_c(nb), Im_trans_T(nb), Im_trans_c(nb))
124+
@:ALLOCATE(pb0(nb), mass_n0(nb), mass_v0(nb), Pe_T(nb))
125+
@:ALLOCATE(k_n(nb), k_v(nb), omegaN(nb))
126+
@:ALLOCATE(Re_trans_T(nb), Re_trans_c(nb), Im_trans_T(nb), Im_trans_c(nb))
127127
#else
128128
@:ALLOCATE(pb0(nb), mass_n0(nb), mass_v0(nb), Pe_T(nb))
129129
@:ALLOCATE(k_n(nb), k_v(nb), omegaN(nb))

‎src/common/m_variables_conversion.fpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -621,14 +621,14 @@ contains
621621
!$acc enter data copyin(is1b, is1e, is2b, is2e, is3b, is3e)
622622

623623
#ifdef MFC_SIMULATION
624-
@:ALLOCATE_GLOBAL(gammas (1:num_fluids))
625-
@:ALLOCATE_GLOBAL(gs_min (1:num_fluids))
626-
@:ALLOCATE_GLOBAL(pi_infs(1:num_fluids))
627-
@:ALLOCATE_GLOBAL(ps_inf(1:num_fluids))
628-
@:ALLOCATE_GLOBAL(cvs (1:num_fluids))
629-
@:ALLOCATE_GLOBAL(qvs (1:num_fluids))
630-
@:ALLOCATE_GLOBAL(qvps (1:num_fluids))
631-
@:ALLOCATE_GLOBAL(Gs (1:num_fluids))
624+
@:ALLOCATE(gammas (1:num_fluids))
625+
@:ALLOCATE(gs_min (1:num_fluids))
626+
@:ALLOCATE(pi_infs(1:num_fluids))
627+
@:ALLOCATE(ps_inf(1:num_fluids))
628+
@:ALLOCATE(cvs (1:num_fluids))
629+
@:ALLOCATE(qvs (1:num_fluids))
630+
@:ALLOCATE(qvps (1:num_fluids))
631+
@:ALLOCATE(Gs (1:num_fluids))
632632
#else
633633
@:ALLOCATE(gammas (1:num_fluids))
634634
@:ALLOCATE(gs_min (1:num_fluids))
@@ -655,7 +655,7 @@ contains
655655
#ifdef MFC_SIMULATION
656656

657657
if (viscous) then
658-
@:ALLOCATE_GLOBAL(Res(1:2, 1:maxval(Re_size)))
658+
@:ALLOCATE(Res(1:2, 1:maxval(Re_size)))
659659
do i = 1, 2
660660
do j = 1, Re_size(i)
661661
Res(i, j) = fluid_pp(Re_idx(i, j))%Re(i)
@@ -668,7 +668,7 @@ contains
668668

669669
if (bubbles) then
670670
#ifdef MFC_SIMULATION
671-
@:ALLOCATE_GLOBAL(bubrs(1:nb))
671+
@:ALLOCATE(bubrs(1:nb))
672672
#else
673673
@:ALLOCATE(bubrs(1:nb))
674674
#endif
@@ -1361,9 +1361,9 @@ contains
13611361
#endif
13621362

13631363
#ifdef MFC_SIMULATION
1364-
@:DEALLOCATE_GLOBAL(gammas, gs_min, pi_infs, ps_inf, cvs, qvs, qvps, Gs)
1364+
@:DEALLOCATE(gammas, gs_min, pi_infs, ps_inf, cvs, qvs, qvps, Gs)
13651365
if (bubbles) then
1366-
@:DEALLOCATE_GLOBAL(bubrs)
1366+
@:DEALLOCATE(bubrs)
13671367
end if
13681368
#else
13691369
@:DEALLOCATE(gammas, gs_min, pi_infs, ps_inf, cvs, qvs, qvps, Gs)

‎src/simulation/m_acoustic_src.fpp‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,9 @@ contains
6565
!> This subroutine initializes the acoustic source module
6666
subroutine s_initialize_acoustic_src
6767
integer :: i, j !< generic loop variables
68-
69-
@:ALLOCATE_GLOBAL(loc_acoustic(1:3, 1:num_source), mag(1:num_source), dipole(1:num_source), support(1:num_source), length(1:num_source), height(1:num_source), wavelength(1:num_source), frequency(1:num_source), gauss_sigma_dist(1:num_source), gauss_sigma_time(1:num_source), foc_length(1:num_source), aperture(1:num_source), npulse(1:num_source), pulse(1:num_source), dir(1:num_source), delay(1:num_source), element_polygon_ratio(1:num_source), rotate_angle(1:num_source), element_spacing_angle(1:num_source), num_elements(1:num_source), element_on(1:num_source), bb_num_freq(1:num_source), bb_bandwidth(1:num_source), bb_lowest_freq(1:num_source))
68+
69+
@:ALLOCATE(loc_acoustic(1:3, 1:num_source), mag(1:num_source), dipole(1:num_source), support(1:num_source), length(1:num_source), height(1:num_source), wavelength(1:num_source), frequency(1:num_source), gauss_sigma_dist(1:num_source), gauss_sigma_time(1:num_source), foc_length(1:num_source), aperture(1:num_source), npulse(1:num_source), pulse(1:num_source), dir(1:num_source), delay(1:num_source), element_polygon_ratio(1:num_source), rotate_angle(1:num_source), element_spacing_angle(1:num_source), num_elements(1:num_source), element_on(1:num_source), bb_num_freq(1:num_source), bb_bandwidth(1:num_source), bb_lowest_freq(1:num_source))
70+
7071
do i = 1, num_source
7172
do j = 1, 3
7273
loc_acoustic(j, i) = acoustic(i)%loc(j)
@@ -110,9 +111,9 @@ contains
110111
end do
111112
!$acc update device(loc_acoustic, mag, dipole, support, length, height, wavelength, frequency, gauss_sigma_dist, gauss_sigma_time, foc_length, aperture, npulse, pulse, dir, delay, element_polygon_ratio, rotate_angle, element_spacing_angle, num_elements, element_on, bb_num_freq, bb_bandwidth, bb_lowest_freq)
112113

113-
@:ALLOCATE_GLOBAL(mass_src(0:m, 0:n, 0:p))
114-
@:ALLOCATE_GLOBAL(mom_src(1:num_dims, 0:m, 0:n, 0:p))
115-
@:ALLOCATE_GLOBAL(E_src(0:m, 0:n, 0:p))
114+
@:ALLOCATE(mass_src(0:m, 0:n, 0:p))
115+
@:ALLOCATE(mom_src(1:num_dims, 0:m, 0:n, 0:p))
116+
@:ALLOCATE(E_src(0:m, 0:n, 0:p))
116117

117118
end subroutine s_initialize_acoustic_src
118119

@@ -413,8 +414,8 @@ contains
413414
dim = 3
414415
end if
415416

416-
@:ALLOCATE_GLOBAL(source_spatials_num_points(1:num_source))
417-
@:ALLOCATE_GLOBAL(source_spatials(1:num_source))
417+
@:ALLOCATE(source_spatials_num_points(1:num_source))
418+
@:ALLOCATE(source_spatials(1:num_source))
418419

419420
do ai = 1, num_source
420421
! First pass: Count the number of points for each source

‎src/simulation/m_body_forces.fpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,18 @@ contains
3737
if (n > 0) then
3838
! Simulation is 3D
3939
if (p > 0) then
40-
@:ALLOCATE_GLOBAL (rhoM(-buff_size:buff_size + m, &
40+
@:ALLOCATE (rhoM(-buff_size:buff_size + m, &
4141
-buff_size:buff_size + n, &
4242
-buff_size:buff_size + p))
4343
! Simulation is 2D
4444
else
45-
@:ALLOCATE_GLOBAL (rhoM(-buff_size:buff_size + m, &
45+
@:ALLOCATE (rhoM(-buff_size:buff_size + m, &
4646
-buff_size:buff_size + n, &
4747
0:0))
4848
end if
4949
! Simulation is 1D
5050
else
51-
@:ALLOCATE_GLOBAL (rhoM(-buff_size:buff_size + m, &
51+
@:ALLOCATE (rhoM(-buff_size:buff_size + m, &
5252
0:0, &
5353
0:0))
5454
end if
@@ -173,7 +173,7 @@ contains
173173

174174
subroutine s_finalize_body_forces_module
175175

176-
@:DEALLOCATE_GLOBAL(rhoM)
176+
@:DEALLOCATE(rhoM)
177177

178178
end subroutine s_finalize_body_forces_module
179179

‎src/simulation/m_bubbles.fpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ contains
4242

4343
integer :: l
4444

45-
@:ALLOCATE_GLOBAL(rs(1:nb))
46-
@:ALLOCATE_GLOBAL(vs(1:nb))
45+
@:ALLOCATE(rs(1:nb))
46+
@:ALLOCATE(vs(1:nb))
4747
if (.not. polytropic) then
48-
@:ALLOCATE_GLOBAL(ps(1:nb))
49-
@:ALLOCATE_GLOBAL(ms(1:nb))
48+
@:ALLOCATE(ps(1:nb))
49+
@:ALLOCATE(ms(1:nb))
5050
end if
5151

5252
do l = 1, nb
@@ -66,11 +66,11 @@ contains
6666
@:ALLOCATE(divu%sf(idwbuff(1)%beg:idwbuff(1)%end, idwbuff(2)%beg:idwbuff(2)%end, idwbuff(3)%beg:idwbuff(3)%end))
6767
@:ACC_SETUP_SFs(divu)
6868

69-
@:ALLOCATE_GLOBAL(bub_adv_src(0:m, 0:n, 0:p))
70-
@:ALLOCATE_GLOBAL(bub_r_src(0:m, 0:n, 0:p, 1:nb))
71-
@:ALLOCATE_GLOBAL(bub_v_src(0:m, 0:n, 0:p, 1:nb))
72-
@:ALLOCATE_GLOBAL(bub_p_src(0:m, 0:n, 0:p, 1:nb))
73-
@:ALLOCATE_GLOBAL(bub_m_src(0:m, 0:n, 0:p, 1:nb))
69+
@:ALLOCATE(bub_adv_src(0:m, 0:n, 0:p))
70+
@:ALLOCATE(bub_r_src(0:m, 0:n, 0:p, 1:nb))
71+
@:ALLOCATE(bub_v_src(0:m, 0:n, 0:p, 1:nb))
72+
@:ALLOCATE(bub_p_src(0:m, 0:n, 0:p, 1:nb))
73+
@:ALLOCATE(bub_m_src(0:m, 0:n, 0:p, 1:nb))
7474

7575
end subroutine s_initialize_bubbles_module
7676

0 commit comments

Comments
 (0)