Skip to content
This repository was archived by the owner on Aug 14, 2025. It is now read-only.

Fix SU2-Calculix #152

Merged
Eder-K merged 5 commits into from
Jan 12, 2020
Merged

Fix SU2-Calculix #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aede0c2
Update configuration filename
Eder-K Jan 12, 2020
531c3c3
Run silent_compose in detached mode
Eder-K Jan 12, 2020
8fdd0d6
Revert '-d' argument adding
Eder-K Jan 12, 2020
8d15ebe
Redirect ccx output to logfile
Eder-K Jan 12, 2020
b3d219d
Redirect ccx output to null
Eder-K Jan 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions tests/TestCompose_su2-ccx/Dockerfile.tutorial_data
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ RUN apk add git bash
ARG branch=develop
RUN git clone --branch $branch https://github.com/precice/tutorials

RUN mkdir configs && sed -e 's|exchange-directory="../"|exchange-directory="/home/precice/Data/Exchange/" network="eth0"|g'\
$tutorial_path/precice-config_serial.xml > configs/precice-config.xml
RUN rm $tutorial_path/precice-config_serial.xml $tutorial_path/precice-config.xml
RUN mkdir configs && sed -e 's|exchange-directory="../"|exchange-directory="/home/precice/Data/Exchange/" network="eth0"|g'\
$tutorial_path/precice-config.xml > configs/precice-config.xml
RUN rm $tutorial_path/precice-config.xml
RUN cp $tutorial_path/config.yml configs/
RUN addgroup -g 1000 precice && adduser -u 1000 -G precice -D precice && chown -R precice:precice tutorials configs
USER precice
18 changes: 9 additions & 9 deletions tests/TestCompose_su2-ccx/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
version : '3'
services:
calculix-adapter:
calculix-adapter:
image: "${SYSTEST_REMOTE}calculix-adapter${PRECICE_BASE}:${CALCULIX_TAG}"
networks:
networks:
- precicecomm
volumes:
- exchange:/home/precice/Data/Exchange/
- output:/home/precice/Data/Output/
- input_solid:/home/precice/Data/Input/
- configs:/home/precice/calculix-adapter/configs
command: >
/bin/bash -c "ln -sf /home/precice/Data/Input Solid;
/bin/bash -c "ln -sf /home/precice/Data/Input Solid;
ln -sf /home/precice/calculix-adapter/configs/* . &&
ccx_preCICE -i Solid/flap -precice-participant Calculix &&
ccx_preCICE -i Solid/flap -precice-participant Calculix > /dev/null 2>&1 &&

@Eder-K Eder-K Jan 12, 2020 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The test succeeds, I had to temporarily disable output of the Calculix participant since the Travis log would get too large and the job errors. This is not critical, but before finally merging #148 (where we won't print the output by default) we should remove this again so it doesn't cause problems in the future.

cp Solid/*.dat Solid/*.cvg Solid/*.sta *.log *.out /home/precice/Data/Output/"
container_name: calculix-adapter
depends_on:
- tutorial-data

su2-adapter:
image: "${SYSTEST_REMOTE}su2-adapter${PRECICE_BASE}:${SU2_TAG}"
networks:
networks:
- precicecomm
volumes:
- exchange:/home/precice/Data/Exchange/
- output:/home/precice/Data/Output/
- input_fluid:/home/precice/Data/Input/
- configs:/home/precice/su2-adapter/configs
command: >
/bin/bash -c "ln -sf /home/precice/Data/Input Fluid &&
command: >
/bin/bash -c "ln -sf /home/precice/Data/Input Fluid &&
ln -sf /home/precice/su2-adapter/configs/* . &&
SU2_CFD Fluid/euler_config_coupled.cfg &&
cp flow*.vtk *.csv *.dat *SU2*.log /home/precice/Data/Output/"
container_name: su2-adapter
depends_on:
depends_on:
- tutorial-data

tutorial-data:
Expand All @@ -45,7 +45,7 @@ services:
- input_fluid:/tutorials/FSI/flap_perp/SU2-CalculiX/Fluid
- configs:/configs/
- output:/Output/
container_name: tutorial-data
container_name: tutorial-data

networks:
precicecomm:
Expand Down