Skip to content

Commit e4963a8

Browse files
danielpeterdanielpeter
authored
Merge pull request #1870 from danielpeter/devel
updates gravity (for CPU-only simulations); adds CUDA-aware MPI
2 parents 09adfc1 + f19a5ee commit e4963a8

141 files changed

Lines changed: 4281 additions & 2419 deletions

File tree

Some content is hidden

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

‎.github/scripts/run_coverage.sh‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,12 @@ run_simple() {
5656
# run
5757
./run_this_example.sh
5858
if [[ $? -ne 0 ]]; then exit 1; fi
59+
60+
# cleanup
5961
mv -v DATA/Par_file.org DATA/Par_file
62+
rm -rf OUTPUT_FILES/
63+
if [ -e DATABASES_MPI ]; then rm -rf DATABASES_MPI/; fi
64+
6065
cd "$WORKDIR"
6166
}
6267

@@ -83,7 +88,13 @@ run_kernel() {
8388
# run
8489
./run_this_example_kernel.sh
8590
if [[ $? -ne 0 ]]; then exit 1; fi
91+
92+
# cleanup
8693
mv -v DATA/Par_file.org DATA/Par_file
94+
rm -rf OUTPUT_FILES/
95+
if [ -e DATABASES_MPI ]; then rm -rf DATABASES_MPI/; fi
96+
if [ -e SEM ]; then rm -rf SEM/; fi
97+
8798
cd "$WORKDIR"
8899
}
89100

@@ -113,8 +124,13 @@ run_serial() {
113124
# run
114125
./run_this_example.sh
115126
if [[ $? -ne 0 ]]; then exit 1; fi
127+
128+
# cleanup
116129
mv -v DATA/Par_file.org DATA/Par_file
117130
if [ -e DATA/meshfem3D_files/Mesh_Par_file.org ]; then mv -v DATA/meshfem3D_files/Mesh_Par_file.org DATA/meshfem3D_files/Mesh_Par_file; fi
131+
rm -rf OUTPUT_FILES/
132+
if [ -e DATABASES_MPI ]; then rm -rf DATABASES_MPI/; fi
133+
118134
cd "$WORKDIR"
119135
}
120136

‎.github/scripts/run_tests.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ if [ -e DATA/Par_file ]; then
225225
cp -v DATA/Par_file DATA/Par_file.bak
226226
fi
227227

228-
# use kernel script
228+
# runs simulation
229229
if [ "${RUN_KERNEL}" == "true" ]; then
230230
# use kernel script
231231
./run_this_example_kernel.sh | tee output.log

‎.github/workflows/CI.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -345,8 +345,8 @@ jobs:
345345
# debug
346346
#export I_MPI_DEBUG=5,pid,host
347347
#export I_MPI_LIBRARY_KIND=debug
348-
# remove -ftrapuv which leads to issues for running tests
349-
sed -i "s/-ftrapuv//g" flags.guess
348+
# remove -ftrapuv in case it leads to issues for running tests
349+
#sed -i "s/-ftrapuv//g" flags.guess
350350
# environment setting
351351
export TERM=xterm
352352
# export info
@@ -363,7 +363,7 @@ jobs:
363363
- name: configure serial debug
364364
run: |
365365
set +e # revert the default `set -e`
366-
./configure --enable-debug --without-mpi FC=ifx CC=icx
366+
./configure --enable-debug --without-mpi FC=ifx CC=icx CXX=icx
367367
if [[ $? -ne 0 ]]; then echo "configuration failed:"; cat config.log; echo ""; echo "exiting..."; exit 1; fi
368368
369369
- name: make serial debug
@@ -374,7 +374,7 @@ jobs:
374374
375375
- name: configure serial
376376
run: |
377-
./configure --without-mpi FC=ifx CC=icx
377+
./configure --without-mpi FC=ifx CC=icx CXX=icx
378378
379379
- name: make serial
380380
run: |
@@ -384,7 +384,8 @@ jobs:
384384
- name: configure parallel debug
385385
run: |
386386
set +e # revert the default `set -e`
387-
./configure --enable-debug --with-mpi FC=ifx CC=icx MPIFC=mpiifx MPI_INC="${I_MPI_ROOT}/include"
387+
# adds -std=gnu17 to CFLAGS otherwise it will by default use -std=gnu23 which leads to errors in Scotch compilation
388+
./configure --enable-debug --with-mpi FC=ifx CC=icx CXX=icx CFLAGS="-std=gnu17 -Wall" MPIFC=mpiifx MPI_INC="${I_MPI_ROOT}/include"
388389
if [[ $? -ne 0 ]]; then echo "configuration failed:"; cat config.log; echo ""; echo "exiting..."; exit 1; fi
389390
390391
- name: make parallel debug
@@ -395,7 +396,7 @@ jobs:
395396
396397
- name: configure parallel
397398
run: |
398-
./configure --with-mpi FC=ifx CC=icx MPIFC=mpiifx MPI_INC="${I_MPI_ROOT}/include"
399+
./configure --with-mpi FC=ifx CC=icx CXX=icx CFLAGS="-std=gnu17" MPIFC=mpiifx MPI_INC="${I_MPI_ROOT}/include"
399400
400401
- name: make parallel
401402
run: |

‎.gitignore‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,3 @@ doc/USER_MANUAL/Schedule
4343
.*swn
4444
*~
4545
*.pyc
46-
47-
# misc
48-
.aider*
49-

‎DATA/Par_file‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ SAVE_MOHO_MESH = .false.
318318
#
319319
#-----------------------------------------------------------
320320
COUPLE_WITH_INJECTION_TECHNIQUE = .false.
321-
INJECTION_TECHNIQUE_TYPE = 3 # 1 = DSM, 2 = AxiSEM, 3 = FK
321+
INJECTION_TECHNIQUE_TYPE = 3 # 1 = DSM, 2 = AxiSEM, 3 = FK, 4 = SPECFEM
322322
MESH_A_CHUNK_OF_THE_EARTH = .false.
323323
TRACTION_PATH = DATA/AxiSEM_tractions/3/
324324
FKMODEL_FILE = FKmodel

‎EXAMPLES/applications/CPML_examples/CPML_realistic_mesh_with_topography/DATA/Par_file‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ INVERSE_FWI_FULL_PROBLEM = .false.
1919
# Use a negative zone number for the Southern hemisphere:
2020
# The Northern hemisphere corresponds to zones +1 to +60,
2121
# The Southern hemisphere corresponds to zones -1 to -60.
22-
UTM_PROJECTION_ZONE = 33
22+
UTM_PROJECTION_ZONE = 33
2323
SUPPRESS_UTM_PROJECTION = .true.
2424

2525
# number of MPI processors
26-
NPROC = 4
26+
NPROC = 4
2727

2828
# time step parameters
2929
NSTEP = 2000
@@ -318,7 +318,7 @@ SAVE_MOHO_MESH = .false.
318318
#
319319
#-----------------------------------------------------------
320320
COUPLE_WITH_INJECTION_TECHNIQUE = .false.
321-
INJECTION_TECHNIQUE_TYPE = 3 # 1 = DSM, 2 = AxiSEM, 3 = FK
321+
INJECTION_TECHNIQUE_TYPE = 3 # 1 = DSM, 2 = AxiSEM, 3 = FK, 4 = SPECFEM
322322
MESH_A_CHUNK_OF_THE_EARTH = .false.
323323
TRACTION_PATH = ./DATA/AxiSEM_tractions/3/
324324
FKMODEL_FILE = FKmodel

‎EXAMPLES/applications/CPML_examples/homogeneous_halfspace_HEX8_acoustic_absorbing_CPML_5sides/DATA/Par_file‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ SAVE_MOHO_MESH = .false.
318318
#
319319
#-----------------------------------------------------------
320320
COUPLE_WITH_INJECTION_TECHNIQUE = .false.
321-
INJECTION_TECHNIQUE_TYPE = 3 # 1 = DSM, 2 = AxiSEM, 3 = FK
321+
INJECTION_TECHNIQUE_TYPE = 3 # 1 = DSM, 2 = AxiSEM, 3 = FK, 4 = SPECFEM
322322
MESH_A_CHUNK_OF_THE_EARTH = .false.
323323
TRACTION_PATH = ./DATA/AxiSEM_tractions/3/
324324
FKMODEL_FILE = FKmodel

‎EXAMPLES/applications/CPML_examples/homogeneous_halfspace_HEX8_acoustic_absorbing_CPML_6sides/DATA/Par_file‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ SAVE_MOHO_MESH = .false.
318318
#
319319
#-----------------------------------------------------------
320320
COUPLE_WITH_INJECTION_TECHNIQUE = .false.
321-
INJECTION_TECHNIQUE_TYPE = 3 # 1 = DSM, 2 = AxiSEM, 3 = FK
321+
INJECTION_TECHNIQUE_TYPE = 3 # 1 = DSM, 2 = AxiSEM, 3 = FK, 4 = SPECFEM
322322
MESH_A_CHUNK_OF_THE_EARTH = .false.
323323
TRACTION_PATH = ./DATA/AxiSEM_tractions/3/
324324
FKMODEL_FILE = FKmodel

‎EXAMPLES/applications/CPML_examples/homogeneous_halfspace_HEX8_acoustic_elastic_absorbing_CPML_5sides/DATA/Par_file‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ SAVE_MOHO_MESH = .false.
318318
#
319319
#-----------------------------------------------------------
320320
COUPLE_WITH_INJECTION_TECHNIQUE = .false.
321-
INJECTION_TECHNIQUE_TYPE = 3 # 1 = DSM, 2 = AxiSEM, 3 = FK
321+
INJECTION_TECHNIQUE_TYPE = 3 # 1 = DSM, 2 = AxiSEM, 3 = FK, 4 = SPECFEM
322322
MESH_A_CHUNK_OF_THE_EARTH = .false.
323323
TRACTION_PATH = ./DATA/AxiSEM_tractions/3/
324324
FKMODEL_FILE = FKmodel

‎EXAMPLES/applications/CPML_examples/homogeneous_halfspace_HEX8_acoustic_elastic_absorbing_CPML_6sides/DATA/Par_file‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ SAVE_MOHO_MESH = .false.
318318
#
319319
#-----------------------------------------------------------
320320
COUPLE_WITH_INJECTION_TECHNIQUE = .false.
321-
INJECTION_TECHNIQUE_TYPE = 3 # 1 = DSM, 2 = AxiSEM, 3 = FK
321+
INJECTION_TECHNIQUE_TYPE = 3 # 1 = DSM, 2 = AxiSEM, 3 = FK, 4 = SPECFEM
322322
MESH_A_CHUNK_OF_THE_EARTH = .false.
323323
TRACTION_PATH = ./DATA/AxiSEM_tractions/3/
324324
FKMODEL_FILE = FKmodel

0 commit comments

Comments
 (0)