Skip to content

Commit a8232ce

Browse files
wilfonbawilfonba
committed
Merge remote-tracking branch 'upstream/master' into lagrangian
2 parents bb77a24 + ca36ffb commit a8232ce

File tree

208 files changed

+18776
-228
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

+18776
-228
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

0 commit comments

Comments
 (0)