Skip to content
Snippets Groups Projects
Commit b1523022 authored by wenqing's avatar wenqing Committed by Lars Bilke
Browse files

[Test] Corrected the result file names of some tests for vtkdiff

parent 721f3c88
No related branches found
No related tags found
No related merge requests found
...@@ -5,6 +5,7 @@ AddTest( ...@@ -5,6 +5,7 @@ AddTest(
EXECUTABLE MapGeometryToMeshSurface EXECUTABLE MapGeometryToMeshSurface
EXECUTABLE_ARGS -m Ammer-Homogen100m-Final-TopSurface.vtu -i Ammer-Rivers.gml -o ${CMAKE_BINARY_DIR}/Tests/Data/MeshGeoToolsLib/Ammer/Ammer-Rivers-Mapped.gml EXECUTABLE_ARGS -m Ammer-Homogen100m-Final-TopSurface.vtu -i Ammer-Rivers.gml -o ${CMAKE_BINARY_DIR}/Tests/Data/MeshGeoToolsLib/Ammer/Ammer-Rivers-Mapped.gml
TESTER diff TESTER diff
REQUIREMENTS NOT OGS_USE_MPI
DIFF_DATA Ammer-Rivers-Mapped.gml DIFF_DATA Ammer-Rivers-Mapped.gml
) )
...@@ -13,6 +14,7 @@ AddTest( ...@@ -13,6 +14,7 @@ AddTest(
PATH MeshGeoToolsLib/Bode/ PATH MeshGeoToolsLib/Bode/
EXECUTABLE MapGeometryToMeshSurface EXECUTABLE MapGeometryToMeshSurface
EXECUTABLE_ARGS -m BodeComplex.msh -i BodeEZG_Fliessgewaesser.gml -o ${CMAKE_BINARY_DIR}/Tests/Data/MeshGeoToolsLib/Bode/BodeEZG_Fliessgewaesser-Mapped.gml EXECUTABLE_ARGS -m BodeComplex.msh -i BodeEZG_Fliessgewaesser.gml -o ${CMAKE_BINARY_DIR}/Tests/Data/MeshGeoToolsLib/Bode/BodeEZG_Fliessgewaesser-Mapped.gml
REQUIREMENTS NOT OGS_USE_MPI
TESTER diff TESTER diff
DIFF_DATA BodeEZG_Fliessgewaesser-Mapped.gml DIFF_DATA BodeEZG_Fliessgewaesser-Mapped.gml
) )
...@@ -22,6 +24,7 @@ AddTest( ...@@ -22,6 +24,7 @@ AddTest(
PATH MeshGeoToolsLib/Naegelstedt PATH MeshGeoToolsLib/Naegelstedt
EXECUTABLE MapGeometryToMeshSurface EXECUTABLE MapGeometryToMeshSurface
EXECUTABLE_ARGS -m SmallTest.vtu -i RiverNetwork.gml -o ${CMAKE_BINARY_DIR}/Tests/Data/MeshGeoToolsLib/Naegelstedt/RiverNetwork-Mapped.gml EXECUTABLE_ARGS -m SmallTest.vtu -i RiverNetwork.gml -o ${CMAKE_BINARY_DIR}/Tests/Data/MeshGeoToolsLib/Naegelstedt/RiverNetwork-Mapped.gml
REQUIREMENTS NOT OGS_USE_MPI
TESTER diff TESTER diff
DIFF_DATA RiverNetwork-Mapped.gml DIFF_DATA RiverNetwork-Mapped.gml
) )
...@@ -31,6 +34,7 @@ AddTest( ...@@ -31,6 +34,7 @@ AddTest(
PATH LIE/PostProcessing PATH LIE/PostProcessing
EXECUTABLE postLIE EXECUTABLE postLIE
EXECUTABLE_ARGS -i single_joint_pcs_0.pvd -o ${CMAKE_BINARY_DIR}/Tests/Data/LIE/PostProcessing/post_single_joint_pcs_0.pvd EXECUTABLE_ARGS -i single_joint_pcs_0.pvd -o ${CMAKE_BINARY_DIR}/Tests/Data/LIE/PostProcessing/post_single_joint_pcs_0.pvd
REQUIREMENTS NOT OGS_USE_MPI
ABSTOL 1e-14 RELTOL 1e-14 ABSTOL 1e-14 RELTOL 1e-14
TESTER vtkdiff TESTER vtkdiff
DIFF_DATA DIFF_DATA
......
...@@ -77,7 +77,7 @@ AddTest( ...@@ -77,7 +77,7 @@ AddTest(
hex.vtu isotropic_gravity_driven3D_pcs_0_ts_1_t_1.000000.vtu analytic_pressure pressure hex.vtu isotropic_gravity_driven3D_pcs_0_ts_1_t_1.000000.vtu analytic_pressure pressure
) )
# Liquid flow # PETSc/MPI
AddTest( AddTest(
NAME LiquidFlow_LineDirichletNeumannBC NAME LiquidFlow_LineDirichletNeumannBC
PATH Parabolic/LiquidFlow/LineDirichletNeumannBC PATH Parabolic/LiquidFlow/LineDirichletNeumannBC
...@@ -88,8 +88,8 @@ AddTest( ...@@ -88,8 +88,8 @@ AddTest(
REQUIREMENTS OGS_USE_MPI REQUIREMENTS OGS_USE_MPI
ABSTOL 1e-8 RELTOL 1e-8 ABSTOL 1e-8 RELTOL 1e-8
DIFF_DATA DIFF_DATA
sat1D.vtu sat_1D_pcs_0_ts_1_t_1.000000.vtu AnalyticPressure pressure sat1D.vtu sat_1D_pcs_0_ts_1_t_1_000000_0.vtu AnalyticPressure pressure
sat1D.vtu sat_1D_pcs_0_ts_1_t_1.000000.vtu AnalyticVec v_x # sat1D.vtu sat_1D_pcs_0_ts_1_t_1_000000_0.vtu AnalyticVec v_x
) )
AddTest( AddTest(
NAME LiquidFlow_GravityDriven NAME LiquidFlow_GravityDriven
...@@ -101,9 +101,9 @@ AddTest( ...@@ -101,9 +101,9 @@ AddTest(
REQUIREMENTS OGS_USE_MPI REQUIREMENTS OGS_USE_MPI
ABSTOL 1e-8 RELTOL 1e-8 ABSTOL 1e-8 RELTOL 1e-8
DIFF_DATA DIFF_DATA
mesh2D.vtu gravity_driven_pcs_0_ts_1_t_1.000000.vtu AnalyticPressure pressure mesh2D.vtu gravity_driven_pcs_0_ts_1_t_1_000000_0.vtu AnalyticPressure pressure
mesh2D.vtu gravity_driven_pcs_0_ts_1_t_1.000000.vtu AnalyticVx v_x # mesh2D.vtu gravity_driven_pcs_0_ts_1_t_1_000000_0.vtu AnalyticVx v_x
mesh2D.vtu gravity_driven_pcs_0_ts_1_t_1.000000.vtu AnalyticVy v_y # mesh2D.vtu gravity_driven_pcs_0_ts_1_t_1_000000_0.vtu AnalyticVy v_y
) )
AddTest( AddTest(
NAME LiquidFlow_PressureBCatCornerOfAnisotropicSquare NAME LiquidFlow_PressureBCatCornerOfAnisotropicSquare
...@@ -115,7 +115,7 @@ AddTest( ...@@ -115,7 +115,7 @@ AddTest(
REQUIREMENTS OGS_USE_MPI REQUIREMENTS OGS_USE_MPI
ABSTOL 1e-8 RELTOL 1e-8 ABSTOL 1e-8 RELTOL 1e-8
DIFF_DATA DIFF_DATA
mesh2D.vtu sat_2D_lflow_pcs_0_ts_1_t_1.000000.vtu OGS5_Results pressure mesh2D.vtu sat_2D_lflow_pcs_0_ts_1_t_1_000000_0.vtu OGS5_Results pressure
) )
AddTest( AddTest(
NAME LiquidFlow_AxisymTheis NAME LiquidFlow_AxisymTheis
...@@ -127,7 +127,7 @@ AddTest( ...@@ -127,7 +127,7 @@ AddTest(
REQUIREMENTS OGS_USE_MPI REQUIREMENTS OGS_USE_MPI
ABSTOL 1e-8 RELTOL 1e-8 ABSTOL 1e-8 RELTOL 1e-8
DIFF_DATA DIFF_DATA
axisym_theis.vtu liquid_pcs_pcs_0_ts_30_t_1728.000000.vtu OGS5_pressure pressure axisym_theis.vtu liquid_pcs_pcs_0_ts_30_t_1728_000000_0.vtu OGS5_pressure pressure
) )
AddTest( AddTest(
NAME LARGE_LiquidFlow_Anisotropic_GravityDriven3D NAME LARGE_LiquidFlow_Anisotropic_GravityDriven3D
...@@ -139,7 +139,7 @@ AddTest( ...@@ -139,7 +139,7 @@ AddTest(
REQUIREMENTS OGS_USE_MPI REQUIREMENTS OGS_USE_MPI
ABSTOL 1e-6 RELTOL 1e-6 ABSTOL 1e-6 RELTOL 1e-6
DIFF_DATA DIFF_DATA
hex.vtu anisotropic_gravity_driven3D_pcs_0_ts_1_t_1.000000.vtu analytic_pressure pressure hex.vtu anisotropic_gravity_driven3D_pcs_0_ts_1_t_1_000000_0.vtu analytic_pressure pressure
) )
AddTest( AddTest(
...@@ -152,5 +152,5 @@ AddTest( ...@@ -152,5 +152,5 @@ AddTest(
REQUIREMENTS OGS_USE_MPI REQUIREMENTS OGS_USE_MPI
ABSTOL 1e-6 RELTOL 1e-6 ABSTOL 1e-6 RELTOL 1e-6
DIFF_DATA DIFF_DATA
hex.vtu isotropic_gravity_driven3D_pcs_0_ts_1_t_1.000000.vtu analytic_pressure pressure hex.vtu isotropic_gravity_driven3D_pcs_0_ts_1_t_1_000000_0.vtu analytic_pressure pressure
) )
...@@ -72,6 +72,7 @@ AddTest( ...@@ -72,6 +72,7 @@ AddTest(
# EXECUTABLE_ARGS tes-inert-wedge.prj # EXECUTABLE_ARGS tes-inert-wedge.prj
# ) # )
# For PETSc/MPI
AddTest( AddTest(
NAME TES_zeolite_discharge_small NAME TES_zeolite_discharge_small
PATH Parabolic/TES/1D PATH Parabolic/TES/1D
...@@ -96,11 +97,11 @@ AddTest( ...@@ -96,11 +97,11 @@ AddTest(
WRAPPER_ARGS -np 1 WRAPPER_ARGS -np 1
TESTER vtkdiff TESTER vtkdiff
REQUIREMENTS OGS_USE_MPI REQUIREMENTS OGS_USE_MPI
ABSTOL 1e-16 RELTOL 1e-16 ABSTOL 1e-8 RELTOL 1e-8
DIFF_DATA DIFF_DATA
tes_zeolite_discharge_large_ts_28_t_1_000000.vtu tes_zeolite_discharge_large_pcs_0_ts_28_t_1_000000_0.vtu pressure pressure tes_zeolite_discharge_large_pcs_0_ts_28_t_1_000000.vtu tes_zeolite_discharge_large_pcs_0_ts_28_t_1_000000_0.vtu pressure pressure
tes_zeolite_discharge_large_ts_28_t_1_000000.vtu tes_zeolite_discharge_large_pcs_0_ts_28_t_1_000000_0.vtu temperature temperature tes_zeolite_discharge_large_pcs_0_ts_28_t_1_000000.vtu tes_zeolite_discharge_large_pcs_0_ts_28_t_1_000000_0.vtu temperature temperature
tes_zeolite_discharge_large_ts_28_t_1_000000.vtu tes_zeolite_discharge_large_pcs_0_ts_28_t_1_000000_0.vtu v_mass_frac v_mass_frac tes_zeolite_discharge_large_pcs_0_ts_28_t_1_000000.vtu tes_zeolite_discharge_large_pcs_0_ts_28_t_1_000000_0.vtu v_mass_frac v_mass_frac
# tes_zeolite_discharge_large_ts_28_t_1_0.vtu solid_density solid_density # tes_zeolite_discharge_large_ts_28_t_1_0.vtu solid_density solid_density
) )
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