Skip to content

Commit de9e5b9

Browse files
committed
Merge oscillator run scripts
Not fully merged in #466 Related to #461
1 parent f5377d9 commit de9e5b9

File tree

6 files changed

+24
-80
lines changed

6 files changed

+24
-80
lines changed

oscillator/fmi/run.sh

Lines changed: 0 additions & 45 deletions
This file was deleted.

oscillator/mass-left-fmi/run.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
#!/bin/sh
1+
#!/bin/bash
22
set -e -u
33

4+
. ../../tools/log.sh
5+
exec > >(tee --append "$LOGFILE") 2>&1
46

57
if [ ! -f ../solver-fmi/Oscillator.fmu ]; then
68
cd ../solver-fmi/fmu
@@ -16,3 +18,5 @@ fi
1618

1719
fmiprecice fmi-settings.json precice-settings.json
1820
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
21+
22+
close_log

oscillator/mass-left-python/run.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
#!/bin/sh
1+
#!/bin/bash
22
set -e -u
33

4-
python3 ../solver-python/oscillator.py Mass-Left
4+
. ../../tools/log.sh
5+
exec > >(tee --append "$LOGFILE") 2>&1
6+
7+
python3 ../solver-python/oscillator.py Mass-Left
8+
9+
close_log

oscillator/mass-right-fmi/run.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
#!/bin/sh
1+
#!/bin/bash
22
set -e -u
33

4+
. ../../tools/log.sh
5+
exec > >(tee --append "$LOGFILE") 2>&1
46

57
if [ ! -f ../solver-fmi/Oscillator.fmu ]; then
68
cd ../solver-fmi/fmu
@@ -16,3 +18,5 @@ fi
1618

1719
fmiprecice fmi-settings.json precice-settings.json
1820
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
21+
22+
close_log
Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
#!/bin/sh
1+
#!/bin/bash
22
set -e -u
33

4-
python3 ../solver-python/oscillator.py Mass-Right
4+
. ../../tools/log.sh
5+
exec > >(tee --append "$LOGFILE") 2>&1
6+
7+
python3 ../solver-python/oscillator.py Mass-Right
8+
9+
close_log

oscillator/python/run.sh

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)