Skip to content

Commit 7cb7ea5

Browse files
wenqingwenqing
committed
[Test] Added a new test to solve the HT monolithic test with the staggered scheme
and removed the tests for the staggered scheme from LiquidFlow temporarily.
1 parent 4477e24 commit 7cb7ea5

File tree

5 files changed

+507
-122
lines changed

5 files changed

+507
-122
lines changed

‎ProcessLib/HT/Tests.cmake

+32-2
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,26 @@ AddTest(
88
REQUIREMENTS NOT (OGS_USE_LIS OR OGS_USE_MPI)
99
ABSTOL 1e-10 RELTOL 1e-16
1010
DIFF_DATA
11-
ThermalConvection_const_viscosity_expected.vtu ConstViscosityThermalConvection_pcs_0_ts_149_t_50000000000.000000.vtu temperature T
11+
square_5500x5500.vtu ConstViscosityThermalConvection_pcs_0_ts_149_t_50000000000.000000.vtu T_ref T
1212
VIS ConstViscosityThermalConvection_pcs_0_ts_149_t_50000000000.000000.vtu
1313
)
1414

15-
# MPI tests
15+
AddTest(
16+
NAME LARGE_2D_ThermalConvection_constviscosityStaggeredScheme
17+
PATH Parabolic/HT/StaggeredCoupling/ConstViscosity
18+
EXECUTABLE ogs
19+
EXECUTABLE_ARGS square_5500x5500_staggered_scheme.prj
20+
WRAPPER time
21+
TESTER vtkdiff
22+
REQUIREMENTS NOT (OGS_USE_LIS OR OGS_USE_MPI)
23+
ABSTOL 1e-10 RELTOL 1.e-9
24+
DIFF_DATA
25+
square_5500x5500.vtu ConstViscosityThermalConvection_pcs_1_ts_149_t_50000000000.000000.vtu T_ref T
26+
square_5500x5500.vtu ConstViscosityThermalConvection_pcs_1_ts_149_t_50000000000.000000.vtu p_ref p
27+
VIS ConstViscosityThermalConvection_pcs_1_ts_149_t_50000000000.000000.vtu
28+
)
29+
30+
# MPI/PETSc tests
1631
AddTest(
1732
NAME Parallel_LARGE_2D_ThermalConvection_constviscosity
1833
PATH Parabolic/HT/ConstViscosity
@@ -32,3 +47,18 @@ AddTest(
3247
ConstViscosityThermalConvection_pcs_0_ts_149_t_50000000000_000000_2.vtu ConstViscosityThermalConvection_pcs_0_ts_149_t_50000000000_000000_2.vtu T T
3348
ConstViscosityThermalConvection_pcs_0_ts_149_t_50000000000_000000_3.vtu ConstViscosityThermalConvection_pcs_0_ts_149_t_50000000000_000000_3.vtu T T
3449
)
50+
51+
AddTest(
52+
NAME LARGE_2D_ThermalConvection_constviscosityStaggeredScheme
53+
PATH Parabolic/HT/StaggeredCoupling/ConstViscosity
54+
EXECUTABLE_ARGS square_5500x5500_staggered_scheme.prj
55+
WRAPPER mpirun
56+
WRAPPER_ARGS -np 1
57+
TESTER vtkdiff
58+
REQUIREMENTS OGS_USE_MPI
59+
ABSTOL 1e-10 RELTOL 1.e-9
60+
DIFF_DATA
61+
square_5500x5500.vtu ConstViscosityThermalConvection_pcs_1_ts_149_t_50000000000_000000_0.vtu T_ref T
62+
square_5500x5500.vtu ConstViscosityThermalConvection_pcs_1_ts_149_t_50000000000_000000_0.vtu p_ref p
63+
VIS ConstViscosityThermalConvection_pcs_1_ts_149_t_50000000000.000000_0.vtu
64+
)

‎ProcessLib/LiquidFlow/Tests.cmake

-120
Original file line numberDiff line numberDiff line change
@@ -76,65 +76,6 @@ AddTest(
7676
hex.vtu isotropic_gravity_driven3D_pcs_0_ts_1_t_1.000000.vtu analytic_pressure pressure
7777
)
7878

79-
# Coupling
80-
AddTest(
81-
NAME StaggeredTH_ThermalDensityDrivenFlow2D
82-
PATH StaggeredCoupledProcesses/TH/ThermalDensityDrivenFlow2D
83-
EXECUTABLE ogs
84-
EXECUTABLE_ARGS thermal_gravity_driven_flow2d.prj
85-
WRAPPER time
86-
TESTER vtkdiff
87-
REQUIREMENTS NOT OGS_USE_MPI
88-
ABSTOL 1.1 RELTOL 1e-7
89-
DIFF_DATA
90-
mesh2D.vtu gravity_driven_pcs_1_ts_10_t_300.000000.vtu OGS5_PRESSURE1 pressure
91-
mesh2D.vtu gravity_driven_pcs_1_ts_10_t_300.000000.vtu OGS5_TEMPERATURE1 temperature
92-
mesh2D.vtu gravity_driven_pcs_1_ts_10_t_300.000000.vtu v_ref v
93-
)
94-
95-
AddTest(
96-
NAME Adaptive_dt_StaggeredTH_ThermalDensityDrivenFlow2D
97-
PATH StaggeredCoupledProcesses/TH/ThermalDensityDrivenFlow2D
98-
EXECUTABLE ogs
99-
EXECUTABLE_ARGS thermal_gravity_driven_flow2d_adaptive_dt.prj
100-
WRAPPER time
101-
TESTER vtkdiff
102-
REQUIREMENTS NOT OGS_USE_MPI
103-
ABSTOL 1.1 RELTOL 1e-6
104-
DIFF_DATA
105-
mesh2D.vtu gravity_driven_adaptive_dt_pcs_1_ts_10_t_300.000000.vtu OGS5_PRESSURE1 pressure
106-
mesh2D.vtu gravity_driven_adaptive_dt_pcs_1_ts_10_t_300.000000.vtu OGS5_TEMPERATURE1 temperature
107-
mesh2D.vtu gravity_driven_adaptive_dt_pcs_1_ts_10_t_300.000000.vtu v_ref v
108-
)
109-
110-
AddTest(
111-
NAME Adaptive_dt_ThermalConvectionFlow2D
112-
PATH StaggeredCoupledProcesses/TH/ThermalConvection2D
113-
EXECUTABLE ogs
114-
EXECUTABLE_ARGS quad_5500x5500_adaptive_dt.prj
115-
WRAPPER time
116-
TESTER vtkdiff
117-
REQUIREMENTS NOT OGS_USE_MPI
118-
ABSTOL 1.e-3 RELTOL 1e-10
119-
DIFF_DATA
120-
ThermalConvection_pcs_1_ts_232_t_50000000000.000000_non_const_mu.vtu ThermalConvection_pcs_1_ts_223_t_50000000000.000000.vtu pressure pressure
121-
ThermalConvection_pcs_1_ts_232_t_50000000000.000000_non_const_mu.vtu ThermalConvection_pcs_1_ts_223_t_50000000000.000000.vtu temperature temperature
122-
)
123-
124-
AddTest(
125-
NAME Adaptive_dt_ThermalConvectionFlow2D_Constant_Viscosity
126-
PATH StaggeredCoupledProcesses/TH/ThermalConvection2D
127-
EXECUTABLE ogs
128-
EXECUTABLE_ARGS quad_5500x5500_adaptive_dt_constant_viscosity.prj
129-
WRAPPER time
130-
TESTER vtkdiff
131-
REQUIREMENTS NOT OGS_USE_MPI
132-
ABSTOL 1.e-16 RELTOL 1e-9 ### increased RETOL for the case of lis solver
133-
DIFF_DATA
134-
ConstViscosityThermalConvection_pcs_1_ts_137_t_50000000000.000000.vtu ConstViscosityThermalConvection_pcs_1_ts_137_t_50000000000.000000.vtu pressure pressure
135-
ConstViscosityThermalConvection_pcs_1_ts_137_t_50000000000.000000.vtu ConstViscosityThermalConvection_pcs_1_ts_137_t_50000000000.000000.vtu temperature temperature
136-
)
137-
13879
#===============================================================================
13980
# PETSc/MPI
14081
AddTest(
@@ -212,64 +153,3 @@ AddTest(
212153
DIFF_DATA
213154
hex.vtu isotropic_gravity_driven3D_pcs_0_ts_1_t_1_000000_0.vtu analytic_pressure pressure
214155
)
215-
216-
# Coupling
217-
AddTest(
218-
NAME StaggeredTH_ThermalDensityDrivenFlow2D
219-
PATH StaggeredCoupledProcesses/TH/ThermalDensityDrivenFlow2D
220-
EXECUTABLE_ARGS thermal_gravity_driven_flow2d.prj
221-
WRAPPER mpirun
222-
WRAPPER_ARGS -np 1
223-
TESTER vtkdiff
224-
REQUIREMENTS OGS_USE_MPI
225-
ABSTOL 1.1 RELTOL 1e-7
226-
DIFF_DATA
227-
mesh2D.vtu gravity_driven_pcs_1_ts_10_t_300_000000_0.vtu OGS5_PRESSURE1 pressure
228-
mesh2D.vtu gravity_driven_pcs_1_ts_10_t_300_000000_0.vtu OGS5_TEMPERATURE1 temperature
229-
# To be activated when the output of velocity is correct under PETSc version.
230-
# mesh2D.vtu gravity_driven_pcs_1_ts_10_t_300_000000_0.vtu v_ref v
231-
232-
)
233-
234-
AddTest(
235-
NAME Adaptive_dt_StaggeredTH_ThermalDensityDrivenFlow2D
236-
PATH StaggeredCoupledProcesses/TH/ThermalDensityDrivenFlow2D
237-
EXECUTABLE_ARGS thermal_gravity_driven_flow2d_adaptive_dt.prj
238-
WRAPPER mpirun
239-
WRAPPER_ARGS -np 1
240-
TESTER vtkdiff
241-
REQUIREMENTS OGS_USE_MPI
242-
ABSTOL 1.1 RELTOL 1e-7
243-
DIFF_DATA
244-
mesh2D.vtu gravity_driven_adaptive_dt_pcs_1_ts_10_t_300_000000_0.vtu OGS5_PRESSURE1 pressure
245-
mesh2D.vtu gravity_driven_adaptive_dt_pcs_1_ts_10_t_300_000000_0.vtu OGS5_TEMPERATURE1 temperature
246-
# To be activated when the output of velocity is correct under PETSc version.
247-
# mesh2D.vtu gravity_driven_pcs_1_ts_5_t_300_000000_0.vtu v_ref v
248-
)
249-
AddTest(
250-
NAME Adaptive_dt_ThermalConvectionFlow2D
251-
PATH StaggeredCoupledProcesses/TH/ThermalConvection2D
252-
EXECUTABLE_ARGS quad_5500x5500_adaptive_dt.prj
253-
WRAPPER mpirun
254-
WRAPPER_ARGS -np 1
255-
TESTER vtkdiff
256-
REQUIREMENTS OGS_USE_MPI
257-
ABSTOL 1.e-3 RELTOL 1e-10
258-
DIFF_DATA
259-
ThermalConvection_pcs_1_ts_232_t_50000000000.000000_non_const_mu.vtu ThermalConvection_pcs_1_ts_223_t_50000000000_000000_0.vtu pressure pressure
260-
ThermalConvection_pcs_1_ts_232_t_50000000000.000000_non_const_mu.vtu ThermalConvection_pcs_1_ts_223_t_50000000000_000000_0.vtu temperature temperature
261-
)
262-
263-
AddTest(
264-
NAME Adaptive_dt_ThermalConvectionFlow2D_Constant_Viscosity
265-
PATH StaggeredCoupledProcesses/TH/ThermalConvection2D
266-
EXECUTABLE_ARGS quad_5500x5500_adaptive_dt_constant_viscosity.prj
267-
WRAPPER mpirun
268-
WRAPPER_ARGS -np 1
269-
TESTER vtkdiff
270-
REQUIREMENTS OGS_USE_MPI
271-
ABSTOL 1.e-9 RELTOL 1e-9
272-
DIFF_DATA
273-
ConstViscosityThermalConvection_pcs_1_ts_137_t_50000000000.000000.vtu ConstViscosityThermalConvection_pcs_1_ts_137_t_50000000000_000000_0.vtu pressure pressure
274-
ConstViscosityThermalConvection_pcs_1_ts_137_t_50000000000.000000.vtu ConstViscosityThermalConvection_pcs_1_ts_137_t_50000000000_000000_0.vtu temperature temperature
275-
)

‎Tests/lfs-data/Parabolic/HT/StaggeredCoupling/ConstViscosity/square_5500x5500.gml

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:8b35708cfa327cd080308516153e5d97cfca995b75378c47462f9b64a63b21d5
3+
size 1044

‎Tests/lfs-data/Parabolic/HT/StaggeredCoupling/ConstViscosity/square_5500x5500.vtu

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:6310c19b38a335449927e10338fd308a5b8c107a3672e72aea304cb5a6ae733f
3+
size 172737

0 commit comments

Comments
 (0)