From 0f6f20b642559f140621f67cec0b68aaf1b5d41f Mon Sep 17 00:00:00 2001
From: farid <farid.mohammadi@iws.uni-stuttgart.de>
Date: Fri, 12 Nov 2021 10:56:55 +0100
Subject: [PATCH] [PA-A][stokespnm] move and rename extractpointovertime
script.
---
BayesValidRox/tests/PA-A/model_exe.py | 5 ++---
.../stokespnm/extractdata.py} | 0
.../tests/PA-A/models/stokespnm/model_stokespnm_exe.py | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
rename BayesValidRox/tests/PA-A/{extractpointdataovertime.py => models/stokespnm/extractdata.py} (100%)
diff --git a/BayesValidRox/tests/PA-A/model_exe.py b/BayesValidRox/tests/PA-A/model_exe.py
index 11a5707c1..a394a54b7 100755
--- a/BayesValidRox/tests/PA-A/model_exe.py
+++ b/BayesValidRox/tests/PA-A/model_exe.py
@@ -68,9 +68,8 @@ if Process1 != 0:
# Extract velocity and pressure values with pvpython
if model == 'stokespnm' and not averaging:
- Command = "pvpython ../extractpointdataovertime.py \
- -f "+pvdfile1+".pvd "+pvdfile2+".pvd\
- -p "
+ Command = "pvpython ../models/{}/extractdata.py \
+ -f {}.pvd {}.pvd -p ".format(model_dir,pvdfile1,pvdfile2)
Process2 = os.system(Command + velocity_points)
if Process2 != 0:
diff --git a/BayesValidRox/tests/PA-A/extractpointdataovertime.py b/BayesValidRox/tests/PA-A/models/stokespnm/extractdata.py
similarity index 100%
rename from BayesValidRox/tests/PA-A/extractpointdataovertime.py
rename to BayesValidRox/tests/PA-A/models/stokespnm/extractdata.py
diff --git a/BayesValidRox/tests/PA-A/models/stokespnm/model_stokespnm_exe.py b/BayesValidRox/tests/PA-A/models/stokespnm/model_stokespnm_exe.py
index c938b4de1..8294fbfd3 100755
--- a/BayesValidRox/tests/PA-A/models/stokespnm/model_stokespnm_exe.py
+++ b/BayesValidRox/tests/PA-A/models/stokespnm/model_stokespnm_exe.py
@@ -55,7 +55,7 @@ if averaging:
print('\tIf value of \'%d\' is a non-zero value, then compilation problems \n' % Process4)
else:
# Extract velocity and pressure values with pvpython
- Command = "pvpython ../../extractpointdataovertime.py \
+ Command = "pvpython extractdata.py \
-f "+pvdfile1+".pvd "+pvdfile2+".pvd\
-p "
--
GitLab