diff --git a/.github/ci_scripts/github_linux_basic b/.github/ci_scripts/github_linux_basic index e5714a1b4..a884b34d5 100644 --- a/.github/ci_scripts/github_linux_basic +++ b/.github/ci_scripts/github_linux_basic @@ -10,14 +10,14 @@ ISSM_CONFIG='\ --with-numthreads=4 \ --with-matlab-dir=${MATLAB_PATH} \ --with-fortran-lib="-L/usr/lib/x86_64-linux-gnu -lgfortran" \ - --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \ - --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \ - --with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \ - --with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \ - --with-parmetis-dir=${ISSM_DIR}/externalpackages/petsc/install \ - --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \ - --with-mumps-dir=${ISSM_DIR}/externalpackages/petsc/install \ - --with-petsc-dir=${ISSM_DIR}/externalpackages/petsc/install \ + --with-mpi-include="-I/usr/lib/x86_64-linux-gnu/openmpi/include/" \ + --with-mpi-libflags="-L/usr/lib/x86_64-linux-gnu/openmpi/lib -lmpi" \ + --with-petsc-dir="/usr/lib/petscdir/petsc-real/" \ + --with-blas-lapack-dir="/usr/lib/petscdir/petsc-real/" \ + --with-metis-dir="/usr/lib/petscdir/petsc-real/" \ + --with-parmetis-dir="/usr/lib/petscdir/petsc-real/" \ + --with-scalapack-dir="/usr/lib/petscdir/petsc-real/" \ + --with-mumps-dir="/usr/lib/petscdir/petsc-real/" \ --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \ --with-m1qn3-dir=${ISSM_DIR}/externalpackages/m1qn3/install \ --with-semic-dir=${ISSM_DIR}/externalpackages/semic/install \ @@ -28,10 +28,10 @@ ISSM_CONFIG='\ #-------------------# # #autotools install-linux.sh +#cmake install.sh +#petsc install-3.21-linux.sh EXTERNALPACKAGES=" - cmake install.sh - petsc install-3.21-linux.sh triangle install-linux.sh m1qn3 install-linux.sh semic install.sh diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index edf8437c7..731f48a6d 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -21,18 +21,9 @@ jobs: with: release: R2023b - - name: Print MATLAB root folder directly - run: echo ${{ steps.setup-matlab.outputs.matlabroot }} - - - name: Check CMAKE - run: which cmake - - name: Install PETSc run: sudo apt-get install -y petsc-dev - - name: Find PETSc lib - run: ls /usr/lib/x86_64-linux-gnu/ - - name: compile ISSM on linux basic env: MATLAB_PATH: ${{ steps.setup-matlab.outputs.matlabroot }}