Skip to content

Commit ca36ffb

Browse files
okBrianhenryleberresbryngelson
authored
Fixed Examples, Added Examples CI. (#664)
* #474: Kickstart * test example workflow * fix example * test * test 2 * yay * final changes * final v2 * fianl v3 * final v4 * final v5 * added a comment * Switch to fastjsonschema * fixed tol, reduced TestSize, fixed parralel_io w/o mpi, fixed format 1 on examples, fixed m_patches typo. todo: fix 1D bubble cases * fixed remaining 4 broken example, todo fix no-mpi possibly * fixed new broken examples & temp fix D error * fixed no mpi and mpi ? * fix case bug hopefully * fix gpu?? and fix no-mpi final * add generate on workflow to fix no-mpi' * fix lfs issue and revert some changes + merge w/ master * remove 0dqbmm and fix lint * revert changes and some formatting * fix 2d artifical MA bug * fix all broken case files * rerevert the D directory temp * test compiled w/ gcc 12 * decreased tolerence * increase tol & fix lint? * test fix for gt phoneix? * fix docker * regenerate examples * add support ibm_cfl_dt * try 13.3 gcc * added strict floating point and regnerated examples w/ it * fix req.txt * fix frontier cas * regenerate all files and fix frontier * fixed time_step_save issue * mimi pr for exampleCI * test lower tol + regenerating with debug * regenerate hypo_2materials? * --regenerate with strict flag * add strict back to workflow * inital viscous edit * regen viscous * test 2525 on exampleCI2 * remove strict flag & retest with default flags * w/ correct weno_eps for testing * fix removal of strict in workflow * close to done? * remove strict on frontier * remove tols * fix lint * revert tests and regen examples This reverts commit ffe6c975c8428bef1327d8c3bd25019a6cee23c6. * update low_mach * test regenerate? * test no generate * fix acoustic tol * fix lint * fix some merges * fix merge conflicts * rm tol error * pkgconf workaround * added cases to broken cases to fix * add another test to ingore list * fixed stl spell error and seg fault on s_circle * add test to ignore * add to ignore list Co-authored-by: Spencer Bryngelson <sbryngelson@gmail.com> * fixed mixing layer * add to ignore suite --------- Co-authored-by: Henry LE BERRE <hberre3@gatech.edu> Co-authored-by: Spencer Bryngelson <sbryngelson@gmail.com>
1 parent d1b8028 commit ca36ffb

File tree

208 files changed

+18746
-223
lines changed

Some content is hidden

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

208 files changed

+18746
-223
lines changed

‎.github/workflows/test.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ jobs:
4949
- name: Setup MacOS
5050
if: matrix.os == 'macos'
5151
run: |
52+
brew update
53+
brew upgrade
5254
brew install coreutils python cmake fftw hdf5 gcc@14 boost open-mpi
5355
echo "FC=gfortran-14" >> $GITHUB_ENV
5456
echo "BOOST_INCLUDE=/opt/homebrew/include/" >> $GITHUB_ENV

‎CMakeLists.txt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ elseif (CMAKE_Fortran_COMPILER_ID STREQUAL "Cray")
165165
)
166166
add_link_options("SHELL: -K trap=fp" "SHELL: -G2")
167167
endif()
168+
168169
elseif (CMAKE_Fortran_COMPILER_ID STREQUAL "Flang")
169170
add_compile_options(
170171
$<$<COMPILE_LANGUAGE:Fortran>:-Mfreeform>
@@ -188,13 +189,14 @@ elseif ((CMAKE_Fortran_COMPILER_ID STREQUAL "NVHPC") OR (CMAKE_Fortran_COMPILER_
188189
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
189190
add_compile_options(
190191
$<$<COMPILE_LANGUAGE:Fortran>:-O0>
192+
$<$<COMPILE_LANGUAGE:Fortran>:-C>
193+
$<$<COMPILE_LANGUAGE:Fortran>:-g>
194+
$<$<COMPILE_LANGUAGE:Fortran>:-traceback>
195+
$<$<COMPILE_LANGUAGE:Fortran>:-Minform=inform>
196+
$<$<COMPILE_LANGUAGE:Fortran>:-Mbounds>
191197
)
192198
endif()
193199

194-
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
195-
add_compile_options(-C -g -O0 -traceback -Minform=inform -Mbounds)
196-
endif()
197-
198200
if (DEFINED ENV{MFC_CUDA_CC})
199201
string(REGEX MATCHALL "[0-9]+" MFC_CUDA_CC $ENV{MFC_CUDA_CC})
200202
message(STATUS "Found $MFC_CUDA_CC specified. GPU code will be generated for compute capability(ies) ${MFC_CUDA_CC}.")

‎examples/0D_qbmm/case.py

Lines changed: 0 additions & 153 deletions
This file was deleted.

‎examples/1D_acoustic_dipole/case.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
# ==========================================================================
4343

4444
# Formatted Database Files Structure Parameters ============================
45-
'format' : 2,
45+
'format' : 1,
4646
'precision' : 2,
4747
'prim_vars_wrt' :'T',
4848
'rho_wrt' :'T',

‎examples/1D_acoustic_gauss_sigmadist/case.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
# ==========================================================================
4343

4444
# Formatted Database Files Structure Parameters ============================
45-
'format' : 2,
45+
'format' : 1,
4646
'precision' : 2,
4747
'prim_vars_wrt' :'T',
4848
'rho_wrt' :'T',

‎examples/1D_acoustic_gauss_sigmatime/case.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
# ==========================================================================
4343

4444
# Formatted Database Files Structure Parameters ============================
45-
'format' : 2,
45+
'format' : 1,
4646
'precision' : 2,
4747
'prim_vars_wrt' :'T',
4848
'rho_wrt' :'T',

‎examples/1D_acoustic_sine_frequency/case.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
# ==========================================================================
4343

4444
# Formatted Database Files Structure Parameters ============================
45-
'format' : 2,
45+
'format' : 1,
4646
'precision' : 2,
4747
'prim_vars_wrt' :'T',
4848
'rho_wrt' :'T',

‎examples/1D_acoustic_sine_wavelength/case.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
# ==========================================================================
4343

4444
# Formatted Database Files Structure Parameters ============================
45-
'format' : 2,
45+
'format' : 1,
4646
'precision' : 2,
4747
'prim_vars_wrt' :'T',
4848
'rho_wrt' :'T',

‎examples/1D_bubblescreen/case.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,12 +192,13 @@
192192
# Acoustic source ==========================================
193193
'acoustic_source' : 'T',
194194
'num_source' : 1,
195+
'acoustic(1)%support' : 1,
195196
'acoustic(1)%loc(1)' : -5.E-03/x0,
196197
'acoustic(1)%npulse' : 1,
197198
'acoustic(1)%dir' : 1.,
198199
'acoustic(1)%pulse' : 1,
199200
'acoustic(1)%mag' : pa,
200-
'acoustic(1)%length' : (1./(300000.))*cact/x0,
201+
'acoustic(1)%wavelength' : (1./(300000.))*cact/x0
201202
# ==========================================================
202203
}))
203204

‎examples/1D_exp_bubscreen/case.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,12 +240,13 @@
240240
# Acoustic source ==========================================
241241
'acoustic_source' : 'T',
242242
'num_source' : 1,
243+
'acoustic(1)%support' : 1,
243244
'acoustic(1)%loc(1)' : -0.05/x0,
244245
'acoustic(1)%npulse' : 1,
245246
'acoustic(1)%dir' : 1.,
246247
'acoustic(1)%pulse' : 1,
247248
'acoustic(1)%mag' : 0.001,
248-
'acoustic(1)%length' : (1./(30000.))*cphysical/x0,
249+
'acoustic(1)%wavelength' : (1./(30000.))*cphysical/x0
249250
# ==========================================================
250251
}))
251252

‎examples/1D_hypo_2materials/case.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,31 +19,31 @@
1919
# Computational Domain Parameters ==========================
2020
'x_domain%beg' : 0.E+00,
2121
'x_domain%end' : 1.E+00,
22-
'm' : Nx,
22+
'm' : 25,
2323
'n' : 0,
2424
'p' : 0,
2525
'dt' : mydt,
2626
't_step_start' : 0,
27-
't_step_stop' : int(Nt),
28-
't_step_save' : int(math.ceil(Nt/1.)),
27+
't_step_stop' : 50,
28+
't_step_save' : 50,
2929
# ==========================================================
3030

3131
# Simulation Algorithm Parameters ==========================
3232
'num_patches' : 2,
3333
'model_eqns' : 2,
3434
'alt_soundspeed' : 'F',
3535
'num_fluids' : 2,
36-
'mpp_lim' : 'F',
37-
'mixture_err' : 'F',
38-
'time_stepper' : 3,
36+
'mpp_lim' : 'F',
37+
'mixture_err' : 'F',
38+
'time_stepper' : 3,
3939
'weno_order' : 3,
4040
'weno_eps' : 1.E-16,
41-
'weno_Re_flux' : 'F',
41+
'weno_Re_flux' : 'F',
4242
'weno_avg' : 'F',
4343
'mapped_weno' : 'F',
4444
'null_weights' : 'F',
4545
'mp_weno' : 'F',
46-
'riemann_solver' : 1,
46+
'riemann_solver' : 1,
4747
'wave_speeds' : 1,
4848
'avg_state' : 2,
4949
'bc_x%beg' : -3,
@@ -58,7 +58,7 @@
5858
'format' : 1,
5959
'precision' : 2,
6060
'prim_vars_wrt' :'T',
61-
'parallel_io' :'F',
61+
'parallel_io' :'F',
6262
# ==========================================================
6363

6464
# Patch 1 L ================================================

‎examples/1D_impact/case.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,17 @@
3333
'model_eqns' : 2,
3434
'alt_soundspeed' : 'F',
3535
'num_fluids' : 1,
36-
'mpp_lim' : 'F',
37-
'mixture_err' : 'F',
38-
'time_stepper' : 3,
36+
'mpp_lim' : 'F',
37+
'mixture_err' : 'F',
38+
'time_stepper' : 3,
3939
'weno_order' : 3,
4040
'weno_eps' : 1.E-16,
41-
'weno_Re_flux' : 'F',
42-
'weno_avg' : 'F',
41+
'weno_Re_flux' : 'F',
42+
'weno_avg' : 'F',
4343
'mapped_weno' : 'F',
4444
'null_weights' : 'F',
4545
'mp_weno' : 'F',
46-
'riemann_solver' : 1,
46+
'riemann_solver' : 1,
4747
'wave_speeds' : 1,
4848
'avg_state' : 2,
4949
'bc_x%beg' : -3,
@@ -58,7 +58,7 @@
5858
'format' : 1,
5959
'precision' : 2,
6060
'prim_vars_wrt' :'T',
61-
'parallel_io' :'F',
61+
'parallel_io' :'F',
6262
# ==========================================================
6363

6464
# Patch 1 L ================================================

‎examples/1D_qbmm/case.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
'format' : 1,
122122
'precision' : 2,
123123
'prim_vars_wrt' :'T',
124-
'parallel_io' :'F',
124+
'parallel_io' :'T',
125125
'fd_order' : 1,
126126
#'schlieren_wrt' :'T',
127127
'probe_wrt' :'T',

‎examples/1D_shuosher_teno5/case.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
# ==========================================================================
5151

5252
# Formatted Database Files Structure Parameters ============================
53-
'format' : 2,
53+
'format' : 1,
5454
'precision' : 2,
5555
'prim_vars_wrt' :'T',
5656
'rho_wrt' :'T',

‎examples/1D_shuosher_teno7/case.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
# ==========================================================================
5151

5252
# Formatted Database Files Structure Parameters ============================
53-
'format' : 2,
53+
'format' : 1,
5454
'precision' : 2,
5555
'prim_vars_wrt' :'T',
5656
'rho_wrt' :'T',

‎examples/1D_shuosher_wenojs5/case.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
# ==========================================================================
5050

5151
# Formatted Database Files Structure Parameters ============================
52-
'format' : 2,
52+
'format' : 1,
5353
'precision' : 2,
5454
'prim_vars_wrt' :'T',
5555
'rho_wrt' :'T',

‎examples/1D_shuosher_wenom5/case.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
# ==========================================================================
5050

5151
# Formatted Database Files Structure Parameters ============================
52-
'format' : 2,
52+
'format' : 1,
5353
'precision' : 2,
5454
'prim_vars_wrt' :'T',
5555
'rho_wrt' :'T',

0 commit comments

Comments
 (0)