From aa9b92f3db9806f56240e9afc97b6fdf721a5288 Mon Sep 17 00:00:00 2001
From: acrovato <a.crovato@uliege.be>
Date: Wed, 26 Jul 2023 16:08:43 +0200
Subject: [PATCH] Move custom parser GUI check from tbox utils to dart default
---
dart/default.py | 17 +++++++++++++++++
dart/tests/lift.py | 2 +-
dart/tests/morpher.py | 4 ++--
dart/tests/nonlift.py | 2 +-
dart/validation/agard.py | 2 +-
dart/validation/onera.py | 2 +-
ext/amfe | 2 +-
vii/tests/bli2D.py | 4 ++--
8 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/dart/default.py b/dart/default.py
index 2a05db4..6d118f0 100644
--- a/dart/default.py
+++ b/dart/default.py
@@ -224,3 +224,20 @@ def initViewer(problem):
if not args.nogui:
from tbox.viewer import GUI
GUI().open( problem.msh.name )
+
+def plot(x, y, cfg):
+ """Plot data with check
+
+ Parameters
+ ----------
+ x : array of float
+ x-data
+ y : array of float
+ y-data
+ cfg : dictionary
+ plot configuration
+ """
+ args = parseargs()
+ if not args.nogui:
+ import tbox.utils as utils
+ utils.plot(x, y, cfg)
diff --git a/dart/tests/lift.py b/dart/tests/lift.py
index 345eacf..a541a83 100644
--- a/dart/tests/lift.py
+++ b/dart/tests/lift.py
@@ -80,7 +80,7 @@ def main():
# visualize solution and plot results
floD.initViewer(pbl)
- tboxU.plot(Cp[:,0], Cp[:,3], {'xlabel': 'x', 'ylabel': 'Cp', 'title': 'Cl = {0:.{3}f}, Cd = {1:.{3}f}, Cm = {2:.{3}f}'.format(solver.Cl, solver.Cd, solver.Cm, 4), 'invert': True})
+ floD.plot(Cp[:,0], Cp[:,3], {'xlabel': 'x', 'ylabel': 'Cp', 'title': 'Cl = {0:.{3}f}, Cd = {1:.{3}f}, Cm = {2:.{3}f}'.format(solver.Cl, solver.Cd, solver.Cm, 4), 'invert': True})
# check results
print(ccolors.ANSI_BLUE + 'PyTesting...' + ccolors.ANSI_RESET)
diff --git a/dart/tests/morpher.py b/dart/tests/morpher.py
index 1c9e6a3..ff109a7 100644
--- a/dart/tests/morpher.py
+++ b/dart/tests/morpher.py
@@ -128,8 +128,8 @@ def main():
print(tms)
# visualize solution and plot results
- tboxU.plot(Cp[:,0], Cp[:,3], {'xlabel': 'x', 'ylabel': 'Cp', 'title': 'Cl = {0:.{3}f}, Cd = {1:.{3}f}, Cm = {2:.{3}f}'.format(solver.Cl, solver.Cd, solver.Cm, 4), 'invert': True})
- tboxU.plot(Cp_ref[:,0], Cp_ref[:,3], {'xlabel': 'x', 'ylabel': 'Cp', 'title': 'Cl = {0:.{3}f}, Cd = {1:.{3}f}, Cm = {2:.{3}f}'.format(solver_ref.Cl, solver_ref.Cd, solver_ref.Cm, 4), 'invert': True})
+ floD.plot(Cp[:,0], Cp[:,3], {'xlabel': 'x', 'ylabel': 'Cp', 'title': 'Cl = {0:.{3}f}, Cd = {1:.{3}f}, Cm = {2:.{3}f}'.format(solver.Cl, solver.Cd, solver.Cm, 4), 'invert': True})
+ floD.plot(Cp_ref[:,0], Cp_ref[:,3], {'xlabel': 'x', 'ylabel': 'Cp', 'title': 'Cl = {0:.{3}f}, Cd = {1:.{3}f}, Cm = {2:.{3}f}'.format(solver_ref.Cl, solver_ref.Cd, solver_ref.Cm, 4), 'invert': True})
# check results
print(ccolors.ANSI_BLUE + 'PyTesting...' + ccolors.ANSI_RESET)
diff --git a/dart/tests/nonlift.py b/dart/tests/nonlift.py
index c9c543b..17effbc 100644
--- a/dart/tests/nonlift.py
+++ b/dart/tests/nonlift.py
@@ -80,7 +80,7 @@ def main():
# visualize solution and plot results
floD.initViewer(pbl)
- tboxU.plot(Cp[:,0], Cp[:,3], {'xlabel': 'x', 'ylabel': 'Cp', 'title': 'Cl = {0:.{3}f}, Cd = {1:.{3}f}, Cm = {2:.{3}f}'.format(solver.Cl, solver.Cd, solver.Cm, 4), 'invert': True})
+ floD.plot(Cp[:,0], Cp[:,3], {'xlabel': 'x', 'ylabel': 'Cp', 'title': 'Cl = {0:.{3}f}, Cd = {1:.{3}f}, Cm = {2:.{3}f}'.format(solver.Cl, solver.Cd, solver.Cm, 4), 'invert': True})
# check results
print(ccolors.ANSI_BLUE + 'PyTesting...' + ccolors.ANSI_RESET)
diff --git a/dart/validation/agard.py b/dart/validation/agard.py
index b2debb1..bda122b 100644
--- a/dart/validation/agard.py
+++ b/dart/validation/agard.py
@@ -85,7 +85,7 @@ def main():
if canPost:
floU.writeSlices(msh.name,[0.01, 0.37, 0.75],5)
data = tbxU.read('agard445_slice_1.dat')
- tbxU.plot(data[:,3], data[:,4], {'xlabel': 'x', 'ylabel': 'Cp', 'title': 'Pressure distribution at MAC', 'invert': True})
+ floD.plot(data[:,3], data[:,4], {'xlabel': 'x', 'ylabel': 'Cp', 'title': 'Pressure distribution at MAC', 'invert': True})
tms['post'].stop()
# display timers
diff --git a/dart/validation/onera.py b/dart/validation/onera.py
index 90d6595..e06d623 100644
--- a/dart/validation/onera.py
+++ b/dart/validation/onera.py
@@ -83,7 +83,7 @@ def main():
if canPost:
floU.writeSlices(msh.name,[0.01, 0.239, 0.526, 0.777, 0.957, 1.076, 1.136, 1.184],5)
data = tbxU.read('oneraM6_slice_2.dat')
- tbxU.plot(data[:,3], data[:,4], {'xlabel': 'x', 'ylabel': 'Cp', 'title': 'Pressure distribution at MAC', 'invert': True})
+ floD.plot(data[:,3], data[:,4], {'xlabel': 'x', 'ylabel': 'Cp', 'title': 'Pressure distribution at MAC', 'invert': True})
tms['post'].stop()
# display timers
diff --git a/ext/amfe b/ext/amfe
index e3b7f5e..348dbe9 160000
--- a/ext/amfe
+++ b/ext/amfe
@@ -1 +1 @@
-Subproject commit e3b7f5ec2f629f6516a9d68e55637468c161f9d0
+Subproject commit 348dbe9ed37b0840e2098382c25b5e8d537bb3aa
diff --git a/vii/tests/bli2D.py b/vii/tests/bli2D.py
index 14e5c75..e4456e2 100644
--- a/vii/tests/bli2D.py
+++ b/vii/tests/bli2D.py
@@ -105,8 +105,8 @@ def main():
print(Coupler.tms)
# Plot results.
- tboxU.plot(Cp[:,0], Cp[:,3], {'xlabel': 'x', 'ylabel': 'Cp', 'title': 'Cl = {0:.{3}f}, Cd = {1:.{3}f}, Cm = {2:.{3}f}'.format(iSolverAPI.getCl(), vSolver.Cdt, iSolverAPI.getCm(), 4), 'invert': True})
- tboxU.plot(vSolution['x/c'], vSolution['Cf'], {'xlabel': '$x/c$', 'ylabel': '$c_f$', 'title': 'Cdt = {0:.{3}f}, Cdf = {1:.{3}f}, Cdp = {2:.{3}f}'.format(vSolver.Cdt, vSolver.Cdf, vSolver.Cdp, 4), 'xlim': [0, 1]})
+ invDefault.plot(Cp[:,0], Cp[:,3], {'xlabel': 'x', 'ylabel': 'Cp', 'title': 'Cl = {0:.{3}f}, Cd = {1:.{3}f}, Cm = {2:.{3}f}'.format(iSolverAPI.getCl(), vSolver.Cdt, iSolverAPI.getCm(), 4), 'invert': True})
+ invDefault.plot(vSolution['x/c'], vSolution['Cf'], {'xlabel': '$x/c$', 'ylabel': '$c_f$', 'title': 'Cdt = {0:.{3}f}, Cdf = {1:.{3}f}, Cdp = {2:.{3}f}'.format(vSolver.Cdt, vSolver.Cdf, vSolver.Cdp, 4), 'xlim': [0, 1]})
# Check results.
# Test for n0012 (le=0.01, te=0.01), alpha=2, M=.2, Re=1e7.
--
GitLab