From 40c745c7b289ca4bada2d87676b27baf3ba02084 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20R=C3=BCth?= Date: Fri, 10 Jan 2020 15:54:26 +0100 Subject: [PATCH 1/9] of-of: Fix replacement of xml element --- tests/TestCompose_of-of/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/TestCompose_of-of/docker-compose.yml b/tests/TestCompose_of-of/docker-compose.yml index 3d3a8bc25..c15443b2f 100644 --- a/tests/TestCompose_of-of/docker-compose.yml +++ b/tests/TestCompose_of-of/docker-compose.yml @@ -10,7 +10,7 @@ services: command: > /bin/bash -c "source /opt/openfoam4/etc/bashrc && cd /home/precice/openfoam-adapter/tutorials/CHT/flow-over-plate/buoyantPimpleFoam-laplacianFoam && - sed -i 's|gather-scatter\"|gather-scatter\" exchange-directory=\"/home/precice/Data/Exchange/\" network=\"eth0\"|g' precice-config_serial.xml && + sed -i 's|||g' precice-config.xml && ./runFluid && cp -r Fluid/ /home/precice/Data/Output/" container_name: openfoam-adapter-fluid @@ -25,7 +25,7 @@ services: command: > /bin/bash -c "source /opt/openfoam4/etc/bashrc && cd /home/precice/openfoam-adapter/tutorials/CHT/flow-over-plate/buoyantPimpleFoam-laplacianFoam && - sed -i 's|gather-scatter\"|gather-scatter\" exchange-directory=\"/home/precice/Data/Exchange/\" network=\"eth0\"|g' precice-config_serial.xml && + sed -i 's|||g' precice-config.xml && ./runSolid && cp -r Solid/ /home/precice/Data/Output/" container_name: openfoam-adapter-solid From b69724cf993a3d4d833e9f0cc322689be80f2d1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20R=C3=BCth?= Date: Fri, 10 Jan 2020 16:15:18 +0100 Subject: [PATCH 2/9] of-of_np: Fix replacement of xml element --- tests/TestCompose_of-of_np/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/TestCompose_of-of_np/docker-compose.yml b/tests/TestCompose_of-of_np/docker-compose.yml index 6d7ca8cc6..6a0ecf81e 100644 --- a/tests/TestCompose_of-of_np/docker-compose.yml +++ b/tests/TestCompose_of-of_np/docker-compose.yml @@ -10,7 +10,7 @@ services: command: > /bin/bash -c "source /opt/openfoam4/etc/bashrc && cd /home/precice/openfoam-adapter/tutorials/CHT/flow-over-plate/buoyantPimpleFoam-laplacianFoam_nearest-projection && - sed -i 's|gather-scatter\"|gather-scatter\" exchange-directory=\"/home/precice/Data/Exchange/\" network=\"eth0\"|g' precice-config_serial.xml && + sed -i 's|||g' precice-config.xml && ./runFluid && cp -r Fluid/ /home/precice/Data/Output/" container_name: openfoam-adapter-fluid @@ -25,7 +25,7 @@ services: command: > /bin/bash -c "source /opt/openfoam4/etc/bashrc && cd /home/precice/openfoam-adapter/tutorials/CHT/flow-over-plate/buoyantPimpleFoam-laplacianFoam_nearest-projection && - sed -i 's|gather-scatter\"|gather-scatter\" exchange-directory=\"/home/precice/Data/Exchange/\" network=\"eth0\"|g' precice-config_serial.xml && + sed -i 's|||g' precice-config.xml && ./runSolid && cp -r Solid/ /home/precice/Data/Output/" container_name: openfoam-adapter-solid From 832ce4a8e2ad7181001361d27f0eb47da893cfcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20R=C3=BCth?= Date: Fri, 10 Jan 2020 16:59:34 +0100 Subject: [PATCH 3/9] Replace post-processing with acceleration using sed --- tests/TestCompose_of-of/docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/TestCompose_of-of/docker-compose.yml b/tests/TestCompose_of-of/docker-compose.yml index c15443b2f..b9461db0f 100644 --- a/tests/TestCompose_of-of/docker-compose.yml +++ b/tests/TestCompose_of-of/docker-compose.yml @@ -11,6 +11,7 @@ services: /bin/bash -c "source /opt/openfoam4/etc/bashrc && cd /home/precice/openfoam-adapter/tutorials/CHT/flow-over-plate/buoyantPimpleFoam-laplacianFoam && sed -i 's|||g' precice-config.xml && + sed -i 's|post-processing|acceleration|g' precice-config.xml && ./runFluid && cp -r Fluid/ /home/precice/Data/Output/" container_name: openfoam-adapter-fluid @@ -26,6 +27,7 @@ services: /bin/bash -c "source /opt/openfoam4/etc/bashrc && cd /home/precice/openfoam-adapter/tutorials/CHT/flow-over-plate/buoyantPimpleFoam-laplacianFoam && sed -i 's|||g' precice-config.xml && + sed -i 's|post-processing|acceleration|g' precice-config.xml && ./runSolid && cp -r Solid/ /home/precice/Data/Output/" container_name: openfoam-adapter-solid From 2460f9afeae217eca4e21ae3b8ccba819d706229 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20R=C3=BCth?= Date: Fri, 10 Jan 2020 17:00:23 +0100 Subject: [PATCH 4/9] Replace post-processing with acceleration using sed --- tests/TestCompose_of-of_np/docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/TestCompose_of-of_np/docker-compose.yml b/tests/TestCompose_of-of_np/docker-compose.yml index 6a0ecf81e..caec3b77b 100644 --- a/tests/TestCompose_of-of_np/docker-compose.yml +++ b/tests/TestCompose_of-of_np/docker-compose.yml @@ -11,6 +11,7 @@ services: /bin/bash -c "source /opt/openfoam4/etc/bashrc && cd /home/precice/openfoam-adapter/tutorials/CHT/flow-over-plate/buoyantPimpleFoam-laplacianFoam_nearest-projection && sed -i 's|||g' precice-config.xml && + sed -i 's|post-processing|acceleration|g' precice-config.xml && ./runFluid && cp -r Fluid/ /home/precice/Data/Output/" container_name: openfoam-adapter-fluid @@ -26,6 +27,7 @@ services: /bin/bash -c "source /opt/openfoam4/etc/bashrc && cd /home/precice/openfoam-adapter/tutorials/CHT/flow-over-plate/buoyantPimpleFoam-laplacianFoam_nearest-projection && sed -i 's|||g' precice-config.xml && + sed -i 's|post-processing|acceleration|g' precice-config.xml && ./runSolid && cp -r Solid/ /home/precice/Data/Output/" container_name: openfoam-adapter-solid From 30c946d312b68f21196df62c1ab13fabcac5809a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20R=C3=BCth?= Date: Fri, 10 Jan 2020 17:04:06 +0100 Subject: [PATCH 5/9] Revert "Replace post-processing with acceleration using sed" This reverts commit 2460f9afeae217eca4e21ae3b8ccba819d706229. --- tests/TestCompose_of-of_np/docker-compose.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/TestCompose_of-of_np/docker-compose.yml b/tests/TestCompose_of-of_np/docker-compose.yml index caec3b77b..6a0ecf81e 100644 --- a/tests/TestCompose_of-of_np/docker-compose.yml +++ b/tests/TestCompose_of-of_np/docker-compose.yml @@ -11,7 +11,6 @@ services: /bin/bash -c "source /opt/openfoam4/etc/bashrc && cd /home/precice/openfoam-adapter/tutorials/CHT/flow-over-plate/buoyantPimpleFoam-laplacianFoam_nearest-projection && sed -i 's|||g' precice-config.xml && - sed -i 's|post-processing|acceleration|g' precice-config.xml && ./runFluid && cp -r Fluid/ /home/precice/Data/Output/" container_name: openfoam-adapter-fluid @@ -27,7 +26,6 @@ services: /bin/bash -c "source /opt/openfoam4/etc/bashrc && cd /home/precice/openfoam-adapter/tutorials/CHT/flow-over-plate/buoyantPimpleFoam-laplacianFoam_nearest-projection && sed -i 's|||g' precice-config.xml && - sed -i 's|post-processing|acceleration|g' precice-config.xml && ./runSolid && cp -r Solid/ /home/precice/Data/Output/" container_name: openfoam-adapter-solid From 8922c379ec54685f64653f13553bce9fdf479fd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20R=C3=BCth?= Date: Fri, 10 Jan 2020 17:04:24 +0100 Subject: [PATCH 6/9] Revert "Replace post-processing with acceleration using sed" This reverts commit 832ce4a8e2ad7181001361d27f0eb47da893cfcc. --- tests/TestCompose_of-of/docker-compose.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/TestCompose_of-of/docker-compose.yml b/tests/TestCompose_of-of/docker-compose.yml index b9461db0f..c15443b2f 100644 --- a/tests/TestCompose_of-of/docker-compose.yml +++ b/tests/TestCompose_of-of/docker-compose.yml @@ -11,7 +11,6 @@ services: /bin/bash -c "source /opt/openfoam4/etc/bashrc && cd /home/precice/openfoam-adapter/tutorials/CHT/flow-over-plate/buoyantPimpleFoam-laplacianFoam && sed -i 's|||g' precice-config.xml && - sed -i 's|post-processing|acceleration|g' precice-config.xml && ./runFluid && cp -r Fluid/ /home/precice/Data/Output/" container_name: openfoam-adapter-fluid @@ -27,7 +26,6 @@ services: /bin/bash -c "source /opt/openfoam4/etc/bashrc && cd /home/precice/openfoam-adapter/tutorials/CHT/flow-over-plate/buoyantPimpleFoam-laplacianFoam && sed -i 's|||g' precice-config.xml && - sed -i 's|post-processing|acceleration|g' precice-config.xml && ./runSolid && cp -r Solid/ /home/precice/Data/Output/" container_name: openfoam-adapter-solid From e39fb08b34ac087aee9b66fae773ec335703893b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20R=C3=BCth?= Date: Fri, 10 Jan 2020 17:34:52 +0100 Subject: [PATCH 7/9] escapte double quotes --- tests/TestCompose_of-of/docker-compose.yml | 2 +- tests/TestCompose_of-of_np/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/TestCompose_of-of/docker-compose.yml b/tests/TestCompose_of-of/docker-compose.yml index c15443b2f..973c2563a 100644 --- a/tests/TestCompose_of-of/docker-compose.yml +++ b/tests/TestCompose_of-of/docker-compose.yml @@ -10,7 +10,7 @@ services: command: > /bin/bash -c "source /opt/openfoam4/etc/bashrc && cd /home/precice/openfoam-adapter/tutorials/CHT/flow-over-plate/buoyantPimpleFoam-laplacianFoam && - sed -i 's|||g' precice-config.xml && + sed -i 's|||g' precice-config.xml && ./runFluid && cp -r Fluid/ /home/precice/Data/Output/" container_name: openfoam-adapter-fluid diff --git a/tests/TestCompose_of-of_np/docker-compose.yml b/tests/TestCompose_of-of_np/docker-compose.yml index 6a0ecf81e..6e250a654 100644 --- a/tests/TestCompose_of-of_np/docker-compose.yml +++ b/tests/TestCompose_of-of_np/docker-compose.yml @@ -10,7 +10,7 @@ services: command: > /bin/bash -c "source /opt/openfoam4/etc/bashrc && cd /home/precice/openfoam-adapter/tutorials/CHT/flow-over-plate/buoyantPimpleFoam-laplacianFoam_nearest-projection && - sed -i 's|||g' precice-config.xml && + sed -i 's|||g' precice-config.xml && ./runFluid && cp -r Fluid/ /home/precice/Data/Output/" container_name: openfoam-adapter-fluid From b456af7c74218c98e8912b35fe362e9928aa3811 Mon Sep 17 00:00:00 2001 From: Konrad Eder <53946421+Eder-K@users.noreply.github.com> Date: Sun, 12 Jan 2020 09:37:28 +0100 Subject: [PATCH 8/9] Escape quotes --- tests/TestCompose_of-of/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/TestCompose_of-of/docker-compose.yml b/tests/TestCompose_of-of/docker-compose.yml index 973c2563a..90aeedb4d 100644 --- a/tests/TestCompose_of-of/docker-compose.yml +++ b/tests/TestCompose_of-of/docker-compose.yml @@ -25,7 +25,7 @@ services: command: > /bin/bash -c "source /opt/openfoam4/etc/bashrc && cd /home/precice/openfoam-adapter/tutorials/CHT/flow-over-plate/buoyantPimpleFoam-laplacianFoam && - sed -i 's|||g' precice-config.xml && + sed -i 's|||g' precice-config.xml && ./runSolid && cp -r Solid/ /home/precice/Data/Output/" container_name: openfoam-adapter-solid From 1bfd07f3631469ef99558f53f672bb4757d12083 Mon Sep 17 00:00:00 2001 From: Konrad Eder <53946421+Eder-K@users.noreply.github.com> Date: Sun, 12 Jan 2020 09:37:46 +0100 Subject: [PATCH 9/9] Escape more quotes --- tests/TestCompose_of-of_np/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/TestCompose_of-of_np/docker-compose.yml b/tests/TestCompose_of-of_np/docker-compose.yml index 6e250a654..8fade523b 100644 --- a/tests/TestCompose_of-of_np/docker-compose.yml +++ b/tests/TestCompose_of-of_np/docker-compose.yml @@ -25,7 +25,7 @@ services: command: > /bin/bash -c "source /opt/openfoam4/etc/bashrc && cd /home/precice/openfoam-adapter/tutorials/CHT/flow-over-plate/buoyantPimpleFoam-laplacianFoam_nearest-projection && - sed -i 's|||g' precice-config.xml && + sed -i 's|||g' precice-config.xml && ./runSolid && cp -r Solid/ /home/precice/Data/Output/" container_name: openfoam-adapter-solid