Add elastictube1d test

common.py

@@ -43,7 +43,7 @@ def get_test_variants(test_name, root = os.path.join(os.getcwd(), 'tests')):
 
 def get_test_participants(test_name):
     """ Returns solvers that participate in the test """
-    solvers_abbr = {"ccx": "calculix-adapter", "su2": "su2-adapter", "of": "openfoam-adapter", 
+    solvers_abbr = {"ccx": "calculix-adapter", "su2": "su2-adapter", "of": "openfoam-adapter",
             "dealii":"dealii-adapter", "bindings": "bindings", "fe":"fenics-adapter", "nutils": "nutils"}
 
     return [solvers_abbr[abbr] for abbr in  test_name.lower().split('_')[0].split('-')]

compare_results.sh

@@ -55,22 +55,34 @@ if [ -n "$diff_files" ]; then
   mapfile -t array_files < <( echo "$diff_files"  | sed 's/Files\|and\|differ//g' )
   arr_len="${#array_files[@]}"
 
+  # loop through differing files
   for (( i = 0; i<${arr_len}; i = i + 1));
   do
     file1=$( echo "${array_files[i]}" | awk '{print $1}' )
     file2=$( echo "${array_files[i]}" | awk '{print $2}' )
 
-    raw_diff=$( diff -y --speed-large-files --suppress-common-lines "$file1" "$file2" )
     # Filter output files, ignore lines with words (probably not the results)
-    # removes |<>() characters
     # Do not delete "e", since it can be used as exponent
-    num_diff=$( echo "$raw_diff" | sed 's/(\|)\||\|>\|<//g; /[a-df-zA-Z]\|Version/d' )
+    # removes |<>() characters
+    num_filter='s/(\|)\||\|>\|<//g; /[a-df-zA-Z]\|[vV]ersion/d'
     # Filter for text lines. Compare these seperately from numerical lines
-    text_diff=$( echo "$raw_diff" | sed '/[A-Za-df-z]/!d' )
+    # Ignore any timestamps
+    txt_filter='s/(\|)\||\|>\|<//g; /[a-df-zA-Z]\|[vV]ersion/!d; s/[0-9][0-9]:[0-9][0-9]:[0-9][0-9]//g; /Timestamp\|[rR]untime\|Unexpected end of/d; /Run finished/q'
+    file1_num=$( cat "$file1" | sed "$num_filter")
+    file2_num=$( cat "$file2" | sed "$num_filter")
+
+    file1_txt=$( cat "$file1" | sed "$txt_filter")
+    file2_txt=$( cat "$file2" | sed "$txt_filter")
+
+
+    num_diff=$( diff -y --speed-large-files --suppress-common-lines <(echo "$file1_num") <(echo "$file2_num") )
+    txt_diff=$( diff -y --speed-large-files --suppress-common-lines <(echo "$file1_txt") <(echo "$file2_txt") )
 
 
     # Pairwise compares files fields, that are produces from diffs and computes average and maximum
     # relative differences
+    filename=$(basename $file1) # total file paths are pretty long, this keep info concise
+    echo "Comparing values in '$filename'..."
     if [ -n "$num_diff" ]; then
       rel_max_difference=$( export max_diff_limit; export avg_diff_limit; echo "$num_diff" | awk 'function abs(v) {return v < 0 ? -v : v} { radius=NF/2;
               max_diff=0;
@@ -89,12 +101,13 @@ if [ -n "$diff_files" ]; then
       # Split by space and transform into the array
       difference=( $rel_max_difference )
       echo -e "> Numerical difference in $file1 and $file2"
+      echo -e "$num_diff"
       echo -e "Average: ${difference[0]} ; Maximum: ${difference[1]} ${NC}"
       ret=1
     fi
-    if [ -n "$text_diff" ]; then
+    if [ -n "$txt_diff" ]; then
       echo -e "> Text difference in $file1 and $file2"
-      echo -e "$text_diff"
+      echo -e "$txt_diff"
       ret=1
     fi
   done

system_testing.py

@@ -162,7 +162,7 @@ def comparison(pathToRef, pathToOutput):
 def build_run_compare(test, tag, branch, local_precice, force_rebuild, rm_all=False, verbose=False):
     """ Runs and compares test, using precice branch. """
     compose_tests = ["dealii-of", "of-of", "su2-ccx", "of-ccx", "of-of_np",
-            "fe-fe","nutils-of", "of-ccx_fsi"]
+            "fe-fe","nutils-of", "of-ccx_fsi", "1dtube_cxx", "1dtube_py"]
     test_basename = test.split(".")[0]
     if local_precice:
         build_adapters(test_basename, tag, branch, local_precice, force_rebuild)
@@ -225,7 +225,7 @@ def compose_tag(docker_username, base, features, branch):
     parser.add_argument('-l', '--local', action='store_true', help="Use local preCICE image (default: use remote image)")
     parser.add_argument('-s', '--systemtest', type=str, help="Choose system tests you want to use",
                         choices = common.get_tests(), required = True)
-    parser.add_argument('-b', '--branch', help="preCICE branch to use", default=os.environ["TRAVIS_BRANCH"] if os.environ["TRAVIS_PULL_REQUEST"] == "false" else "develop")  # make sure that branch corresponding to system tests branch is used, if no branch is explicitly specified. If we are testing a pull request, will test against develop by default.
+    parser.add_argument('-b', '--branch', help="preCICE branch to use", default="develop")  # make sure that branch corresponding to system tests branch is used, if no branch is explicitly specified. If we are testing a pull request, will test against develop by default.
 # Usage of the branch argument:
 #   When on a PR, this will by default use the develop versions of preCICE and adapter images.
 #   This makes it easier to experiment with tests, which are most commonly addressed by PRs

tests/TestCompose_1dtube_cxx.Ubuntu1604.home/.env

@@ -0,0 +1,2 @@
+SYSTEST_REMOTE=precice/
+PRECICE_BASE=

tests/TestCompose_1dtube_cxx.Ubuntu1604.home/Dockerfile.1dtubecxx

@@ -0,0 +1,20 @@
+ARG from=precice/precice-ubuntu1604.home-develop
+FROM $from
+USER root
+
+RUN apt-get -qq update && apt-get -qq install \
+    liblapack-dev && \
+    rm -rf /var/lib/apt/lists/*
+
+
+ARG CACHEBUST
+
+
+USER precice
+
+WORKDIR /home/precice/
+RUN git clone https://github.com/precice/elastictube1d.git
+
+RUN mkdir -p Data/Output/Postproc
+WORKDIR /home/precice/elastictube1d/cxx
+RUN cmake . && make all

tests/TestCompose_1dtube_cxx.Ubuntu1604.home/Dockerfile.tutorial_data

@@ -0,0 +1,10 @@
+from alpine
+
+RUN apk add git
+ARG branch=develop
+
+WORKDIR /
+# adjust configuration and paths
+RUN mkdir Output
+RUN addgroup -g 1000 precice && adduser -u 1000 -G precice -D precice Output
+USER precice

tests/TestCompose_1dtube_cxx.Ubuntu1604.home/docker-compose.yml

@@ -0,0 +1,34 @@
+version: '3'
+services:
+  1dtube-ccx:
+    build:
+      context: .
+      dockerfile: Dockerfile.1dtubecxx
+      args:
+        from: "${SYSTEST_REMOTE}precice${PRECICE_BASE}"
+    networks:
+      - precicecomm
+    volumes:
+      - output:/home/precice/Data/Output/
+    command: >
+      /bin/bash -c "./Allrun &&
+        cp *.log /home/precice/Data/Output/ &&
+        cp -r Postproc /home/precice/Data/Output/ &&
+        rm /home/precice/Data/Output/*summary.log"
+    container_name: 1dtube-ccx
+
+  tutorial-data:
+    build:
+      context: .
+      dockerfile: Dockerfile.tutorial_data
+      args:
+        branch: "develop"
+    volumes:
+      - output:/Output/
+    container_name: tutorial-data
+
+
+networks:
+  precicecomm:
+volumes:
+  output: