Rework elastic-tube-1d cpp solvers (#197)

Work mostly by @fsimonis, minor changes by me.

Co-authored-by Frédéric Simonis <simonisfrederic@gmail.com>

Author: fsimonis

elastic-tube-1d/README.md

@@ -61,17 +61,14 @@ Open two separate terminals and start each participant by calling the respective
 ```
 cd fluid-cpp
 ./run.sh
-# or, in parallel: ./run.sh -parallel
 ```
 and
 ```
 cd solid-cpp
 ./run.sh
 ```
 
-The run scripts set the input parameters `N = 100`, `tau = 0.01`, `kappa = 100`. 
-
-{% include warning.html content= "Running serial or parallel leads to different results. Please refer to this [open issue](https://github.com/precice/tutorials/issues/194) for more insight. Contributions are particularly welcome here." %}
+The solvers use the parameters `N = 100`, `tau = 0.01`, `kappa = 100` by default and can be modified in the solver. 
 
 ### Python
 
@@ -114,8 +111,6 @@ python3 plot-vtk.py diameter fluid-python/output/out_fluid_
 ```
 ![FSI3 setup](images/tutorials-elastic-tube-1d-diameter.png)
 
-Note that the prefix also contains the rank in the parallel C++ case.
-
 ## References
 
 [1] B. Gatzhammer. Efficient and Flexible Partitioned Simulation of Fluid-Structure Interactions. Technische Universitaet Muenchen, Fakultaet fuer Informatik, 2014.

elastic-tube-1d/fluid-cpp/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required (VERSION 3.10)
 
 project(ElasticTube LANGUAGES CXX)
 set (CMAKE_CXX_STANDARD 11)
@@ -11,34 +11,17 @@ if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
 endif()
 message(STATUS "Build configuration: " ${CMAKE_BUILD_TYPE})
 
-
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-unused-parameter")
 endif()
 
 find_package(precice REQUIRED CONFIG)
-
-find_package(MPI REQUIRED
-  COMPONENTS CXX)
-
-include_directories(${MPI_CXX_INCLUDE_DIRS})
-set(COMPILE_OPTIONS  ${COMPILE_FLAGS} ${MPI_CXX_COMPILE_OPTIONS})
-set(LINK_FLAGS ${LINK_FLAGS} ${MPI_CXX_LINK_FLAGS})
-add_definitions(${MPI_CXX_COMPILE_DEFINTIONS})
-
-message(${MPI_CXX_LIBRARIES})
-
 find_package(LAPACK REQUIRED)
-set(LINK_FLAGS ${LINK_FLAGS} ${LAPACK_LINKER_FLAGS})
-
 
 add_executable(FluidSolver
-  "src/FluidSolver.cpp"
-  "src/utilities.cpp"
-  "src/FluidComputeSolution.cpp")
+  src/FluidSolver.cpp
+  src/utilities.cpp
+  src/FluidComputeSolution.cpp)
 
 target_link_libraries(FluidSolver PRIVATE precice::precice)
-target_link_libraries(FluidSolver PUBLIC ${LAPACK_LIBRARIES})
-target_link_libraries(FluidSolver PUBLIC ${MPI_CXX_LIBRARIES})
-
-
+target_link_libraries(FluidSolver PRIVATE ${LAPACK_LIBRARIES} ${LAPACK_LINKER_FLAGS})

elastic-tube-1d/fluid-cpp/run.sh

@@ -1,8 +1,4 @@
 #!/bin/sh
 set -e -u
 
-if [ "${1:-}" = "-parallel" ]; then
-    mpiexec -np 4 ./build/FluidSolver ../precice-config.xml 100 0.01 100 -parallel
-else
-    ./build/FluidSolver ../precice-config.xml 100 0.01 100
-fi
+./build/FluidSolver ../precice-config.xml