Skip to content

Commit

Permalink
Merge pull request #1215 from danielpeter/devel
Browse files Browse the repository at this point in the history
code cleaning; fixes OpenMP statements
  • Loading branch information
danielpeter committed Apr 6, 2024
2 parents 60a9c32 + 6d05104 commit 9e0e0d5
Show file tree
Hide file tree
Showing 79 changed files with 2,016 additions and 1,404 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/CI.yml
Expand Up @@ -575,7 +575,7 @@ jobs:
shell: bash

linuxTest_12:
name: Test run example 11 - Marmousi2
name: Test run example 12 - Marmousi2
runs-on: ubuntu-latest
needs: [linuxCheck]

Expand Down
3 changes: 1 addition & 2 deletions CITATION.cff
Expand Up @@ -10,8 +10,7 @@ type: software
identifiers:
- type: doi
- value: 10.5281/zenodo.10415228
license:
- gpl-3.0-or-later
license: "GPL-3.0"

authors:
- family-names: Komatitsch
Expand Down
6 changes: 3 additions & 3 deletions EXAMPLES/Industrial_Format_SEP/interpolate.f90
Expand Up @@ -343,7 +343,7 @@ subroutine READ_SEP_HEADER(sep_directory,sep_header_file, &
integer :: ier
character(len=512) :: junk,sep_header_file_complete

sep_header_file_complete=trim(adjustl(sep_directory))//trim(adjustl(sep_header_file))
sep_header_file_complete = trim(adjustl(sep_directory))//trim(adjustl(sep_header_file))

open(unit=13,file=trim(adjustl(sep_header_file_complete)),status='old',iostat=ier)
print *
Expand All @@ -365,8 +365,8 @@ subroutine READ_SEP_HEADER(sep_directory,sep_header_file, &
read(13,'(a6i10)') junk, esize
read(13,'(a13a)') junk, data_format
close(13)
sep_file=trim(adjustl(sep_directory))//trim(adjustl(sep_file))
data_format=data_format(1:len_trim(adjustl(data_format))-1)
sep_file = trim(adjustl(sep_directory))//trim(adjustl(sep_file))
data_format = data_format(1:len_trim(adjustl(data_format))-1)

print *
print *, 'sep file specified in the header file is: ', trim(adjustl(sep_file))
Expand Down
10 changes: 5 additions & 5 deletions EXAMPLES/Marmousi_mesh_of_the_model/CUBIT_meshing/README.md
Expand Up @@ -28,7 +28,7 @@ Just run in consecutive order, or open in CUBIT/Trelis -> run script:
```
./5_convert_surface_rock_to_velocities.py
```
to create a file nummaterial_velocity_file_marmousi2. This will assign the original water layer to the mesh.
to create a file nummaterial_velocity_file_marmousi2. This will assign the original water layer to the mesh.
To replace the water layer with solid velocities as in Capdeville et al. 2010, use
```
./5_convert_surface_rock_to_velocities.py --without-water
Expand All @@ -39,9 +39,9 @@ Just run in consecutive order, or open in CUBIT/Trelis -> run script:
To run these python scripts in the command line, instead of opening the Cubit application and use the "run script"-Button,
you will need to make sure that within the python environment you can load the "cubit" module.

The most recent Coreform-Cubit version is 2023.11. It uses internally a python3.10 version.
The most recent Coreform-Cubit version is 2023.11. It uses internally a python3.10 version.
The details below describe how such a installation setup could look like for MacOS.

* for MacOS:
it requires to run this python script with the shipped Cubit version python
(due to different architecture compilations).
Expand All @@ -60,7 +60,7 @@ The details below describe how such a installation setup could look like for Mac
```

or create a symbolic link to the python version in `/usr/local/bin`:
```
```
sudo ln -s /Applications/Coreform-Cubit-2023.11.app/Contents/lib/python3/Python.framework/Versions/3.10/python3.10 python-cubit
```

Expand All @@ -69,6 +69,6 @@ The details below describe how such a installation setup could look like for Mac
- to import the cubit module, this also requires to add the Cubit library path to the `PYTHONPATH` environment variable, in `~/.bashrc` use:
```
export PYTHONPATH=$PYTHONPATH:${CUBITDIR}/Contents/lib/
```
```


4 changes: 2 additions & 2 deletions EXAMPLES/README.md
Expand Up @@ -3,13 +3,13 @@ README

This directory contains a set of examples to familiarize yourself with different modeling setups and for testing purposes.

Each example requires a `Par_file`, `SOURCE`, and either a file of interfaces OR an external mesh.
Each example requires a `Par_file`, `SOURCE`, and either a file of interfaces OR an external mesh.
The examples can be run in the current example directory, using the processing script:
```
./run_this_example.sh
```

If you're interested in how to setup and run a simple SPECFEM2D simulation,
If you're interested in how to setup and run a simple SPECFEM2D simulation,
we suggest to look at the **simple_topography_and_also_a_simple_fluid_layer/** example.

Please **consider submitting your own example** to this package!
Expand Down
2 changes: 1 addition & 1 deletion EXAMPLES/Tape2007_kernel/adj_seismogram_Tape2007.f90
Expand Up @@ -188,7 +188,7 @@ program adj_seismogram
ft_bar(:) = 0.d0
endif

do itime =1,NSTEP
do itime = 1,NSTEP
if (icomp == adj_comp) then
write(11,*) (itime-1)*deltat - t0, ft_bar(itime)
else
Expand Down
2 changes: 1 addition & 1 deletion EXAMPLES/Tromp2005_kernel/adj_seismogram_Tromp2005.f90
Expand Up @@ -221,7 +221,7 @@ program adj_seismogram
ft_bar(:) = 0.d0
endif

do itime =1,NSTEP
do itime = 1,NSTEP
if (icomp == adj_comp) then
write(11,*) (itime-1)*deltat - t0, ft_bar(itime)
else
Expand Down

0 comments on commit 9e0e0d5

Please sign in to comment.