Fix inconsistencies in structure of some tutorials (#490)

Co-authored-by: Gerasimos Chourdakis <[email protected]>

Author: uekerman

oscillator/README.md

@@ -10,7 +10,7 @@
         "mass.a": -197.392088022
     },
     "simulation_params": {
-        "fmu_file_name": "./Oscillator.fmu",
+        "fmu_file_name": "../solver-fmi/Oscillator.fmu",
         "output_file_name": "./output/trajectory-Mass-Left.csv",
         "output": ["mass.u", "mass.v"],
         "fmu_read_data_names": ["force_in"],

oscillator/python/clean.sh oscillator/mass-left-fmi/clean.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+set -e -u
+
+
+if [ ! -f ../solver-fmi/Oscillator.fmu ]; then
+  cd ../solver-fmi/fmu
+  rm -rf build
+  mkdir build
+  cd build
+  # Both FMI_VERSION=3 and FMI_VERSION=2 are supported
+  cmake -DFMI_TYPE=CS -DFMI_VERSION=3 ..
+  make
+  cp ./Oscillator.fmu ../..
+  cd ../../../mass-left-fmi
+fi
+
+fmiprecice fmi-settings.json precice-settings.json
+python3 ../solver-fmi/calculate-error.py ../mass-left-fmi/fmi-settings.json ../mass-left-fmi/precice-settings.json ../mass-right-fmi/fmi-settings.json ../mass-right-fmi/precice-settings.json Mass-Left

oscillator/fmi/MassLeft/fmi-settings.json oscillator/mass-left-fmi/fmi-settings.json

@@ -0,0 +1,4 @@
+#!/bin/sh
+set -e -u
+
+python3 ../solver-python/oscillator.py Mass-Left

oscillator/fmi/MassLeft/precice-settings.json oscillator/mass-left-fmi/precice-settings.json

@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e -u
+
+. ../../tools/cleaning-tools.sh
+
+rm -rfv ./output/
+
+clean_precice_logs .

oscillator/mass-left-fmi/run.sh

@@ -10,7 +10,7 @@
         "mass.a": 157.913670417
     },
     "simulation_params": {
-        "fmu_file_name": "./Oscillator.fmu",
+        "fmu_file_name": "../solver-fmi/Oscillator.fmu",
         "output_file_name": "./output/trajectory-Mass-Right.csv",
         "output": ["mass.u", "mass.v"],
         "fmu_read_data_names": ["force_in"],

oscillator/fmi/clean.sh oscillator/mass-left-python/clean.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+set -e -u
+
+
+if [ ! -f ../solver-fmi/Oscillator.fmu ]; then
+  cd ../solver-fmi/fmu
+  rm -rf build
+  mkdir build
+  cd build
+  # Both FMI_VERSION=3 and FMI_VERSION=2 are supported
+  cmake -DFMI_TYPE=CS -DFMI_VERSION=3 ..
+  make
+  cp ./Oscillator.fmu ../..
+  cd ../../../mass-right-fmi
+fi
+
+fmiprecice fmi-settings.json precice-settings.json
+python3 ../solver-fmi/calculate-error.py ../mass-left-fmi/fmi-settings.json ../mass-left-fmi/precice-settings.json ../mass-right-fmi/fmi-settings.json ../mass-right-fmi/precice-settings.json Mass-Right

oscillator/mass-left-python/run.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e -u
+
+. ../../tools/cleaning-tools.sh
+
+rm -rfv ./output/
+
+clean_precice_logs .

oscillator/mass-right-fmi/clean.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+set -e -u
+
+python3 ../solver-python/oscillator.py Mass-Right

oscillator/fmi/MassRight/fmi-settings.json oscillator/mass-right-fmi/fmi-settings.json

@@ -16,8 +16,10 @@ class PlotType(Enum):
 args = parser.parse_args()
 
 filename = args.csvFile
-split_filename = filename.split('/')
-solver = split_filename[0]
+split_foldername = filename.split('/')
+casename = split_foldername[0]
+split_casename = casename.split('-')
+solver = split_casename[-1]
 
 if solver == 'python':
     df = pd.read_csv(filename, delimiter=';')