Skip to content

Commit 477a13b

Browse files
danieljvickersdanieljvickers
committed
Modified a few hundred macros
1 parent 35c57eb commit 477a13b

24 files changed

+499
-499
lines changed

‎src/simulation/m_acoustic_src.fpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ contains
166166

167167
sim_time = t_step*dt
168168

169-
#:call GPU_PARALLEL_LOOP(collapse=3)
169+
$:GPU_PARALLEL_LOOP(private='[j,k,l]', collapse=3)
170170
do l = 0, p
171171
do k = 0, n
172172
do j = 0, m
@@ -178,7 +178,7 @@ contains
178178
end do
179179
end do
180180
end do
181-
#:endcall GPU_PARALLEL_LOOP
181+
$:END_GPU_PARALLEL_LOOP
182182

183183
! Keep outer loop sequel because different sources can have very different number of points
184184
do ai = 1, num_source
@@ -220,7 +220,7 @@ contains
220220

221221
deallocate (phi_rn)
222222

223-
#:call GPU_PARALLEL_LOOP(private='[myalpha,myalpha_rho]')
223+
$:GPU_PARALLEL_LOOP(private='[i,myalpha,myalpha_rho]')
224224
do i = 1, num_points
225225
j = source_spatials(ai)%coord(1, i)
226226
k = source_spatials(ai)%coord(2, i)
@@ -317,12 +317,12 @@ contains
317317
end if
318318

319319
end do
320-
#:endcall GPU_PARALLEL_LOOP
320+
$:END_GPU_PARALLEL_LOOP
321321
end if
322322
end do
323323

324324
! Update the rhs variables
325-
#:call GPU_PARALLEL_LOOP(collapse=3)
325+
$:GPU_PARALLEL_LOOP(private='[j,k,l]',collapse=3)
326326
do l = 0, p
327327
do k = 0, n
328328
do j = 0, m
@@ -338,7 +338,7 @@ contains
338338
end do
339339
end do
340340
end do
341-
#:endcall GPU_PARALLEL_LOOP
341+
$:END_GPU_PARALLEL_LOOP
342342
end subroutine s_acoustic_src_calculations
343343

344344
!> This subroutine gives the temporally varying amplitude of the pulse

‎src/simulation/m_body_forces.fpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ contains
7373
type(scalar_field), dimension(sys_size), intent(in) :: q_cons_vf
7474
integer :: i, j, k, l !< standard iterators
7575

76-
#:call GPU_PARALLEL_LOOP(collapse=3)
76+
$:GPU_PARALLEL_LOOP(private='[j,k,l]', collapse=3)
7777
do l = 0, p
7878
do k = 0, n
7979
do j = 0, m
@@ -85,7 +85,7 @@ contains
8585
end do
8686
end do
8787
end do
88-
#:endcall GPU_PARALLEL_LOOP
88+
$:END_GPU_PARALLEL_LOOP
8989

9090
end subroutine s_compute_mixture_density
9191

@@ -104,7 +104,7 @@ contains
104104
call s_compute_acceleration(mytime)
105105
call s_compute_mixture_density(q_cons_vf)
106106

107-
#:call GPU_PARALLEL_LOOP(collapse=4)
107+
$:GPU_PARALLEL_LOOP(private='[i,j,k,l]', collapse=4)
108108
do i = momxb, E_idx
109109
do l = 0, p
110110
do k = 0, n
@@ -114,11 +114,11 @@ contains
114114
end do
115115
end do
116116
end do
117-
#:endcall GPU_PARALLEL_LOOP
117+
$:END_GPU_PARALLEL_LOOP
118118

119119
if (bf_x) then ! x-direction body forces
120120

121-
#:call GPU_PARALLEL_LOOP(collapse=3)
121+
$:GPU_PARALLEL_LOOP(private='[j,k,l]', collapse=3)
122122
do l = 0, p
123123
do k = 0, n
124124
do j = 0, m
@@ -129,12 +129,12 @@ contains
129129
end do
130130
end do
131131
end do
132-
#:endcall GPU_PARALLEL_LOOP
132+
$:END_GPU_PARALLEL_LOOP
133133
end if
134134

135135
if (bf_y) then ! y-direction body forces
136136

137-
#:call GPU_PARALLEL_LOOP(collapse=3)
137+
$:GPU_PARALLEL_LOOP(private='[j,k,l]', collapse=3)
138138
do l = 0, p
139139
do k = 0, n
140140
do j = 0, m
@@ -145,12 +145,12 @@ contains
145145
end do
146146
end do
147147
end do
148-
#:endcall GPU_PARALLEL_LOOP
148+
$:END_GPU_PARALLEL_LOOP
149149
end if
150150

151151
if (bf_z) then ! z-direction body forces
152152

153-
#:call GPU_PARALLEL_LOOP(collapse=3)
153+
$:GPU_PARALLEL_LOOP(private='[j,k,l]', collapse=3)
154154
do l = 0, p
155155
do k = 0, n
156156
do j = 0, m
@@ -161,7 +161,7 @@ contains
161161
end do
162162
end do
163163
end do
164-
#:endcall GPU_PARALLEL_LOOP
164+
$:END_GPU_PARALLEL_LOOP
165165

166166
end if
167167

‎src/simulation/m_bubbles_EE.fpp‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ contains
7676
real(wp) :: nR3bar
7777
integer(wp) :: i, j, k, l
7878

79-
#:call GPU_PARALLEL_LOOP(collapse=3)
79+
$:GPU_PARALLEL_LOOP(private='[j,k,l]', collapse=3)
8080
do l = 0, p
8181
do k = 0, n
8282
do j = 0, m
@@ -89,7 +89,7 @@ contains
8989
end do
9090
end do
9191
end do
92-
#:endcall GPU_PARALLEL_LOOP
92+
$:END_GPU_PARALLEL_LOOP
9393

9494
end subroutine s_comp_alpha_from_n
9595

@@ -104,7 +104,7 @@ contains
104104
if (idir == 1) then
105105

106106
if (.not. qbmm) then
107-
#:call GPU_PARALLEL_LOOP(collapse=3)
107+
$:GPU_PARALLEL_LOOP(private='[j,k,l]', collapse=3)
108108
do l = 0, p
109109
do k = 0, n
110110
do j = 0, m
@@ -116,12 +116,12 @@ contains
116116
end do
117117
end do
118118
end do
119-
#:endcall GPU_PARALLEL_LOOP
119+
$:END_GPU_PARALLEL_LOOP
120120
end if
121121

122122
elseif (idir == 2) then
123123

124-
#:call GPU_PARALLEL_LOOP(collapse=3)
124+
$:GPU_PARALLEL_LOOP(private='[j,k,l]', collapse=3)
125125
do l = 0, p
126126
do k = 0, n
127127
do j = 0, m
@@ -132,11 +132,11 @@ contains
132132
end do
133133
end do
134134
end do
135-
#:endcall GPU_PARALLEL_LOOP
135+
$:END_GPU_PARALLEL_LOOP
136136

137137
elseif (idir == 3) then
138138

139-
#:call GPU_PARALLEL_LOOP(collapse=3)
139+
$:GPU_PARALLEL_LOOP(private='[j,k,l]', collapse=3)
140140
do l = 0, p
141141
do k = 0, n
142142
do j = 0, m
@@ -147,7 +147,7 @@ contains
147147
end do
148148
end do
149149
end do
150-
#:endcall GPU_PARALLEL_LOOP
150+
$:END_GPU_PARALLEL_LOOP
151151

152152
end if
153153

@@ -177,7 +177,7 @@ contains
177177
integer :: dmBub_id !< Dummy variables for unified subgrid bubble subroutines
178178
real(wp) :: dmMass_v, dmMass_n, dmBeta_c, dmBeta_t, dmCson
179179

180-
#:call GPU_PARALLEL_LOOP(collapse=3)
180+
$:GPU_PARALLEL_LOOP(private='[j,k,l]', collapse=3)
181181
do l = 0, p
182182
do k = 0, n
183183
do j = 0, m
@@ -193,10 +193,10 @@ contains
193193
end do
194194
end do
195195
end do
196-
#:endcall GPU_PARALLEL_LOOP
196+
$:END_GPU_PARALLEL_LOOP
197197

198198
adap_dt_stop_max = 0
199-
#:call GPU_PARALLEL_LOOP(collapse=3, private='[Rtmp, Vtmp, myalpha_rho, myalpha]', &
199+
$:GPU_PARALLEL_LOOP(private='[j,k,l]', collapse=3, private='[Rtmp, Vtmp, myalpha_rho, myalpha]', &
200200
& reduction='[[adap_dt_stop_max]]', reductionOp='[MAX]', &
201201
& copy='[adap_dt_stop_max]')
202202
do l = 0, p
@@ -326,12 +326,12 @@ contains
326326
end do
327327
end do
328328
end do
329-
#:endcall GPU_PARALLEL_LOOP
329+
$:END_GPU_PARALLEL_LOOP
330330

331331
if (adap_dt .and. adap_dt_stop_max > 0) call s_mpi_abort("Adaptive time stepping failed to converge.")
332332

333333
if (.not. adap_dt) then
334-
#:call GPU_PARALLEL_LOOP(collapse=3)
334+
$:GPU_PARALLEL_LOOP(private='[i,l,q]', collapse=3)
335335
do l = 0, p
336336
do q = 0, n
337337
do i = 0, m
@@ -350,7 +350,7 @@ contains
350350
end do
351351
end do
352352
end do
353-
#:endcall GPU_PARALLEL_LOOP
353+
$:END_GPU_PARALLEL_LOOP
354354
end if
355355
end subroutine s_compute_bubble_EE_source
356356

0 commit comments

Comments
 (0)