precice · Eder-K · Feb 15, 2020 · Jan 23, 2020 · Jan 24, 2020 · Jan 25, 2020
diff --git a/.travis.yml b/.travis.yml
@@ -10,6 +10,9 @@ jobs:
   allow_failures:
     - name: "Ubuntu 18.04.sudo.mpich [Job failure permitted]"
     - name: "Ubuntu 16.04 home PETSc [Job failure permitted]"
+    - name: "[16.04 PETSc] OpenFOAM <-> CalculiX [FSI] [Job failure permitted]"
+    - name: "openFOAM adapter [PETSc] [Job failure permitted]"
+    - name: "CalculiX adapter [PETSc] [Job failure permitted]"
 
   include:
     - stage: Building preCICE
@@ -70,20 +73,6 @@ jobs:
           echo "$DOCKER_PASSWORD" | docker login -u $DOCKER_USERNAME --password-stdin &&
           docker push $DOCKER_USERNAME/precice-ubuntu1604.sudo-develop:latest
 
-    - stage: Building preCICE
-      name: "Ubuntu 16.04.package"
-      if: type = cron
-      script:
-        - docker build -f precice/Dockerfile.Ubuntu1604.package -t $DOCKER_USERNAME/precice-ubuntu1604.package-develop .
-      deploy:
-        skip_cleanup: true
-        provider: script
-        on:
-          all_branches: true
-        script: >-
-          echo "$DOCKER_PASSWORD" | docker login -u $DOCKER_USERNAME --password-stdin &&
-          docker push $DOCKER_USERNAME/precice-ubuntu1604.package-develop:latest
-
     - stage: Building preCICE
       name: "Ubuntu 18.04.home"
       if: fork = false
@@ -227,7 +216,7 @@ jobs:
           echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin &&
           docker push $DOCKER_USERNAME/fenics-adapter-ubuntu1804.home-develop
 
-    - name: openFOAM adapter [PETSc]
+    - name: openFOAM adapter [PETSc] [Job failure permitted]
       if: fork = false
       script:
         - >
@@ -242,7 +231,7 @@ jobs:
           echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin &&
           docker push $DOCKER_USERNAME/openfoam-adapter-ubuntu1604.home.petsc-develop
 
-    - name: CalculiX adapter [PETSc]
+    - name: CalculiX adapter [PETSc] [Job failure permitted]
       if: fork = false
       script:
         - >
@@ -358,7 +347,7 @@ jobs:
           all_branches: true
         script: python push.py -s -t of-of_np
 
-    - name: "[16.04 PETSc] OpenFOAM <-> CalculiX [FSI]"
+    - name: "[16.04 PETSc] OpenFOAM <-> CalculiX [FSI] [Job failure permitted]"
       script:
         - python system_testing.py -s of-ccx_fsi --base Ubuntu1604.home.PETSc
       after_failure:

diff --git a/README.md b/README.md
@@ -29,7 +29,11 @@ More information can be found in the [docs](docs/)
 To run OpenFOAM-OpenFOAM system test using Ubuntu 16.04 as the base for building preCICE and adapters:
 
 ```
-   python3 local_test.py -s of-of -f Dockerfile.Ubuntu1604.home
+   python3 local_test.py -s of-of -d Dockerfile.Ubuntu1604.home
 ```
-
 Run `python3 local_test.py -h` for more information.
+
+Alternatively, for debugging purposes, it might be useful to execute `system_testing.py` directly to emulate a TravisCI run. Here an example Fenics-Fenics test using Ubuntu 18.04 with verbose container output (`-v`) enabled:
+```
+python system_testing.py -s fe-fe --base Ubuntu1804.home -v
+```
diff --git a/adapters/Dockerfile.openfoam-adapter b/adapters/Dockerfile.openfoam-adapter
@@ -9,13 +9,12 @@ ENV USER=root
 # Install dependecies
 RUN apt-get -qq update && apt-get -qq install \
     software-properties-common \
-    wget apt-transport-https \
-    libyaml-cpp-dev && \
+    wget apt-transport-https && \
     rm -rf /var/lib/apt/lists/*
 
 ARG CACHEBUST
 
-COPY --from=openfoam /opt/openfoam4 /opt/openfoam4/
+COPY --from=openfoam /opt/openfoam5 /opt/openfoam5/
 
 # Building openfoam-adapter
 USER precice
@@ -24,5 +23,5 @@ WORKDIR /home/precice
 ARG branch=develop
 RUN git clone  --branch $branch https://github.com/precice/openfoam-adapter.git
 WORKDIR /home/precice/openfoam-adapter
-RUN . /opt/openfoam4/etc/bashrc && ./Allwmake
+RUN . /opt/openfoam5/etc/bashrc && ./Allwmake
 RUN cd $HOME && mkdir -p Data/Input Data/Output Data/Exchange
diff --git a/adapters/Dockerfile.openfoam-adapter.Ubuntu1804 b/adapters/Dockerfile.openfoam-adapter.Ubuntu1804
@@ -9,8 +9,7 @@ ENV USER=root
 # Install dependecies
 RUN apt-get -qq update && apt-get -qq install \
     software-properties-common \
-    wget apt-transport-https \
-    libyaml-cpp-dev && \
+    wget apt-transport-https && \
     rm -rf /var/lib/apt/lists/*
 
 ARG CACHEBUST
@@ -19,7 +18,7 @@ COPY --from=openfoam /opt/openfoam5 /opt/openfoam5/
 
 # Building openfoam-adapter
 USER precice
-SHELL ["/bin/bash", "-c"]  # without this command /opt/openfoam5/etc/bashrc cannot be sources
+SHELL ["/bin/bash", "-c"]  # without this command /opt/openfoam5/etc/bashrc cannot be sourced
 WORKDIR /home/precice
 ARG branch=develop
 RUN git clone  --branch $branch https://github.com/precice/openfoam-adapter.git

diff --git a/precice/Dockerfile.Arch b/precice/Dockerfile.Arch
@@ -39,9 +39,9 @@ RUN mkdir /home/precice/precice-build && \
           -DCMAKE_BUILD_TYPE=RelWithDebInfo \
           -DPRECICE_CTEST_MPI_FLAGS="--oversubscribe" \
           -DCMAKE_INSTALL_PREFIX=/home/precice/precice-install \
-          -DPETSC=$petsc_para \
-          -DMPI=$mpi_para \
-          -DPYTHON=$python_para \
+          -DPRECICE_PETScMapping=$petsc_para \
+          -DPRECICE_MPICommunication=$mpi_para \
+          -DPRECICE_PythonActions=$python_para \
           /home/precice/precice && \
     make -j$(nproc) && \
     make test_base && \

diff --git a/precice/Dockerfile.Ubuntu1604.home b/precice/Dockerfile.Ubuntu1604.home
@@ -6,13 +6,13 @@ FROM ubuntu:16.04
 # Installing necessary dependacies for preCICE
 RUN apt-get -qq update && apt-get -qq install \
     build-essential \
-    libeigen3-dev \
     libxml2-dev \
     petsc-dev \
     git \
     python-numpy \
     python-dev \
     wget \
+    pkg-config \    
     bzip2 && \
     rm -rf /var/lib/apt/lists/*
 
@@ -21,6 +21,11 @@ WORKDIR /cmake
 RUN wget -q -O- 'https://github.com/Kitware/CMake/releases/download/v3.13.4/cmake-3.13.4-Linux-x86_64.tar.gz' | tar xz
 ENV PATH="/cmake/cmake-3.13.4-Linux-x86_64/bin:$PATH"
 
+# Installing eigen from source
+WORKDIR /eigen
+RUN wget -nv 'https://gitlab.com/libeigen/eigen/-/archive/3.3.7/eigen-3.3.7.tar.bz2' -O - | tar xj
+ENV Eigen3_ROOT="/eigen/eigen-3.3.7"
+
 # Installing boost from source
 WORKDIR /boost-build
 RUN wget -nv 'https://dl.bintray.com/boostorg/release/1.65.1/source/boost_1_65_1.tar.bz2' -O - | tar xj && \
@@ -54,7 +59,7 @@ WORKDIR /home/precice/precice
 # Some parameters for the build, you can set them in the build command e.g.
 # sudo docker build Dockerfile.precice --build-arg petsc_para=yes --build-arg mpi_para=yes .
 # this will result in
-# cmake -DPETSC=yes -DMPI=yes -DPYTHON=no -DCMAKE_CXX_COMPILER=mpicxx -j2 /precice
+# cmake -DPRECICE_PETScMapping=yes -DPRECICE_MPICommunication=yes -DPRECICE_PythonActions=no -DCMAKE_CXX_COMPILER=mpicxx -j2 /precice
 ARG petsc_para=no
 ARG mpi_para=yes
 ARG python_para=no
@@ -65,9 +70,9 @@ RUN mkdir /home/precice/precice-build && \
     cmake -DBUILD_SHARED_LIBS=ON \
           -DCMAKE_BUILD_TYPE=RelWithDebInfo \
           -DCMAKE_INSTALL_PREFIX=/home/precice/precice-install \
-          -DPETSC=$petsc_para \
-          -DMPI=$mpi_para \
-          -DPYTHON=$python_para \
+          -DPRECICE_PETScMapping=$petsc_para \
+          -DPRECICE_MPICommunication=$mpi_para \
+          -DPRECICE_PythonActions=$python_para \
           /home/precice/precice && \
     make -j$(nproc) && \
     make test_base && \

diff --git a/precice/Dockerfile.Ubuntu1604.package b/precice/Dockerfile.Ubuntu1604.package
@@ -6,13 +6,13 @@ FROM ubuntu:16.04
 # Installing necessary dependacies for preCICE
 RUN apt-get -qq update && apt-get -qq install \
     build-essential \
-    libeigen3-dev \
     libxml2-dev \
     petsc-dev \
     git \
     python-numpy \
     python-dev \
     wget \
+    pkg-config \
     bzip2 && \
     rm -rf /var/lib/apt/lists/*
 
@@ -21,6 +21,11 @@ WORKDIR /cmake
 RUN wget -q -O- 'https://github.com/Kitware/CMake/releases/download/v3.13.4/cmake-3.13.4-Linux-x86_64.tar.gz' | tar xz
 ENV PATH="/cmake/cmake-3.13.4-Linux-x86_64/bin:$PATH"
 
+# Installing eigen from source
+WORKDIR /eigen
+RUN wget -nv 'https://gitlab.com/libeigen/eigen/-/archive/3.3.7/eigen-3.3.7.tar.bz2' -O - | tar xj
+ENV Eigen3_ROOT="/eigen/eigen-3.3.7"
+
 # Installing boost from source
 WORKDIR /boost-build
 RUN wget -nv 'https://dl.bintray.com/boostorg/release/1.65.1/source/boost_1_65_1.tar.bz2' -O - | tar xj && \
@@ -50,7 +55,7 @@ RUN git clone --branch $branch https://github.com/precice/precice.git /home/prec
 # Some parameters for the build, you can set them in the build command e.g.
 # sudo docker build Dockerfile.precice --build-arg petsc_para=yes --build-arg mpi_para=yes .
 # this will result in
-# cmake -DPETSC=yes -DMPI=yes -DPYTHON=no -DCMAKE_CXX_COMPILER=mpicxx -j2 /home/precice/precice
+# cmake -DPRECICE_PETScMapping=yes -DPRECICE_MPICommunication=yes -DPRECICE_PythonActions=no -DCMAKE_CXX_COMPILER=mpicxx -j2 /home/precice/precice
 ARG petsc_para=no
 ARG mpi_para=yes
 ARG python_para=no
@@ -62,9 +67,9 @@ RUN mkdir /home/precice/precice-build && \
           -DPRECICE_InstallTest=ON \
           -DCMAKE_INSTALL_PREFIX=/usr \
           -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-          -DPETSC=$petsc_para \
-          -DMPI=$mpi_para \
-          -DPYTHON=$python_para \
+          -DPRECICE_PETScMapping=$petsc_para \
+          -DPRECICE_MPICommunication=$mpi_para \
+          -DPRECICE_PythonActions=$python_para \
           /home/precice/precice && \ 
     make -j$(nproc) && \
     make test_base && \

diff --git a/precice/Dockerfile.Ubuntu1604.sudo b/precice/Dockerfile.Ubuntu1604.sudo
@@ -6,13 +6,13 @@ FROM ubuntu:16.04
 # Installing necessary dependacies for preCICE
 RUN apt-get -qq update && apt-get -qq install \
     build-essential \
-    libeigen3-dev \
     libxml2-dev \
     petsc-dev \
     git \
     python-numpy \
     python-dev \
     wget \
+    pkg-config \
     bzip2 && \
     rm -rf /var/lib/apt/lists/*
 
@@ -21,6 +21,11 @@ WORKDIR /cmake
 RUN wget -q -O- 'https://github.com/Kitware/CMake/releases/download/v3.13.4/cmake-3.13.4-Linux-x86_64.tar.gz' | tar xz
 ENV PATH="/cmake/cmake-3.13.4-Linux-x86_64/bin:$PATH"
 
+# Installing eigen from source
+WORKDIR /eigen
+RUN wget -nv 'https://gitlab.com/libeigen/eigen/-/archive/3.3.7/eigen-3.3.7.tar.bz2' -O - | tar xj
+ENV Eigen3_ROOT="/eigen/eigen-3.3.7"
+
 # Installing boost from source
 WORKDIR /boost-build
 RUN wget -nv 'https://dl.bintray.com/boostorg/release/1.65.1/source/boost_1_65_1.tar.bz2' -O - | tar xj && \
@@ -50,7 +55,7 @@ RUN git clone --branch $branch https://github.com/precice/precice.git /home/prec
 # Some parameters for the build, you can set them in the build command e.g.
 # sudo docker build Dockerfile.precice --build-arg petsc_para=yes --build-arg mpi_para=yes .
 # this will result in
-# cmake -DPETSC=yes -DMPI=yes -DPYTHON=no -DCMAKE_CXX_COMPILER=mpicxx -j2 /home/precice/precice
+# cmake -DPRECICE_PETScMapping=yes -DPRECICE_MPICommunication=yes -DPRECICE_PythonActions=no -DCMAKE_CXX_COMPILER=mpicxx -j2 /home/precice/precice
 ARG petsc_para=no
 ARG mpi_para=yes
 ARG python_para=no
@@ -60,9 +65,9 @@ RUN mkdir /home/precice/precice-build && \
     cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
           -DBUILD_SHARED_LIBS=ON \
           -DCMAKE_INSTALL_PREFIX=/usr/local \
-          -DPETSC=$petsc_para \
-          -DMPI=$mpi_para \
-          -DPYTHON=$python_para \
+          -DPRECICE_PETScMapping=$petsc_para \
+          -DPRECICE_MPICommunication=$mpi_para \
+          -DPRECICE_PythonActions=$python_para \
           /home/precice/precice && \
     make -j$(nproc) && \
     make test_base

diff --git a/precice/Dockerfile.Ubuntu1804.home b/precice/Dockerfile.Ubuntu1804.home
@@ -42,7 +42,7 @@ WORKDIR /home/precice/precice
 # Some parameters for the build, you can set them in the build command e.g.
 # sudo docker build Dockerfile.precice --build-arg petsc_para=yes --build-arg mpi_para=yes .
 # this will result in
-# cmake -DPETSC=yes -DMPI=yes -DPYTHON=no -DCMAKE_CXX_COMPILER=mpicxx -j2 /precice
+# cmake -DPRECICE_PETScMapping=yes -DPRECICE_MPICommunication=yes -DPRECICE_PythonActions=no -DCMAKE_CXX_COMPILER=mpicxx -j2 /precice
 ARG petsc_para=no
 ARG mpi_para=yes
 ARG python_para=no
@@ -53,9 +53,9 @@ RUN mkdir /home/precice/precice-build && \
     cmake -DBUILD_SHARED_LIBS=ON \
           -DCMAKE_BUILD_TYPE=RelWithDebInfo \
           -DCMAKE_INSTALL_PREFIX=/home/precice/precice-install \
-          -DPETSC=$petsc_para \
-          -DMPI=$mpi_para \
-          -DPYTHON=$python_para \
+          -DPRECICE_PETScMapping=$petsc_para \
+          -DPRECICE_MPICommunication=$mpi_para \
+          -DPRECICE_PythonActions=$python_para \
           /home/precice/precice && \
     make -j$(nproc) && \
     make test_base && \

diff --git a/precice/Dockerfile.Ubuntu1804.package b/precice/Dockerfile.Ubuntu1804.package
@@ -38,7 +38,7 @@ RUN git clone --branch $branch https://github.com/precice/precice.git /home/prec
 # Some parameters for the build, you can set them in the build command e.g.
 # sudo docker build Dockerfile.precice --build-arg petsc_para=yes --build-arg mpi_para=yes .
 # this will result in
-# cmake -DPETSC=yes -DMPI=yes -DPYTHON=no -DCMAKE_CXX_COMPILER=mpicxx -j2 /home/precice/precice
+# cmake -DPRECICE_PETScMapping=yes -DPRECICE_MPICommunication=yes -DPRECICE_PythonActions=no -DCMAKE_CXX_COMPILER=mpicxx -j2 /home/precice/precice
 ARG petsc_para=no
 ARG mpi_para=yes
 ARG python_para=no
@@ -50,9 +50,9 @@ RUN mkdir /home/precice/precice-build && \
           -DPRECICE_InstallTest=ON \
           -DCMAKE_INSTALL_PREFIX=/usr \
           -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-          -DPETSC=$petsc_para \
-          -DMPI=$mpi_para \
-          -DPYTHON=$python_para \
+          -DPRECICE_PETScMapping=$petsc_para \
+          -DPRECICE_MPICommunication=$mpi_para \
+          -DPRECICE_PythonActions=$python_para \
           /home/precice/precice && \
     make -j$(nproc) && \
     make test_base && \

diff --git a/precice/Dockerfile.Ubuntu1804.sudo b/precice/Dockerfile.Ubuntu1804.sudo
@@ -38,7 +38,7 @@ RUN git clone --branch $branch https://github.com/precice/precice.git /home/prec
 # Some parameters for the build, you can set them in the build command e.g.
 # sudo docker build Dockerfile.precice --build-arg petsc_para=yes --build-arg mpi_para=yes .
 # this will result in
-# cmake -DPETSC=yes -DMPI=yes -DPYTHON=no -DCMAKE_CXX_COMPILER=mpicxx -j2 /home/precice/precice
+# cmake -DPRECICE_PETScMapping=yes -DPRECICE_MPICommunication=yes -DPRECICE_PythonActions=no -DCMAKE_CXX_COMPILER=mpicxx -j2 /home/precice/precice
 ARG petsc_para=no
 ARG mpi_para=yes
 ARG python_para=no
@@ -48,9 +48,9 @@ RUN mkdir /home/precice/precice-build && \
     cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
           -DBUILD_SHARED_LIBS=ON \
           -DCMAKE_INSTALL_PREFIX=/usr/local \
-          -DPETSC=$petsc_para \
-          -DMPI=$mpi_para \
-          -DPYTHON=$python_para \
+          -DPRECICE_PETScMapping=$petsc_para \
+          -DPRECICE_MPICommunication=$mpi_para \
+          -DPRECICE_PythonActions=$python_para \
           /home/precice/precice && \
     make -j$(nproc) && \
     make test_base

diff --git a/precice/Dockerfile.Ubuntu1804.sudo.mpich b/precice/Dockerfile.Ubuntu1804.sudo.mpich
@@ -39,7 +39,7 @@ RUN git clone --branch $branch https://github.com/precice/precice.git /home/prec
 # Some parameters for the build, you can set them in the build command e.g.
 # sudo docker build Dockerfile.precice --build-arg petsc_para=yes --build-arg mpi_para=yes .
 # this will result in
-# cmake -DPETSC=yes -DMPI=yes -DPYTHON=no -DCMAKE_CXX_COMPILER=mpicxx -DMPIEXEC_EXECUTABLE=mpiexec -j2 /home/precice/precice
+# cmake -DPRECICE_PETScMapping=yes -DPRECICE_MPICommunication=yes -DPRECICE_PythonActions=no -DCMAKE_CXX_COMPILER=mpicxx -DMPIEXEC_EXECUTABLE=mpiexec -j2 /home/precice/precice
 ARG petsc_para=no
 ARG mpi_para=yes
 ARG python_para=no
@@ -49,9 +49,9 @@ RUN mkdir /home/precice/precice-build && \
     cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
           -DBUILD_SHARED_LIBS=ON \
           -DCMAKE_INSTALL_PREFIX=/usr/local \
-          -DPETSC=$petsc_para \
-          -DMPI=$mpi_para \
-          -DPYTHON=$python_para \
+          -DPRECICE_PETScMapping=$petsc_para \
+          -DPRECICE_MPICommunication=$mpi_para \
+          -DPRECICE_PythonActions=$python_para \
           -DCMAKE_CXX_COMPILER=/usr/bin/mpicxx.mpich \
           -DMPIEXEC_EXECUTABLE=/usr/bin/mpiexec.mpich \
           /home/precice/precice && \