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

Update CalculiX-related tests to use v2.16 #231

Merged
Eder-K merged 17 commits into from
Jun 19, 2020
Merged

Update CalculiX-related tests to use v2.16 #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c399011
Update ccx version to 2.16
Eder-K May 27, 2020
b44defe
Update solver to ccx 2.16
Eder-K May 27, 2020
84854da
Fix line
Eder-K May 27, 2020
4a4681f
Use ccx-2.16 docker image
Eder-K May 27, 2020
686d826
Shorten su2-ccx test to 25 iterations
Eder-K May 28, 2020
6393223
Update reference for of-ccx
Eder-K May 28, 2020
f57a7a6
Fix link
Eder-K May 28, 2020
3dea313
Decrease iterations
Eder-K May 28, 2020
2a259e0
Update reference
Eder-K May 31, 2020
2ac43bc
Update reference
Eder-K May 31, 2020
4771586
Merge branch 'develop' into EderK-ccx216
Eder-K Jun 18, 2020
e946b20
Merge branch 'develop' into EderK-ccx216
Eder-K Jun 19, 2020
3bad596
Update reference
Eder-K Jun 19, 2020
a801f31
Enable output for of-ccx_fsi petsc
Eder-K Jun 19, 2020
5eaa6ba
Enable output for su-ccx
Eder-K Jun 19, 2020
1844c41
Update reference
Eder-K Jun 19, 2020
4cf1be6
Restore travis.yml
Eder-K Jun 19, 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
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,12 +334,12 @@ jobs:
- name: "[16.04] Elastictube1D - Python"
script:
- python system_testing.py -s 1dtube_py -v
- python push.py --test 1dtube_py -o
- python push.py --test 1dtube_py

- name: "[16.04] Elastictube1D - C++"
script:
- python system_testing.py -s 1dtube_cxx -v
- python push.py --test 1dtube_cxx -o
- python push.py --test 1dtube_cxx

- name: "[16.04 PETSc] OpenFOAM <-> CalculiX [FSI] [Job failure permitted]"
script:
Expand Down
6 changes: 3 additions & 3 deletions adapters/Dockerfile.calculix-adapter
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG from=precice/precice-ubuntu1604.home-develop
ARG base_solver=precice/calculix
ARG base_solver=precice/calculix:2.16
FROM ${base_solver} as calculix
FROM $from

Expand All @@ -25,12 +25,12 @@ COPY --from=calculix /spooles.2.2 /spooles.2.2
USER precice
# get calculix source
WORKDIR /home/precice
RUN curl -s http://www.dhondt.de/ccx_2.15.src.tar.bz2 | tar -xj
RUN curl -s http://www.dhondt.de/ccx_2.16.src.tar.bz2 | tar -xj
ARG branch=develop
RUN git clone --branch $branch https://github.com/precice/calculix-adapter.git
WORKDIR calculix-adapter/
# specify proper locations of libraries
RUN sed -i -e 's|CCX\s\+=.*|CCX = /home/precice/CalculiX/ccx_2.15/src|g'\
RUN sed -i -e 's|CCX\s\+=.*|CCX = /home/precice/CalculiX/ccx_2.16/src|g'\
-e 's|SPOOLES\s\+=.*|SPOOLES = /spooles.2.2|g'\
-e 's|ARPACK\s\+=.*|ARPACK = /usr/local/ARPACK|g'\
-e 's|-L$(YAML)/build||g' \
Expand Down
8 changes: 4 additions & 4 deletions solvers/Dockerfile.calculix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ RUN apt-get -qq update && apt-get -qq install \
sudo && \
rm -rf /var/lib/apt/lists/*

# Downloading CalculiX 2.15
# Downloading CalculiX 2.16
WORKDIR /
RUN curl -s http://www.dhondt.de/ccx_2.15.src.tar.bz2 | tar -xj
RUN curl -s http://www.dhondt.de/ccx_2.16.src.tar.bz2 | tar -xj

# Installing spooles
WORKDIR /
Expand All @@ -43,11 +43,11 @@ RUN curl -s https://www.caam.rice.edu//software/ARPACK/SRC/arpack96.tar.gz | tar
&& sed -i 's/ EXTERNAL ETIME/* EXTERNAL ETIME/g' UTIL/second.f \
&& make all

WORKDIR /CalculiX/ccx_2.15/src
WORKDIR /CalculiX/ccx_2.16/src

# replace hardcoded paths in CalculiX
RUN sed -i -e 's|\.\./\.\./\.\./SPOOLES.2.2|/spooles.2.2|g' \
-e 's|\.\./\.\./\.\./ARPACK|/usr/local/ARPACK|g' \
Makefile

RUN make -j $(nproc) $ && rm *.o
RUN make -j $(nproc) && rm *.o
2 changes: 1 addition & 1 deletion tests/TestCompose_su2-ccx.Ubuntu1604.home/Dockerfile.tutorial_data
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ 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; s|max-time-windows value="400"|max-time-windows value="100"|g'\
sed -e 's|exchange-directory="\.\./"|exchange-directory="/home/precice/Data/Exchange/" network="eth0"|g; s|max-time-windows value="400"|max-time-windows value="50"|g; s|max-iterations value="50"|max-iterations value="20"|g'\
$tutorial_path/precice-config.xml > configs/precice-config.xml
RUN rm $tutorial_path/precice-config.xml
RUN cp $tutorial_path/config.yml configs/
Expand Down
264 changes: 0 additions & 264 deletions tests/TestCompose_su2-ccx.Ubuntu1604.home/referenceOutput/flap.cvg
View file
Open in desktop

Large diffs are not rendered by default.

132 changes: 0 additions & 132 deletions tests/TestCompose_su2-ccx.Ubuntu1604.home/referenceOutput/flap.sta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,135 +165,3 @@ SUMMARY OF JOB INFORMATION
1 50 1 2 0.500000E+00 0.500000E+00 0.100000E-01
1 50 2 2 0.500000E+00 0.500000E+00 0.100000E-01
1 50 2 2 0.500000E+00 0.500000E+00 0.100000E-01
1 51 1 2 0.510000E+00 0.510000E+00 0.100000E-01
1 51 2 2 0.510000E+00 0.510000E+00 0.100000E-01
1 51 2 2 0.510000E+00 0.510000E+00 0.100000E-01
1 52 1 2 0.520000E+00 0.520000E+00 0.100000E-01
1 52 2 2 0.520000E+00 0.520000E+00 0.100000E-01
1 52 2 2 0.520000E+00 0.520000E+00 0.100000E-01
1 53 1 2 0.530000E+00 0.530000E+00 0.100000E-01
1 53 2 2 0.530000E+00 0.530000E+00 0.100000E-01
1 53 2 2 0.530000E+00 0.530000E+00 0.100000E-01
1 54 1 2 0.540000E+00 0.540000E+00 0.100000E-01
1 54 2 2 0.540000E+00 0.540000E+00 0.100000E-01
1 54 2 2 0.540000E+00 0.540000E+00 0.100000E-01
1 55 1 2 0.550000E+00 0.550000E+00 0.100000E-01
1 55 2 2 0.550000E+00 0.550000E+00 0.100000E-01
1 55 2 2 0.550000E+00 0.550000E+00 0.100000E-01
1 56 1 2 0.560000E+00 0.560000E+00 0.100000E-01
1 56 2 2 0.560000E+00 0.560000E+00 0.100000E-01
1 56 2 2 0.560000E+00 0.560000E+00 0.100000E-01
1 57 1 2 0.570000E+00 0.570000E+00 0.100000E-01
1 57 2 2 0.570000E+00 0.570000E+00 0.100000E-01
1 57 2 2 0.570000E+00 0.570000E+00 0.100000E-01
1 58 1 2 0.580000E+00 0.580000E+00 0.100000E-01
1 58 2 2 0.580000E+00 0.580000E+00 0.100000E-01
1 58 2 2 0.580000E+00 0.580000E+00 0.100000E-01
1 59 1 2 0.590000E+00 0.590000E+00 0.100000E-01
1 59 2 2 0.590000E+00 0.590000E+00 0.100000E-01
1 60 1 2 0.600000E+00 0.600000E+00 0.100000E-01
1 60 2 2 0.600000E+00 0.600000E+00 0.100000E-01
1 61 1 2 0.610000E+00 0.610000E+00 0.100000E-01
1 61 2 2 0.610000E+00 0.610000E+00 0.100000E-01
1 61 2 2 0.610000E+00 0.610000E+00 0.100000E-01
1 62 1 2 0.620000E+00 0.620000E+00 0.100000E-01
1 62 2 2 0.620000E+00 0.620000E+00 0.100000E-01
1 63 1 2 0.630000E+00 0.630000E+00 0.100000E-01
1 63 2 2 0.630000E+00 0.630000E+00 0.100000E-01
1 63 2 2 0.630000E+00 0.630000E+00 0.100000E-01
1 64 1 2 0.640000E+00 0.640000E+00 0.100000E-01
1 64 2 2 0.640000E+00 0.640000E+00 0.100000E-01
1 65 1 2 0.650000E+00 0.650000E+00 0.100000E-01
1 65 2 2 0.650000E+00 0.650000E+00 0.100000E-01
1 65 2 2 0.650000E+00 0.650000E+00 0.100000E-01
1 66 1 2 0.660000E+00 0.660000E+00 0.100000E-01
1 66 2 2 0.660000E+00 0.660000E+00 0.100000E-01
1 66 2 2 0.660000E+00 0.660000E+00 0.100000E-01
1 67 1 2 0.670000E+00 0.670000E+00 0.100000E-01
1 67 2 2 0.670000E+00 0.670000E+00 0.100000E-01
1 67 2 2 0.670000E+00 0.670000E+00 0.100000E-01
1 68 1 2 0.680000E+00 0.680000E+00 0.100000E-01
1 68 2 2 0.680000E+00 0.680000E+00 0.100000E-01
1 68 2 2 0.680000E+00 0.680000E+00 0.100000E-01
1 69 1 2 0.690000E+00 0.690000E+00 0.100000E-01
1 69 2 2 0.690000E+00 0.690000E+00 0.100000E-01
1 69 2 2 0.690000E+00 0.690000E+00 0.100000E-01
1 70 1 2 0.700000E+00 0.700000E+00 0.100000E-01
1 70 2 2 0.700000E+00 0.700000E+00 0.100000E-01
1 71 1 2 0.710000E+00 0.710000E+00 0.100000E-01
1 71 2 2 0.710000E+00 0.710000E+00 0.100000E-01
1 71 2 2 0.710000E+00 0.710000E+00 0.100000E-01
1 72 1 2 0.720000E+00 0.720000E+00 0.100000E-01
1 72 2 2 0.720000E+00 0.720000E+00 0.100000E-01
1 73 1 2 0.730000E+00 0.730000E+00 0.100000E-01
1 73 2 2 0.730000E+00 0.730000E+00 0.100000E-01
1 73 2 2 0.730000E+00 0.730000E+00 0.100000E-01
1 74 1 2 0.740000E+00 0.740000E+00 0.100000E-01
1 74 2 2 0.740000E+00 0.740000E+00 0.100000E-01
1 75 1 2 0.750000E+00 0.750000E+00 0.100000E-01
1 75 2 2 0.750000E+00 0.750000E+00 0.100000E-01
1 76 1 2 0.760000E+00 0.760000E+00 0.100000E-01
1 76 2 2 0.760000E+00 0.760000E+00 0.100000E-01
1 76 2 2 0.760000E+00 0.760000E+00 0.100000E-01
1 77 1 2 0.770000E+00 0.770000E+00 0.100000E-01
1 77 2 2 0.770000E+00 0.770000E+00 0.100000E-01
1 77 2 2 0.770000E+00 0.770000E+00 0.100000E-01
1 78 1 2 0.780000E+00 0.780000E+00 0.100000E-01
1 78 2 2 0.780000E+00 0.780000E+00 0.100000E-01
1 79 1 2 0.790000E+00 0.790000E+00 0.100000E-01
1 79 2 2 0.790000E+00 0.790000E+00 0.100000E-01
1 79 2 2 0.790000E+00 0.790000E+00 0.100000E-01
1 80 1 2 0.800000E+00 0.800000E+00 0.100000E-01
1 80 2 2 0.800000E+00 0.800000E+00 0.100000E-01
1 81 1 2 0.810000E+00 0.810000E+00 0.100000E-01
1 81 2 2 0.810000E+00 0.810000E+00 0.100000E-01
1 82 1 2 0.820000E+00 0.820000E+00 0.100000E-01
1 82 2 2 0.820000E+00 0.820000E+00 0.100000E-01
1 83 1 2 0.830000E+00 0.830000E+00 0.100000E-01
1 83 2 2 0.830000E+00 0.830000E+00 0.100000E-01
1 83 2 2 0.830000E+00 0.830000E+00 0.100000E-01
1 84 1 2 0.840000E+00 0.840000E+00 0.100000E-01
1 84 2 2 0.840000E+00 0.840000E+00 0.100000E-01
1 84 2 2 0.840000E+00 0.840000E+00 0.100000E-01
1 85 1 2 0.850000E+00 0.850000E+00 0.100000E-01
1 85 2 2 0.850000E+00 0.850000E+00 0.100000E-01
1 86 1 2 0.860000E+00 0.860000E+00 0.100000E-01
1 86 2 2 0.860000E+00 0.860000E+00 0.100000E-01
1 87 1 2 0.870000E+00 0.870000E+00 0.100000E-01
1 87 2 2 0.870000E+00 0.870000E+00 0.100000E-01
1 88 1 2 0.880000E+00 0.880000E+00 0.100000E-01
1 88 2 2 0.880000E+00 0.880000E+00 0.100000E-01
1 88 2 2 0.880000E+00 0.880000E+00 0.100000E-01
1 89 1 2 0.890000E+00 0.890000E+00 0.100000E-01
1 89 2 2 0.890000E+00 0.890000E+00 0.100000E-01
1 89 2 2 0.890000E+00 0.890000E+00 0.100000E-01
1 90 1 2 0.900000E+00 0.900000E+00 0.100000E-01
1 90 2 2 0.900000E+00 0.900000E+00 0.100000E-01
1 90 2 2 0.900000E+00 0.900000E+00 0.100000E-01
1 91 1 2 0.910000E+00 0.910000E+00 0.100000E-01
1 91 2 2 0.910000E+00 0.910000E+00 0.100000E-01
1 91 2 2 0.910000E+00 0.910000E+00 0.100000E-01
1 92 1 2 0.920000E+00 0.920000E+00 0.100000E-01
1 92 2 2 0.920000E+00 0.920000E+00 0.100000E-01
1 92 2 2 0.920000E+00 0.920000E+00 0.100000E-01
1 93 1 2 0.930000E+00 0.930000E+00 0.100000E-01
1 93 2 2 0.930000E+00 0.930000E+00 0.100000E-01
1 93 2 2 0.930000E+00 0.930000E+00 0.100000E-01
1 94 1 2 0.940000E+00 0.940000E+00 0.100000E-01
1 94 2 2 0.940000E+00 0.940000E+00 0.100000E-01
1 95 1 2 0.950000E+00 0.950000E+00 0.100000E-01
1 95 2 2 0.950000E+00 0.950000E+00 0.100000E-01
1 96 1 2 0.960000E+00 0.960000E+00 0.100000E-01
1 96 2 2 0.960000E+00 0.960000E+00 0.100000E-01
1 96 2 2 0.960000E+00 0.960000E+00 0.100000E-01
1 97 1 2 0.970000E+00 0.970000E+00 0.100000E-01
1 97 2 2 0.970000E+00 0.970000E+00 0.100000E-01
1 98 1 2 0.980000E+00 0.980000E+00 0.100000E-01
1 98 2 2 0.980000E+00 0.980000E+00 0.100000E-01
1 98 2 2 0.980000E+00 0.980000E+00 0.100000E-01
1 99 1 2 0.990000E+00 0.990000E+00 0.100000E-01
1 99 2 2 0.990000E+00 0.990000E+00 0.100000E-01
1 99 2 2 0.990000E+00 0.990000E+00 0.100000E-01
1 100 1 2 0.100000E+01 0.100000E+01 0.100000E-01
1 100 2 2 0.100000E+01 0.100000E+01 0.100000E-01
1 100 2 2 0.100000E+01 0.100000E+01 0.100000E-01
Loading