Skip to content

Commit 3d20438

Browse files
wilfonbawilfonba
committed
small touchups
1 parent 69cfa60 commit 3d20438

File tree

6 files changed

+33
-51
lines changed

6 files changed

+33
-51
lines changed

‎examples/2D_hardcodied_ic/README.md‎ renamed to ‎examples/2D_hardcoded_ic/README.md‎

File renamed without changes.

‎examples/2D_hardcodied_ic/case.py‎ renamed to ‎examples/2D_hardcoded_ic/case.py‎

File renamed without changes.

‎examples/2D_hardcodied_ic/initial.png‎ renamed to ‎examples/2D_hardcoded_ic/initial.png‎

File renamed without changes.

‎examples/2D_hardcodied_ic/result.png‎ renamed to ‎examples/2D_hardcoded_ic/result.png‎

File renamed without changes.

‎src/simulation/m_rhs.fpp‎

Lines changed: 32 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -250,33 +250,27 @@ contains
250250
& idwbuff(1)%beg:idwbuff(1)%end, &
251251
& idwbuff(2)%beg:idwbuff(2)%end, &
252252
& idwbuff(3)%beg:idwbuff(3)%end))
253-
if (.not. igr) then
254-
@:ALLOCATE(flux_gsrc_n(i)%vf(l)%sf( &
255-
& idwbuff(1)%beg:idwbuff(1)%end, &
256-
& idwbuff(2)%beg:idwbuff(2)%end, &
257-
& idwbuff(3)%beg:idwbuff(3)%end))
258-
end if
253+
@:ALLOCATE(flux_gsrc_n(i)%vf(l)%sf( &
254+
& idwbuff(1)%beg:idwbuff(1)%end, &
255+
& idwbuff(2)%beg:idwbuff(2)%end, &
256+
& idwbuff(3)%beg:idwbuff(3)%end))
259257
end do
260258

261259
if (viscous .or. surface_tension) then
262-
if (.not. igr) then
263-
do l = mom_idx%beg, E_idx
264-
@:ALLOCATE(flux_src_n(i)%vf(l)%sf( &
265-
& idwbuff(1)%beg:idwbuff(1)%end, &
266-
& idwbuff(2)%beg:idwbuff(2)%end, &
267-
& idwbuff(3)%beg:idwbuff(3)%end))
268-
end do
269-
end if
260+
do l = mom_idx%beg, E_idx
261+
@:ALLOCATE(flux_src_n(i)%vf(l)%sf( &
262+
& idwbuff(1)%beg:idwbuff(1)%end, &
263+
& idwbuff(2)%beg:idwbuff(2)%end, &
264+
& idwbuff(3)%beg:idwbuff(3)%end))
265+
end do
270266
end if
271267

272-
if (.not. igr) then
273-
@:ALLOCATE(flux_src_n(i)%vf(adv_idx%beg)%sf( &
274-
& idwbuff(1)%beg:idwbuff(1)%end, &
275-
& idwbuff(2)%beg:idwbuff(2)%end, &
276-
& idwbuff(3)%beg:idwbuff(3)%end))
277-
end if
268+
@:ALLOCATE(flux_src_n(i)%vf(adv_idx%beg)%sf( &
269+
& idwbuff(1)%beg:idwbuff(1)%end, &
270+
& idwbuff(2)%beg:idwbuff(2)%end, &
271+
& idwbuff(3)%beg:idwbuff(3)%end))
278272

279-
if (riemann_solver == 1 .and. (.not. igr)) then
273+
if (riemann_solver == 1) then
280274
do l = adv_idx%beg + 1, adv_idx%end
281275
@:ALLOCATE(flux_src_n(i)%vf(l)%sf( &
282276
& idwbuff(1)%beg:idwbuff(1)%end, &
@@ -304,12 +298,10 @@ contains
304298
end if
305299

306300
@:ACC_SETUP_VFs(flux_n(i))
307-
if (.not. igr) then
308-
@:ACC_SETUP_VFs(flux_src_n(i), flux_gsrc_n(i))
309-
end if
301+
@:ACC_SETUP_VFs(flux_src_n(i), flux_gsrc_n(i))
310302

311303
if (i == 1) then
312-
if (riemann_solver /= 1 .and. (.not. igr)) then
304+
if (riemann_solver /= 1) then
313305
do l = adv_idx%beg + 1, adv_idx%end
314306
flux_src_n(i)%vf(l)%sf => flux_src_n(i)%vf(adv_idx%beg)%sf
315307
$:GPU_ENTER_DATA(attach='[flux_src_n(i)%vf(l)%sf]')
@@ -319,10 +311,8 @@ contains
319311
do l = 1, sys_size
320312
flux_n(i)%vf(l)%sf => flux_n(1)%vf(l)%sf
321313
$:GPU_ENTER_DATA(attach='[flux_n(i)%vf(l)%sf]')
322-
if (.not. igr) then
323-
flux_src_n(i)%vf(l)%sf => flux_src_n(1)%vf(l)%sf
324-
$:GPU_ENTER_DATA(attach='[flux_src_n(i)%vf(l)%sf]')
325-
end if
314+
flux_src_n(i)%vf(l)%sf => flux_src_n(1)%vf(l)%sf
315+
$:GPU_ENTER_DATA(attach='[flux_src_n(i)%vf(l)%sf]')
326316
end do
327317
end if
328318
end if
@@ -1981,40 +1971,32 @@ contains
19811971
if (i /= 1) then
19821972
do l = 1, sys_size
19831973
nullify (flux_n(i)%vf(l)%sf)
1984-
if (.not. igr) then
1985-
nullify (flux_src_n(i)%vf(l)%sf)
1986-
@:DEALLOCATE(flux_gsrc_n(i)%vf(l)%sf)
1987-
end if
1974+
nullify (flux_src_n(i)%vf(l)%sf)
1975+
@:DEALLOCATE(flux_gsrc_n(i)%vf(l)%sf)
19881976
end do
19891977
else
19901978
do l = 1, sys_size
19911979
@:DEALLOCATE(flux_n(i)%vf(l)%sf)
1992-
if (.not. igr) then
1993-
@:DEALLOCATE(flux_gsrc_n(i)%vf(l)%sf)
1994-
end if
1980+
@:DEALLOCATE(flux_gsrc_n(i)%vf(l)%sf)
19951981
end do
19961982

1997-
if (viscous .and. (.not. igr)) then
1983+
if (viscous) then
19981984
do l = mom_idx%beg, E_idx
19991985
@:DEALLOCATE(flux_src_n(i)%vf(l)%sf)
20001986
end do
20011987
end if
20021988

2003-
if (.not. igr) then
2004-
if (riemann_solver == 1) then
2005-
do l = adv_idx%beg + 1, adv_idx%end
2006-
@:DEALLOCATE(flux_src_n(i)%vf(l)%sf)
2007-
end do
2008-
else
2009-
do l = adv_idx%beg + 1, adv_idx%end
2010-
nullify (flux_src_n(i)%vf(l)%sf)
2011-
end do
2012-
end if
1989+
if (riemann_solver == 1) then
1990+
do l = adv_idx%beg + 1, adv_idx%end
1991+
@:DEALLOCATE(flux_src_n(i)%vf(l)%sf)
1992+
end do
1993+
else
1994+
do l = adv_idx%beg + 1, adv_idx%end
1995+
nullify (flux_src_n(i)%vf(l)%sf)
1996+
end do
20131997
end if
20141998

2015-
if (.not. igr) then
2016-
@:DEALLOCATE(flux_src_n(i)%vf(adv_idx%beg)%sf)
2017-
end if
1999+
@:DEALLOCATE(flux_src_n(i)%vf(adv_idx%beg)%sf)
20182000
end if
20192001

20202002
@:DEALLOCATE(flux_n(i)%vf, flux_src_n(i)%vf, flux_gsrc_n(i)%vf)

‎toolchain/mfc/test/cases.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -963,7 +963,7 @@ def foreach_example():
963963

964964
# # List of currently broken examples -> currently attempting to fix!
965965
brokenCases = ["2D_ibm_cfl_dt", "1D_sodHypo", "2D_viscous", "2D_laplace_pressure_jump",
966-
"2D_bubbly_steady_shock", "2D_advection", "2D_hardcodied_ic", "2D_ibm_multiphase",
966+
"2D_bubbly_steady_shock", "2D_advection", "2D_hardcoded_ic", "2D_ibm_multiphase",
967967
"2D_acoustic_broadband", "1D_inert_shocktube", "1D_reactive_shocktube",
968968
"2D_ibm_steady_shock", "3D_performance_test", "3D_ibm_stl_ellipsoid",
969969
"3D_sphbubcollapse", "2D_ibm_stl_wedge", "3D_ibm_stl_pyramid", "3D_ibm_bowshock",

0 commit comments

Comments
 (0)