Skip to content
Snippets Groups Projects
Commit 1d34f458 authored by many's avatar many
Browse files

Revert "test verbose option"

This reverts commit 5a8e0be9.
parent 5a8e0be9
No related branches found
No related tags found
1 merge request!10Merge recent changes in master to we_ahrens
Pipeline #8356 passed
...@@ -5,7 +5,6 @@ def test_calcmidpassagestreamline(): ...@@ -5,7 +5,6 @@ def test_calcmidpassagestreamline():
import numpy as np import numpy as np
import pyvista as pv import pyvista as pv
pv.OFF_SCREEN=True
naca_code = "6009" naca_code = "6009"
angle = 10 # deg angle = 10 # deg
...@@ -16,6 +15,6 @@ def test_calcmidpassagestreamline(): ...@@ -16,6 +15,6 @@ def test_calcmidpassagestreamline():
sorted_poly.rotate_z(angle) sorted_poly.rotate_z(angle)
poly, ps_poly, ss_poly, ind_hk, ind_vk, mids_poly, beta_leading, beta_trailing, camber_angle = extract_geo_paras( poly, ps_poly, ss_poly, ind_hk, ind_vk, mids_poly, beta_leading, beta_trailing, camber_angle = extract_geo_paras(
sorted_poly, alpha,verbose=True) sorted_poly, alpha)
calcmidpassagestreamline(mids_poly.points[::, 0], mids_poly.points[::, 1], beta_leading, beta_trailing, -1, 2, 1) calcmidpassagestreamline(mids_poly.points[::, 0], mids_poly.points[::, 1], beta_leading, beta_trailing, -1, 2, 1)
import numpy as np import numpy as np
import pyvista as pv import pyvista as pv
pv.OFF_SCREEN = True from ntrfc.turbo.domaingen_cascade import cascade_2d_domain
def test_cascade_3d_domain(): def test_cascade_3d_domain():
from ntrfc.turbo.airfoil_generators.naca_airfoil_creator import naca from ntrfc.turbo.airfoil_generators.naca_airfoil_creator import naca
...@@ -16,7 +17,7 @@ def test_cascade_3d_domain(): ...@@ -16,7 +17,7 @@ def test_cascade_3d_domain():
sortedPoly, psPoly, ssPoly, per_y_upper, per_y_lower, inletPoly, outletPoly = cascade_2d_domain(sorted_poly, -1, 2, 1, sortedPoly, psPoly, ssPoly, per_y_upper, per_y_lower, inletPoly, outletPoly = cascade_2d_domain(sorted_poly, -1, 2, 1,
"m", 0.1, 1, "m", 0.1, 1,
verbose=True) verbose=False)
cascade_3d_domain(sortedPoly, psPoly, ssPoly, per_y_upper, per_y_lower, inletPoly, outletPoly, zspan=0.2, avdr=1, cascade_3d_domain(sortedPoly, psPoly, ssPoly, per_y_upper, per_y_lower, inletPoly, outletPoly, zspan=0.2, avdr=1,
verbose=False) verbose=False)
...@@ -24,7 +25,6 @@ def test_cascade_3d_domain(): ...@@ -24,7 +25,6 @@ def test_cascade_3d_domain():
def test_cascade_2d_domain(): def test_cascade_2d_domain():
from ntrfc.turbo.airfoil_generators.naca_airfoil_creator import naca from ntrfc.turbo.airfoil_generators.naca_airfoil_creator import naca
from ntrfc.turbo.domaingen_cascade import cascade_2d_domain
naca_code = "6509" naca_code = "6509"
angle = 30 # deg angle = 30 # deg
...@@ -36,4 +36,4 @@ def test_cascade_2d_domain(): ...@@ -36,4 +36,4 @@ def test_cascade_2d_domain():
points = np.stack((X[:], Y[:], np.zeros(len(X)))).T points = np.stack((X[:], Y[:], np.zeros(len(X)))).T
pointspoly = pv.PolyData(points) pointspoly = pv.PolyData(points)
sortedPoly, psPoly, ssPoly, per_y_upper, per_y_lower, inletPoly, outletPoly = cascade_2d_domain(pointspoly, -1, 2, 1, sortedPoly, psPoly, ssPoly, per_y_upper, per_y_lower, inletPoly, outletPoly = cascade_2d_domain(pointspoly, -1, 2, 1,
"m", 0.1, 1, True) "m", 0.1, 1, False)
...@@ -4,8 +4,6 @@ def test_extractSidePolys(): ...@@ -4,8 +4,6 @@ def test_extractSidePolys():
import numpy as np import numpy as np
import pyvista as pv import pyvista as pv
pv.OFF_SCREEN=True
d1, d2, d3, d4 = np.random.randint(0, 9), np.random.randint(0, 9), np.random.randint(0, 9), np.random.randint(0, 9) d1, d2, d3, d4 = np.random.randint(0, 9), np.random.randint(0, 9), np.random.randint(0, 9), np.random.randint(0, 9)
digit_string = str(d1) + str(d2) + str(d3) + str(d4) digit_string = str(d1) + str(d2) + str(d3) + str(d4)
...@@ -17,7 +15,7 @@ def test_extractSidePolys(): ...@@ -17,7 +15,7 @@ def test_extractSidePolys():
poly = pv.PolyData(points) poly = pv.PolyData(points)
poly["A"] = np.ones(poly.number_of_points) poly["A"] = np.ones(poly.number_of_points)
ssPoly, psPoly = extractSidePolys(ind_hk, ind_vk, poly,verbose=True) ssPoly, psPoly = extractSidePolys(ind_hk, ind_vk, poly)
# the assertion is consistent with all tests but it is confusing # the assertion is consistent with all tests but it is confusing
# we generate profiles with a naca-generator. probably there is a minor bug in the algorithm # we generate profiles with a naca-generator. probably there is a minor bug in the algorithm
# ssPoly needs to have one point more then psPoly # ssPoly needs to have one point more then psPoly
......
import numpy as np import numpy as np
import pyvista as pv import pyvista as pv
pv.OFF_SCREEN = True
def test_createprofileprobes(): def test_createprofileprobes():
from ntrfc.turbo.probegeneration import create_profileprobes from ntrfc.turbo.probegeneration import create_profileprobes
from ntrfc.turbo.airfoil_generators.naca_airfoil_creator import naca from ntrfc.turbo.airfoil_generators.naca_airfoil_creator import naca
from ntrfc.turbo.pointcloud_methods import extract_geo_paras from ntrfc.turbo.pointcloud_methods import extract_geo_paras
naca_code = "6009" naca_code = "6009"
angle = 10 # deg angle = 10 # deg
res = 240 res = 240
...@@ -16,7 +13,7 @@ def test_createprofileprobes(): ...@@ -16,7 +13,7 @@ def test_createprofileprobes():
sorted_poly = pv.PolyData(np.stack([xs, ys, np.zeros(len(xs))]).T) sorted_poly = pv.PolyData(np.stack([xs, ys, np.zeros(len(xs))]).T)
sorted_poly.rotate_z(angle) sorted_poly.rotate_z(angle)
sorted_extracted_poly, psPoly, ssPoly, ind_vk, ind_hk, midsPoly, beta_leading, beta_trailing, camber_angle = extract_geo_paras( sorted_extracted_poly, psPoly, ssPoly, ind_vk, ind_hk, midsPoly, beta_leading, beta_trailing, camber_angle = extract_geo_paras(
sorted_poly, 1,verbose=True) sorted_poly, 1)
n_psprobes = 24 n_psprobes = 24
n_ssprobes = 36 n_ssprobes = 36
probes_ss, probes_ps = create_profileprobes(ssPoly, psPoly, 1, n_ssprobes, n_psprobes, tolerance=1e-6) probes_ss, probes_ps = create_profileprobes(ssPoly, psPoly, 1, n_ssprobes, n_psprobes, tolerance=1e-6)
...@@ -35,7 +32,7 @@ def test_create_midpassageprobes(): ...@@ -35,7 +32,7 @@ def test_create_midpassageprobes():
sorted_poly = pv.PolyData(np.stack([xs, ys, np.zeros(len(xs))]).T) sorted_poly = pv.PolyData(np.stack([xs, ys, np.zeros(len(xs))]).T)
sorted_poly.rotate_z(angle,inplace=True) sorted_poly.rotate_z(angle,inplace=True)
sorted_extracted_poly, psPoly, ssPoly, ind_vk, ind_hk, midsPoly, beta_leading, beta_trailing, camber_angle = extract_geo_paras( sorted_extracted_poly, psPoly, ssPoly, ind_vk, ind_hk, midsPoly, beta_leading, beta_trailing, camber_angle = extract_geo_paras(
sorted_poly, 1,verbose=True) sorted_poly, 1)
nop = 40 nop = 40
midspan_probes = create_midpassageprobes(1, -0.3, 0.3, 0.1, beta_leading, beta_trailing, midsPoly, nop) midspan_probes = create_midpassageprobes(1, -0.3, 0.3, 0.1, beta_leading, beta_trailing, midsPoly, nop)
assert midspan_probes.number_of_points == nop, "number of probes on midpassage line not correct" assert midspan_probes.number_of_points == nop, "number of probes on midpassage line not correct"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment