Merge pull request #133 from geodynamics/developer

Merge developer into master

.github/workflows/dependencies-linux.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -eu -o pipefail
+
+sudo apt-get update
+
+sudo apt-get install libproj-dev libhdf5-mpi-dev libfftw3-dev libfftw3-mpi-dev liblapack-dev python3-h5py libcurl3-dev

.github/workflows/linux.yml

@@ -0,0 +1,59 @@
+name: linux 
+
+on:
+  push:
+    branches: [ master, developer ]
+  pull_request:
+    branches: [ master, developer ]
+
+  # Allows to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  SW4:
+    runs-on: ubuntu-latest
+    # timeout-minutes: 90
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Dependencies
+        run: .github/workflows/dependencies-linux.sh
+
+      - name: Build SW4
+        run: make sw4 CXX=mpicxx FC=gfortran debug=no proj_6=yes hdf5=yes fftw=yes zfp=no prec=double EXTRA_LINK_FLAGS="-lgfortran -lhdf5 -llapack" EXTRA_CXX_FLAGS=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H HDF5ROOT=/usr/lib/x86_64-linux-gnu/hdf5/openmpi FFTWHOME=/usr/lib/x86_64-linux-gnu -j2
+
+      - name: Test SW4
+        working-directory: ./pytest
+        run: |
+          # All tests except HDF5 ones 
+          ./test_sw4.py -m 2 -t 2 -u 0
+          # Run 1st HDF5 test
+          ./test_sw4.py -m 2 -t 2 -u 1
+          # Run 2nd HDF5 test
+          ./test_sw4.py -m 2 -t 2 -u 2
+          # Run 3rd HDF5 test
+          ./test_sw4.py -m 2 -t 2 -u 3
+
+  # SW4mopt:
+  #   runs-on: ubuntu-latest
+  #   # timeout-minutes: 90
+
+  #   steps:
+  #     - uses: actions/checkout@v2
+
+  #     - name: Dependencies
+  #       run: .github/workflows/dependencies-linux.sh
+
+  #     - name: Build SW4mopt
+  #       run: make sw4mopt CXX=mpicxx FC=gfortran debug=no proj=yes hdf5=yes fftw=yes zfp=no prec=double EXTRA_LINK_FLAGS="-lgfortran -lhdf5 -llapack" EXTRA_CXX_FLAGS=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H HDF5ROOT=/usr/lib/x86_64-linux-gnu/hdf5/openmpi FFTWHOME=/usr/lib/x86_64-linux-gnu -j2
+
+  #     - name: Test SW4mopt
+  #       working-directory: ./pytest-sw4mopt
+  #       run: |
+  #         ./test_sw4mopt.py -d optimize_mp -m 2 -t 2 -v
+  #         echo "Output"
+  #         cat ./gaussian/*.out
+  #         echo "Error log"
+  #         cat ./gaussian/*.err
+

.gitignore

@@ -11,9 +11,9 @@ build/
 
 *.synctex.gz
 
-optimize/
+optimize*/
 
-debug/
+debug*/
 
 *.o
 

CMakeLists.txt

@@ -108,9 +108,9 @@ SET(SW4_SRC_C_FILES src/main.C src/EW.C src/Sarray.C src/version.C src/parseInpu
     src/TestRayleighWave.C src/MaterialPfile.C src/Filter.C src/Polynomial.C
     src/SecondOrderSection.C src/time_functions.C src/Qspline.C
     src/EtreeFile.C src/MaterialIfile.C src/GeographicProjection.C 
-    src/Image3D.C src/MaterialVolimagefile.C
-    src/MaterialRfile.C src/AnisotropicMaterialBlock.C src/sacutils.C
-    src/consintp.C src/addmemvarforcing2.C)
+    src/Image3D.C src/MaterialVolimagefile.C src/SfileOutput.C
+    src/MaterialRfile.C src/MaterialSfile.C src/AnisotropicMaterialBlock.C src/sacutils.C
+    src/consintp.C src/addmemvarforcing2.C src/ESSI3D.C src/ESSI3DHDF5.C  src/sachdf5.C src/readhdf5.C)
 
 SET(SW4_SRC_F_FILES src/addsgd.f src/bcfort.f 
     src/randomfield3d.f src/testsrc.f src/twilightfort.f