Fix dealii-of and ccx-of_fsi [PETSc]

tests/TestCompose_dealii-of/Dockerfile.tutorial_data

@@ -4,10 +4,11 @@ RUN apk add git
 
 ARG branch=develop
 RUN git clone --branch $branch https://github.com/precice/tutorials
-RUN mkdir configs && sed -e 's|gather-scatter"|gather-scatter" exchange-directory="/home/precice/Data/Exchange/" network="eth0"|g' $tutorial_path/precice-config_serial.xml > configs/precice-config.xml
+RUN mkdir configs && sed -e 's|<m2n:sockets from=\"Fluid\" to=\"Solid\"/>|<m2n:sockets from=\"Fluid\" to=\"Solid\" exchange-directory=\"/home/precice/Data/Exchange/\" network=\"eth0\"/>|g'\
+ 		$tutorial_path/precice-config.xml > configs/precice-config.xml
 RUN sed -i '/application     pimpleFoam/d; s/\/\/ application     pimpleDyMFoam/application    pimpleDyMFoam/g' \
     $tutorial_path/Fluid/system/controlDict
-RUN rm $tutorial_path/precice-config_serial.xml $tutorial_path/precice-config.xml
+RUN rm $tutorial_path/precice-config.xml
 RUN rm -rfv $tutorial_path/Fluid/0/
 RUN cp -r $tutorial_path/Fluid/0.orig/ $tutorial_path/Fluid/0/
 RUN addgroup -g 1000 precice && adduser -u 1000 -G precice -D precice && chown -R precice:precice tutorials configs

tests/TestCompose_dealii-of/docker-compose.yml

@@ -1,9 +1,9 @@
 version : '3'
 services:
-  
-  dealii-adapter: 
+
+  dealii-adapter:
     image: "${SYSTEST_REMOTE}dealii-adapter${PRECICE_BASE}:${DEALII_TAG}"
-    networks: 
+    networks:
       - precicecomm
     volumes:
       - exchange:/home/precice/Data/Exchange/
@@ -12,28 +12,28 @@ services:
       - output:/home/precice/Data/Output/
     command: >
       /bin/bash -c "
-      ln -sf configs/* . && 
+      ln -sf configs/* . &&
       ./coupled_elasto_dynamics /home/precice/Data/Input/parameters.prm"
     container_name: dealii-adapter
     depends_on:
       - tutorial-data
       - openfoam-adapter
-    
-  openfoam-adapter: 
+
+  openfoam-adapter:
     image: "${SYSTEST_REMOTE}openfoam-adapter${PRECICE_BASE}:${OPENFOAM_TAG}"
-    networks: 
+    networks:
       - precicecomm
     volumes:
       - exchange:/home/precice/Data/Exchange/
       - input_of:/home/precice/Data/Input/
       - configs:/home/precice/openfoam-adapter/configs/
       - output:/home/precice/Data/Output/
     command: >
-      /bin/bash -c "source /opt/openfoam4/etc/bashrc && 
+      /bin/bash -c "source /opt/openfoam4/etc/bashrc &&
       ln -sf configs/* . &&
       blockMesh -case /home/precice/Data/Input &&
       checkMesh -case /home/precice/Data/Input &&
-      pimpleDyMFoam -case /home/precice/Data/Input &&
+      pimpleDyMFoam -case /home/precice/Data/Input > /dev/null 2>&1 &&
       cp -r /home/precice/Data/Input/. /home/precice/Data/Output/Fluid"
     container_name: openfoam-adapter
     depends_on:

tests/TestCompose_of-ccx_fsi.Ubuntu1604.home.PETSc/Dockerfile.tutorial_data

@@ -13,9 +13,9 @@ RUN sed -i '/application     pimpleFoam/d; s/\/\/ application     pimpleDyMFoam/
     $tutorial_path/Fluid/system/controlDict
 
 RUN mkdir configs &&  \
-    sed 's|distribution-type="gather-scatter"|distribution-type="gather-scatter" exchange-directory="/home/precice/Data/Exchange/" network="eth0"|g' \
-    $tutorial_path/precice-config_serial.xml > configs/precice-config.xml && cp $tutorial_path/config.yml configs/
-RUN rm $tutorial_path/precice-config_serial.xml $tutorial_path/precice-config.xml
+    sed -e 's|<m2n:sockets from=\"Fluid\" to=\"Calculix\"|<m2n:sockets from=\"Fluid\" to=\"Calculix\" exchange-directory=\"/home/precice/Data/Exchange/\" network=\"eth0\"/>|g' \
+    $tutorial_path/precice-config.xml > configs/precice-config.xml && cp $tutorial_path/config.yml configs/
+RUN rm $tutorial_path/precice-config.xml
 
 RUN addgroup -g 1000 precice && adduser -u 1000 -G precice -D precice && chown -R precice:precice tutorials configs
 USER precice