Skip to content

Commit 86d2f72

Browse files
refactor: homogenization of the test meshes for the geos-processing filters (#221)
* Add new meshes for tests from a geos simulation * Remove all the unused meshes * Update testing meshes
1 parent e0d7502 commit 86d2f72

55 files changed

Lines changed: 1145 additions & 2244 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

geos-processing/tests/conftest.py

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -29,33 +29,36 @@ def _get_dataset( datasetType: str ) -> Union[ vtkMultiBlockDataSet, vtkPolyData
2929
(vtkMultiBlockDataSet, vtkPolyData, vtkDataSet): The vtk object.
3030
"""
3131
reader: vtkXMLGenericDataObjectReader = vtkXMLGenericDataObjectReader()
32-
if datasetType == "multiblock":
33-
vtkFilename = "data/displacedFault.vtm"
34-
elif datasetType == "emptymultiblock":
35-
vtkFilename = "data/displacedFaultempty.vtm"
36-
elif datasetType == "multiblockGeosOutput":
37-
# adapted from example GEOS/inputFiles/compositionalMultiphaseWell/simpleCo2InjTutorial_smoke.xml
38-
vtkFilename = "data/simpleReservoirViz_small_000478.vtm"
39-
elif datasetType == "fracture":
40-
vtkFilename = "data/fracture_res5_id.vtu"
41-
elif datasetType == "emptyFracture":
42-
vtkFilename = "data/fracture_res5_id_empty.vtu"
43-
elif datasetType == "dataset":
44-
vtkFilename = "data/domain_res5_id.vtu"
45-
elif datasetType == "emptydataset":
46-
vtkFilename = "data/domain_res5_id_empty.vtu"
47-
elif datasetType == "2Ranks":
48-
vtkFilename = "data/singlePhasePoromechanics_FaultModel_well_seq/CellElementRegion2Ranks.vtm"
32+
# Meshes from the GEOS integrated test singlePhasePoromechanics_FaultModel_well_seq
33+
if datasetType == "2Ranks":
34+
vtkFilename = "data/singlePhasePoromechanics_FaultModel_well_seq/cellElementRegion2Ranks.vtm"
4935
elif datasetType == "4Ranks":
50-
vtkFilename = "data/singlePhasePoromechanics_FaultModel_well_seq/CellElementRegion4Ranks.vtm"
51-
elif datasetType == "meshtet1":
52-
vtkFilename = "data/mesh1.vtu"
53-
elif datasetType == "meshtet1b":
54-
vtkFilename = "data/mesh1b.vtu"
36+
vtkFilename = "data/singlePhasePoromechanics_FaultModel_well_seq/cellElementRegion4Ranks.vtm"
37+
elif datasetType == "geosOutput2Ranks":
38+
vtkFilename = "data/singlePhasePoromechanics_FaultModel_well_seq/geosOutput2Ranks.vtm"
5539
elif datasetType == "singlePhasePoromechanicsVTKOutput":
5640
vtkFilename = "data/singlePhasePoromechanics_FaultModel_well_seq/singlePhasePoromechanicsVTKOutput.vtm"
5741
elif datasetType == "extractAndMergeVolume":
5842
vtkFilename = "data/singlePhasePoromechanics_FaultModel_well_seq/extractAndMergeVolume.vtu"
43+
elif datasetType == "extractAndMergeFault":
44+
vtkFilename = "data/singlePhasePoromechanics_FaultModel_well_seq/extractAndMergeFault.vtu"
45+
elif datasetType == "extractAndMergeFaultVtp":
46+
vtkFilename = "data/singlePhasePoromechanics_FaultModel_well_seq/extractAndMergeFault.vtp"
47+
elif datasetType == "extractAndMergeWell1":
48+
vtkFilename = "data/singlePhasePoromechanics_FaultModel_well_seq/extractAndMergeWell1.vtu"
49+
elif datasetType == "extractAndMergeVolumeWell1":
50+
vtkFilename = "data/singlePhasePoromechanics_FaultModel_well_seq/extractAndMergeVolumeWell1.vtm"
51+
elif datasetType == "extractAndMergeFaultWell1":
52+
vtkFilename = "data/singlePhasePoromechanics_FaultModel_well_seq/extractAndMergeFaultWell1.vtm"
53+
# Small useful meshes
54+
elif datasetType == "quads2_tris4":
55+
vtkFilename = "data/quads2_tris4.vtu"
56+
elif datasetType == "hexs3_tets36_pyrs18":
57+
vtkFilename = "data/hexs3_tets36_pyrs18.vtu"
58+
elif datasetType == "meshtet1":
59+
vtkFilename = "data/mesh1.vtu"
60+
elif datasetType == "meshtet1b":
61+
vtkFilename = "data/mesh1b.vtu"
5962

6063
datapath: str = os.path.join( os.path.dirname( os.path.realpath( __file__ ) ), vtkFilename )
6164
reader.SetFileName( datapath )

geos-processing/tests/data/displacedFault.vtm

Lines changed: 0 additions & 9 deletions
This file was deleted.

geos-processing/tests/data/displacedFaultempty.vtm

Lines changed: 0 additions & 9 deletions
This file was deleted.

geos-processing/tests/data/domain_res5_id.vtu

Lines changed: 0 additions & 73 deletions
This file was deleted.

geos-processing/tests/data/domain_res5_id_empty.vtu

Lines changed: 0 additions & 39 deletions
This file was deleted.

geos-processing/tests/data/fracture_res5_id.vtu

Lines changed: 0 additions & 52 deletions
This file was deleted.

geos-processing/tests/data/fracture_res5_id_empty.vtu

Lines changed: 0 additions & 41 deletions
This file was deleted.

geos-processing/tests/data/hexa_cell.csv

Lines changed: 0 additions & 8 deletions
This file was deleted.

geos-processing/tests/data/hexa_mesh.csv

Lines changed: 0 additions & 64 deletions
This file was deleted.

geos-processing/tests/data/pyramid_cell.csv

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)