From 6d74137ff35c274f56f0230ec2f2459110556ae7 Mon Sep 17 00:00:00 2001
From: AxelDechamps <72997335+AxelDechamps@users.noreply.github.com>
Date: Mon, 31 Jan 2022 21:17:58 +0100
Subject: [PATCH] Adapt setup of test cases.

---
 fpm/tests/n12f.py |  8 +++++---
 fpm/tests/n12t.py | 16 ++++++++++++----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/fpm/tests/n12f.py b/fpm/tests/n12f.py
index edd633a..086b301 100644
--- a/fpm/tests/n12f.py
+++ b/fpm/tests/n12f.py
@@ -19,14 +19,16 @@
 # Adrien Crovato
 
 from fwk.testing import *
+import math
 
 def main():
     p = {}
     # geometry parameters
-    p['pars'] = {'wSpn' : 5, 'wNc' : 80, 'wNs' : 10, 'fWdt' : 10, 'nX' : 10, 'nY' : 10, 'nZ' : 4}
-    p['spn'] = 5
+    p['sym'] = 0
+    p['spn'] = 5 # true span if sym=0, half span if sym=1
+    p['pars'] = {'symY' : p['sym'], 'wSpn' : p['spn'], 'wNc' : 100, 'wNs' : 10, 'fWdt' : 10, 'nX' : 10, 'nY' : 10, 'nZ' : 4}
     # flow parameters
-    p['aoa'] = 0
+    p['aoa'] = 3 * math.pi / 180 
     p['aos'] = 0
     p['mach'] = 0.8
     # run
diff --git a/fpm/tests/n12t.py b/fpm/tests/n12t.py
index 7834735..fa1d843 100644
--- a/fpm/tests/n12t.py
+++ b/fpm/tests/n12t.py
@@ -19,22 +19,30 @@
 # Adrien Crovato
 
 from fwk.testing import *
+import math
 
 def main():
     p = {}
     # geometry parameters
-    p['pars'] = {'wSpn' : 5, 'wNc' : 80, 'wNs' : 10, 'tSpn' : 3, 'tNc' : 40, 'tNs' : 5}
-    p['spn'] = 5
+    p['sym'] = 0
+    p['spn'] = 5 # true span if sym=0, half span if sym=1
+    p['tspn'] = 3 # true span if sym=0, half span if sym=1
+    p['pars'] = {'symY' : p['sym'], 'wSpn' : p['spn'], 'wNc' : 100, 'wNs' : 10, 'tSpn' : p['tspn'], 'tNc' : 100, 'tNs' : 10}
     # flow parameters
-    p['aoa'] = 0
+    p['aoa'] = 3 * math.pi / 180 
     p['aos'] = 0
     p['mach'] = 0
     # run
     import fpm.models.n0012 as n12
-    n12.main(p, tail=True)
+    solver = n12.main(p, tail=True)
     # test
     print(ccolors.ANSI_BLUE + 'PyTesting...' + ccolors.ANSI_RESET)
     tests = CTests()
+    if(p['aoa'] == 3 * math.pi / 180 and p['mach'] == 0):
+        tests.add(CTest('CL', solver.Cl, 0.273, 5e-2))
+        tests.add(CTest('CD', solver.Cd, 0.004, 5e-2))
+        tests.add(CTest('CS', solver.Cs, -0.000, 5e-2))
+        tests.add(CTest('CM', solver.Cm, -0.277, 5e-2))
     tests.run()
     
     # eof
-- 
GitLab