ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-12-26 05:50:32 +05:00
Code Issues Packages Projects Releases Wiki Activity

Test in2d files, update results

Browse Source
This commit is contained in:
Matthias Hochsteger 2019-10-23 11:27:05 +02:00
parent eaf2bee9e6
commit 91815955f5
2 changed files with 791 additions and 612 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1388
tests/pytest/results.json
View File

File diff suppressed because it is too large Load Diff

15
tests/pytest/test_tutorials.py
View File

@ -3,6 +3,7 @@ import os, pytest
from netgen.meshing import meshsize, MeshingParameters, SetMessageImportance from netgen.meshing import meshsize, MeshingParameters, SetMessageImportance
import netgen.csg as csg import netgen.csg as csg
import netgen.stl as stl import netgen.stl as stl
import netgen.geom2d as geom2d
from pyngcore import TaskManager from pyngcore import TaskManager
import json import json
try: try:
@ -34,12 +35,12 @@ def checkData(mesh, mp, ref):
# get tutorials # get tutorials
def getFiles(fileEnding): def getFiles(fileEnding):
r, d, files = next(os.walk(os.path.join("..","..","tutorials"))) r, d, files = next(os.walk(os.path.join("..","..","tutorials")))
return (f for f in files if f.endswith(fileEnding)) return [f for f in files if f.endswith(fileEnding)]
# get additional tests # get additional tests
def getAdditionalFiles(fileEnding): def getAdditionalFiles(fileEnding):
r, d, files = next(os.walk("geofiles")) r, d, files = next(os.walk("geofiles"))
return (f for f in files if f.endswith(fileEnding)) return [f for f in files if f.endswith(fileEnding)]
@pytest.fixture @pytest.fixture
def refdata(): def refdata():
@ -64,13 +65,13 @@ def getMeshingparameters(filename):
return standard[0:1] + standard[2:] # very coarse does not work return standard[0:1] + standard[2:] # very coarse does not work
return standard return standard
_geofiles = [f for f in getFiles(".geo")] + [f for f in getFiles(".stl")] _geofiles = getFiles(".in2d") + getFiles(".geo") + getFiles(".stl")
if has_occ: if has_occ:
_geofiles += [f for f in getFiles(".step")] _geofiles += getFiles(".step")
_geofiles.sort() _geofiles.sort()
_additional_testfiles = [f for f in getAdditionalFiles(".stl")] _additional_testfiles = getAdditionalFiles(".stl")
if has_occ: if has_occ:
_additional_testfiles += [f for f in getAdditionalFiles(".step")] _additional_testfiles += getAdditionalFiles(".step")
_additional_testfiles.sort() _additional_testfiles.sort()
def generateMesh(filename, mp): def generateMesh(filename, mp):
@ -81,6 +82,8 @@ def generateMesh(filename, mp):
geo = stl.STLGeometry(os.path.join(folder, filename)) geo = stl.STLGeometry(os.path.join(folder, filename))
elif filename.endswith(".step"): elif filename.endswith(".step"):
geo = occ.OCCGeometry(os.path.join(folder, filename)) geo = occ.OCCGeometry(os.path.join(folder, filename))
elif filename.endswith(".in2d"):
geo = geom2d.SplineGeometry(os.path.join(folder, filename))
return geo.GenerateMesh(mp) return geo.GenerateMesh(mp)
def isSlowTest(filename): def isSlowTest(filename):