Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into lagrangian
Browse files Browse the repository at this point in the history
  • Loading branch information
@wilfonba
wilfonba committed Dec 8, 2024
2 parents bb77a24 + ca36ffb commit a8232ce
Show file tree
Hide file tree
Showing 208 changed files with 18,776 additions and 228 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ jobs:
- name: Setup MacOS
if: matrix.os == 'macos'
run: |
brew update
brew upgrade
brew install coreutils python cmake fftw hdf5 gcc@14 boost open-mpi
echo "FC=gfortran-14" >> $GITHUB_ENV
echo "BOOST_INCLUDE=/opt/homebrew/include/" >> $GITHUB_ENV
Expand Down
10 changes: 6 additions & 4 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ elseif (CMAKE_Fortran_COMPILER_ID STREQUAL "Cray")
)
add_link_options("SHELL: -K trap=fp" "SHELL: -G2")
endif()

elseif (CMAKE_Fortran_COMPILER_ID STREQUAL "Flang")
add_compile_options(
$<$<COMPILE_LANGUAGE:Fortran>:-Mfreeform>
Expand All @@ -188,13 +189,14 @@ elseif ((CMAKE_Fortran_COMPILER_ID STREQUAL "NVHPC") OR (CMAKE_Fortran_COMPILER_
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
add_compile_options(
$<$<COMPILE_LANGUAGE:Fortran>:-O0>
$<$<COMPILE_LANGUAGE:Fortran>:-C>
$<$<COMPILE_LANGUAGE:Fortran>:-g>
$<$<COMPILE_LANGUAGE:Fortran>:-traceback>
$<$<COMPILE_LANGUAGE:Fortran>:-Minform=inform>
$<$<COMPILE_LANGUAGE:Fortran>:-Mbounds>
)
endif()

if (CMAKE_BUILD_TYPE STREQUAL "Debug")
add_compile_options(-C -g -O0 -traceback -Minform=inform -Mbounds)
endif()

if (DEFINED ENV{MFC_CUDA_CC})
string(REGEX MATCHALL "[0-9]+" MFC_CUDA_CC $ENV{MFC_CUDA_CC})
message(STATUS "Found $MFC_CUDA_CC specified. GPU code will be generated for compute capability(ies) ${MFC_CUDA_CC}.")
Expand Down
153 changes: 0 additions & 153 deletions examples/0D_qbmm/case.py
View file

This file was deleted.

2 changes: 1 addition & 1 deletion examples/1D_acoustic_dipole/case.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
# ==========================================================================

# Formatted Database Files Structure Parameters ============================
'format' : 2,
'format' : 1,
'precision' : 2,
'prim_vars_wrt' :'T',
'rho_wrt' :'T',
Expand Down
2 changes: 1 addition & 1 deletion examples/1D_acoustic_gauss_sigmadist/case.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
# ==========================================================================

# Formatted Database Files Structure Parameters ============================
'format' : 2,
'format' : 1,
'precision' : 2,
'prim_vars_wrt' :'T',
'rho_wrt' :'T',
Expand Down
2 changes: 1 addition & 1 deletion examples/1D_acoustic_gauss_sigmatime/case.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
# ==========================================================================

# Formatted Database Files Structure Parameters ============================
'format' : 2,
'format' : 1,
'precision' : 2,
'prim_vars_wrt' :'T',
'rho_wrt' :'T',
Expand Down
2 changes: 1 addition & 1 deletion examples/1D_acoustic_sine_frequency/case.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
# ==========================================================================

# Formatted Database Files Structure Parameters ============================
'format' : 2,
'format' : 1,
'precision' : 2,
'prim_vars_wrt' :'T',
'rho_wrt' :'T',
Expand Down
2 changes: 1 addition & 1 deletion examples/1D_acoustic_sine_wavelength/case.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
# ==========================================================================

# Formatted Database Files Structure Parameters ============================
'format' : 2,
'format' : 1,
'precision' : 2,
'prim_vars_wrt' :'T',
'rho_wrt' :'T',
Expand Down
3 changes: 2 additions & 1 deletion examples/1D_bubblescreen/case.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,12 +192,13 @@
# Acoustic source ==========================================
'acoustic_source' : 'T',
'num_source' : 1,
'acoustic(1)%support' : 1,
'acoustic(1)%loc(1)' : -5.E-03/x0,
'acoustic(1)%npulse' : 1,
'acoustic(1)%dir' : 1.,
'acoustic(1)%pulse' : 1,
'acoustic(1)%mag' : pa,
'acoustic(1)%length' : (1./(300000.))*cact/x0,
'acoustic(1)%wavelength' : (1./(300000.))*cact/x0
# ==========================================================
}))

Expand Down
3 changes: 2 additions & 1 deletion examples/1D_exp_bubscreen/case.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,12 +240,13 @@
# Acoustic source ==========================================
'acoustic_source' : 'T',
'num_source' : 1,
'acoustic(1)%support' : 1,
'acoustic(1)%loc(1)' : -0.05/x0,
'acoustic(1)%npulse' : 1,
'acoustic(1)%dir' : 1.,
'acoustic(1)%pulse' : 1,
'acoustic(1)%mag' : 0.001,
'acoustic(1)%length' : (1./(30000.))*cphysical/x0,
'acoustic(1)%wavelength' : (1./(30000.))*cphysical/x0
# ==========================================================
}))

Expand Down
18 changes: 9 additions & 9 deletions examples/1D_hypo_2materials/case.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,31 +19,31 @@
# Computational Domain Parameters ==========================
'x_domain%beg' : 0.E+00,
'x_domain%end' : 1.E+00,
'm' : Nx,
'm' : 25,
'n' : 0,
'p' : 0,
'dt' : mydt,
't_step_start' : 0,
't_step_stop' : int(Nt),
't_step_save' : int(math.ceil(Nt/1.)),
't_step_stop' : 50,
't_step_save' : 50,
# ==========================================================

# Simulation Algorithm Parameters ==========================
'num_patches' : 2,
'model_eqns' : 2,
'alt_soundspeed' : 'F',
'num_fluids' : 2,
'mpp_lim' : 'F',
'mixture_err' : 'F',
'time_stepper' : 3,
'mpp_lim' : 'F',
'mixture_err' : 'F',
'time_stepper' : 3,
'weno_order' : 3,
'weno_eps' : 1.E-16,
'weno_Re_flux' : 'F',
'weno_Re_flux' : 'F',
'weno_avg' : 'F',
'mapped_weno' : 'F',
'null_weights' : 'F',
'mp_weno' : 'F',
'riemann_solver' : 1,
'riemann_solver' : 1,
'wave_speeds' : 1,
'avg_state' : 2,
'bc_x%beg' : -3,
Expand All @@ -58,7 +58,7 @@
'format' : 1,
'precision' : 2,
'prim_vars_wrt' :'T',
'parallel_io' :'F',
'parallel_io' :'F',
# ==========================================================

# Patch 1 L ================================================
Expand Down
14 changes: 7 additions & 7 deletions examples/1D_impact/case.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,17 @@
'model_eqns' : 2,
'alt_soundspeed' : 'F',
'num_fluids' : 1,
'mpp_lim' : 'F',
'mixture_err' : 'F',
'time_stepper' : 3,
'mpp_lim' : 'F',
'mixture_err' : 'F',
'time_stepper' : 3,
'weno_order' : 3,
'weno_eps' : 1.E-16,
'weno_Re_flux' : 'F',
'weno_avg' : 'F',
'weno_Re_flux' : 'F',
'weno_avg' : 'F',
'mapped_weno' : 'F',
'null_weights' : 'F',
'mp_weno' : 'F',
'riemann_solver' : 1,
'riemann_solver' : 1,
'wave_speeds' : 1,
'avg_state' : 2,
'bc_x%beg' : -3,
Expand All @@ -58,7 +58,7 @@
'format' : 1,
'precision' : 2,
'prim_vars_wrt' :'T',
'parallel_io' :'F',
'parallel_io' :'F',
# ==========================================================

# Patch 1 L ================================================
Expand Down
2 changes: 1 addition & 1 deletion examples/1D_qbmm/case.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
'format' : 1,
'precision' : 2,
'prim_vars_wrt' :'T',
'parallel_io' :'F',
'parallel_io' :'T',
'fd_order' : 1,
#'schlieren_wrt' :'T',
'probe_wrt' :'T',
Expand Down
2 changes: 1 addition & 1 deletion examples/1D_shuosher_teno5/case.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
# ==========================================================================

# Formatted Database Files Structure Parameters ============================
'format' : 2,
'format' : 1,
'precision' : 2,
'prim_vars_wrt' :'T',
'rho_wrt' :'T',
Expand Down
2 changes: 1 addition & 1 deletion examples/1D_shuosher_teno7/case.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
# ==========================================================================

# Formatted Database Files Structure Parameters ============================
'format' : 2,
'format' : 1,
'precision' : 2,
'prim_vars_wrt' :'T',
'rho_wrt' :'T',
Expand Down
2 changes: 1 addition & 1 deletion examples/1D_shuosher_wenojs5/case.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
# ==========================================================================

# Formatted Database Files Structure Parameters ============================
'format' : 2,
'format' : 1,
'precision' : 2,
'prim_vars_wrt' :'T',
'rho_wrt' :'T',
Expand Down
2 changes: 1 addition & 1 deletion examples/1D_shuosher_wenom5/case.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
# ==========================================================================

# Formatted Database Files Structure Parameters ============================
'format' : 2,
'format' : 1,
'precision' : 2,
'prim_vars_wrt' :'T',
'rho_wrt' :'T',
Expand Down
Loading

0 comments on commit a8232ce

Please sign in to comment.