Skip to content

Commit cf431a3

Browse files
committed
restore master inline comments safely (exclude PR-removed variables)
1 parent ac13779 commit cf431a3

69 files changed

Lines changed: 719 additions & 721 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.ffmt_cache/hashes

Lines changed: 68 additions & 68 deletions
Large diffs are not rendered by default.

src/common/include/1dHardcodedIC.fpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@
1313
! magnetic field
1414
q_prim_vf(B_idx%end - 1)%sf(i, 0, 0) = 0.1_wp*sin(2._wp*pi*x_cc(i))
1515
q_prim_vf(B_idx%end)%sf(i, 0, 0) = 0.1_wp*cos(2._wp*pi*x_cc(i))
16-
case (170)
16+
case (170) ! 1D profile from external data (e.g. Cantera, SDtoolbox)
1717
! This hardcoded case can be used to start a simulation with initial conditions given from a known 1D profile (e.g. Cantera,
1818
! SDtoolbox)
1919
@: HardcodedReadValues()
20-
case (180)
20+
case (180) ! Shu-Osher problem
2121
! This is patch is hard-coded for test suite optimization used in the 1D_shuoser cases: "patch_icpp(2)%alpha_rho(1)": "1 +
2222
! 0.2*sin(5*x)"
2323
if (patch_id == 2) then
2424
q_prim_vf(contxb + 0)%sf(i, 0, 0) = 1 + 0.2*sin(5*x_cc(i))
2525
end if
26-
case (181)
26+
case (181) ! Titarev-Torro problem
2727
! This is patch is hard-coded for test suite optimization used in the 1D_titarevtorro cases: "patch_icpp(2)%alpha_rho(1)":
2828
! "1 + 0.1*sin(20*x*pi)"
2929
q_prim_vf(contxb + 0)%sf(i, 0, 0) = 1 + 0.1*sin(20*x_cc(i)*pi)
30-
case (182)
30+
case (182) ! Multi-component diffusion
3131
! This patch is a hard-coded for test suite optimization (multiple component diffusion)
3232
x_mid_diffu = 0.05_wp/2.0_wp
3333
width_sq = (2.5_wp*10.0_wp**(-3.0_wp))**2

src/common/include/2dHardcodedIC.fpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
#:def Hardcoded2D()
2020
select case (patch_icpp(patch_id)%hcid) ! 2D_hardcoded_ic example case
21-
case (200)
21+
case (200) ! Two-fluid cubic interface
2222
if (y_cc(j) <= (-x_cc(i)**3 + 1)**(1._wp/3._wp)) then
2323
! Volume Fractions
2424
q_prim_vf(advxb)%sf(i, j, 0) = eps
@@ -265,10 +265,10 @@
265265
q_prim_vf(B_idx%beg + 1)%sf(i, j, 0) = (5._wp/sqrt(4._wp*pi))*sinA + (5._wp/sqrt(4._wp*pi))*cosA
266266
end if
267267
! v^z and B^z remain zero by default
268-
case (270)
268+
case (270) ! 2D extrusion of 1D profile from external data
269269
! This hardcoded case extrudes a 1D profile to initialize a 2D simulation domain
270270
@: HardcodedReadValues()
271-
case (280)
271+
case (280) ! Isentropic vortex
272272
! This is patch is hard-coded for test suite optimization used in the 2D_isentropicvortex case: This analytic patch uses
273273
! geometry 2
274274
if (patch_id == 1) then
@@ -285,7 +285,7 @@
285285
& 0) = 0.0 - (x_cc(i) - patch_icpp(1)%x_centroid)*(5.0/(2.0*pi))*exp(1.0*(1.0 - (x_cc(i) - patch_icpp(1) &
286286
& %x_centroid)**2.0 - (y_cc(j) - patch_icpp(1)%y_centroid)**2.0))
287287
end if
288-
case (281)
288+
case (281) ! Acoustic pulse
289289
! This is patch is hard-coded for test suite optimization used in the 2D_acoustic_pulse case: This analytic patch uses
290290
! geometry 2
291291
if (patch_id == 2) then
@@ -294,7 +294,7 @@
294294
q_prim_vf(contxb + 0)%sf(i, j, &
295295
& 0) = 1*(1 - 0.5*(1.4 - 1)*(0.4)**2*exp(0.5*(1 - sqrt(x_cc(i)**2 + y_cc(j)**2))))**(1/(1.4 - 1))
296296
end if
297-
case (282)
297+
case (282) ! Zero-circulation vortex
298298
! This is patch is hard-coded for test suite optimization used in the 2D_zero_circ_vortex case: This analytic patch uses
299299
! geometry 2
300300
if (patch_id == 2) then

src/common/include/3dHardcodedIC.fpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
real(wp), dimension(:), allocatable :: y_th_arr, z_th_arr, r_th_arr
88
! Variables to describe initial condition of jet
99
real(wp) :: r, ux_th, ux_am, p_th, p_am, rho_th, rho_am, y_th, z_th, r_th, eps_smooth
10-
real(wp) :: rcut, xcut ! Intermediate variables for creating smooth initial condition
10+
real(wp) :: rcut, xcut !< Intermediate variables for creating smooth initial condition
1111
real(wp), dimension(0:n,0:p) :: rcut_arr
12-
integer :: l, q, s ! Iterators for reading input files
13-
integer :: start, end ! Ints to keep track of position in file
12+
integer :: l, q, s !< Iterators for reading input files
13+
integer :: start, end !< Ints to keep track of position in file
1414
character(len=100000) :: line ! String to store line in file
15-
character(len=25) :: value ! String to store value in line
16-
integer :: NJet ! Number of jets
15+
character(len=25) :: value !< String to store value in line
16+
integer :: NJet !< Number of jets
1717
real(wp), allocatable, dimension(:,:) :: ih ! Array to store interface height in
1818
logical :: file_exist ! Flag to check if file exists
1919

@@ -261,10 +261,10 @@
261261
& k))*g0_ic*(ih(start_idx(1) + i, start_idx(3) + k) - y_cc(j))
262262

263263
if (surface_tension) q_prim_vf(c_idx)%sf(i, j, k) = alph
264-
case (370)
264+
case (370) ! 3D extrusion of 2D profile from external data
265265
! This hardcoded case extrudes a 2D profile to initialize a 3D simulation domain
266266
@: HardcodedReadValues()
267-
case (380)
267+
case (380) ! Taylor-Green vortex
268268
! This is patch is hard-coded for test suite optimization used in the 3D_TaylorGreenVortex case: This analytic patch used
269269
! geometry 9
270270
Mach = 0.1

src/common/include/ExtrusionHardcodedIC.fpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,18 @@
4040
integer :: f, iter, ios, ios2, unit, unit2, idx, idy, index_x, index_y, jump, line_count, ycount
4141
real(wp) :: x_len, x_step, y_len, y_step
4242
real(wp) :: dummy_x, dummy_y, dummy_z, x0, y0
43-
integer :: global_offset_x, global_offset_y ! MPI subdomain offset
43+
integer :: global_offset_x, global_offset_y !< MPI subdomain offset
4444
real(wp) :: delta_x, delta_y
45-
character(len=100), dimension(sys_size) :: fileNames ! Arrays to store all data from files
45+
character(len=100), dimension(sys_size) :: fileNames !< Arrays to store all data from files
4646
character(len=200) :: errmsg
4747
real(wp), allocatable :: stored_values(:,:,:)
4848
real(wp), allocatable :: x_coords(:), y_coords(:)
4949
logical :: files_loaded = .false.
5050
real(wp) :: domain_xstart, domain_xend, domain_ystart, domain_yend
51-
character(len=*), parameter :: init_dir = "/home/MFC/FilesDirectory" ! For example /home/MFC/examples/1D_Shock/D/
52-
character(len=20) :: file_num_str ! For storing the file number as a string
53-
character(len=20) :: zeros_part ! For the trailing zeros part
54-
character(len=6), parameter :: zeros_default = "000000" ! Default zeros (can be changed)
51+
character(len=*), parameter :: init_dir = "/home/MFC/FilesDirectory" !< For example /home/MFC/examples/1D_Shock/D/
52+
character(len=20) :: file_num_str !< For storing the file number as a string
53+
character(len=20) :: zeros_part !< For the trailing zeros part
54+
character(len=6), parameter :: zeros_default = "000000" !< Default zeros (can be changed)
5555
#:enddef
5656

5757
#:def HardcodedReadValues()

0 commit comments

Comments
 (0)