Skip to content
Permalink
Browse files

Merge pull request #13391 from WilkAndy/pf_parallel_tests_13255

PorousFlow tests work in parallel
  • Loading branch information...
permcody committed May 9, 2019
2 parents d37e6a8 + 59b9d1b commit c1f5f907035978937697981402980c1277753bc5
Showing with 315 additions and 352 deletions.
  1. +1 −3 modules/porous_flow/examples/flow_through_fractured_media/coarse.i
  2. +2 −0 modules/porous_flow/examples/flow_through_fractured_media/diffusion.i
  3. +1 −1 modules/porous_flow/examples/flow_through_fractured_media/fine_steady.i
  4. +39 −39 modules/porous_flow/examples/flow_through_fractured_media/gold/coarse_csv_xmass_0011.csv
  5. BIN modules/porous_flow/examples/flow_through_fractured_media/gold/diffusion_out.e
  6. BIN modules/porous_flow/examples/flow_through_fractured_media/gold/fine_steady_out.e
  7. +24 −0 modules/porous_flow/examples/flow_through_fractured_media/tests
  8. +1 −4 modules/porous_flow/examples/tutorial/01.i
  9. +2 −1 modules/porous_flow/examples/tutorial/04.i
  10. +1 −1 modules/porous_flow/examples/tutorial/06.i
  11. +9 −1 modules/porous_flow/examples/tutorial/06_KT.i
  12. +10 −2 modules/porous_flow/examples/tutorial/08_KT.i
  13. BIN modules/porous_flow/examples/tutorial/gold/01_out.e
  14. BIN modules/porous_flow/examples/tutorial/gold/04_out.e
  15. BIN modules/porous_flow/examples/tutorial/gold/06_KT_out.e
  16. BIN modules/porous_flow/examples/tutorial/gold/06_out.e
  17. BIN modules/porous_flow/examples/tutorial/gold/08_KT_out.e
  18. +2 −1 modules/porous_flow/test/tests/actions/basicthm_h.i
  19. +8 −1 modules/porous_flow/test/tests/actions/basicthm_hm.i
  20. +2 −1 modules/porous_flow/test/tests/actions/basicthm_th.i
  21. +8 −1 modules/porous_flow/test/tests/actions/basicthm_thm.i
  22. BIN modules/porous_flow/test/tests/actions/gold/basicthm_h_out.e
  23. BIN modules/porous_flow/test/tests/actions/gold/basicthm_hm_out.e
  24. BIN modules/porous_flow/test/tests/actions/gold/basicthm_th_out.e
  25. BIN modules/porous_flow/test/tests/actions/gold/basicthm_thm_out.e
  26. +0 −1 modules/porous_flow/test/tests/energy_conservation/tests
  27. +0 −9 modules/porous_flow/test/tests/gravity/fully_saturated_grav01a.i
  28. +0 −9 modules/porous_flow/test/tests/gravity/fully_saturated_grav01b.i
  29. +0 −2 modules/porous_flow/test/tests/gravity/fully_saturated_grav01c.i
  30. +0 −9 modules/porous_flow/test/tests/gravity/grav01a.i
  31. +0 −9 modules/porous_flow/test/tests/gravity/grav01b.i
  32. +0 −9 modules/porous_flow/test/tests/gravity/grav01c.i
  33. +0 −3 modules/porous_flow/test/tests/gravity/grav01c_action.i
  34. +0 −8 modules/porous_flow/test/tests/gravity/grav01d.i
  35. +2 −9 modules/porous_flow/test/tests/gravity/grav02a.i
  36. +0 −9 modules/porous_flow/test/tests/gravity/grav02b.i
  37. +0 −24 modules/porous_flow/test/tests/gravity/tests
  38. +7 −2 modules/porous_flow/test/tests/heat_advection/heat_advection_1d_fully_saturated_action.i
  39. +0 −2 modules/porous_flow/test/tests/heat_conduction/no_fluid.i
  40. +0 −2 modules/porous_flow/test/tests/heat_conduction/two_phase.i
  41. +1 −1 modules/porous_flow/test/tests/jacobian/tests
  42. +2 −3 modules/porous_flow/test/tests/newton_cooling/nc08.i
  43. +8 −0 modules/porous_flow/test/tests/numerical_diffusion/fully_saturated_action_KT.i
  44. +8 −0 modules/porous_flow/test/tests/numerical_diffusion/pffltvd_action.i
  45. +0 −2 modules/porous_flow/test/tests/poro_elasticity/terzaghi.i
  46. +0 −2 modules/porous_flow/test/tests/poro_elasticity/terzaghi_basicthm.i
  47. +0 −2 modules/porous_flow/test/tests/poro_elasticity/terzaghi_constM.i
  48. +0 −2 modules/porous_flow/test/tests/poro_elasticity/terzaghi_fully_saturated_volume.i
  49. +0 −2 modules/porous_flow/test/tests/pressure_pulse/pressure_pulse_1d_MD.i
  50. +88 −88 modules/porous_flow/test/tests/sinks/gold/s09_mf_0010.csv
  51. +51 −51 modules/porous_flow/test/tests/sinks/gold/s09_mf_0050.csv
  52. +32 −32 modules/porous_flow/test/tests/sinks/gold/s09_mf_0100.csv
  53. +2 −2 modules/porous_flow/test/tests/sinks/s09.i
  54. +2 −2 modules/porous_flow/test/tests/sinks/s09_fully_saturated.i
  55. +2 −0 modules/porous_flow/test/tests/sinks/tests
@@ -213,8 +213,6 @@
[./basic]
type = SMP
full = true
petsc_options_iname = '-ksp_type -pc_type -sub_pc_type -sub_pc_factor_shift_type -pc_asm_overlap'
petsc_options_value = 'gmres asm lu NONZERO 2 '
[../]
[]

@@ -227,7 +225,7 @@
# controls for nonlinear iterations
nl_max_its = 15
nl_rel_tol = 1e-14
nl_abs_tol = 1e-9
nl_abs_tol = 1e-12

[]

@@ -47,6 +47,8 @@
solve_type = NEWTON
dt = 10
end_time = 100
nl_abs_tol = 1E-13
nl_rel_tol = 1E-12
[]

[Outputs]
@@ -129,7 +129,7 @@

# controls for nonlinear iterations
nl_abs_tol = 1e-9
nl_rel_tol = 1e-10
nl_rel_tol = 1e-14
[]


@@ -1,42 +1,42 @@
x,y,z,id,massfrac0
-0.5,0,0,0,0
-0.475,0,0,0.025,1.2185845313283e-10
-0.45,0,0,0.05,2.7875098254322e-10
-0.425,0,0,0.075,6.3463321956916e-10
-0.4,0,0,0.1,1.4377312431802e-09
-0.375,0,0,0.125,3.2402379820496e-09
-0.35,0,0,0.15,7.262872887855e-09
-0.325,0,0,0.175,1.6186459270462e-08
-0.3,0,0,0.2,3.5857277908009e-08
-0.275,0,0,0.225,7.8930455175076e-08
-0.25,0,0,0.25,1.725845915294e-07
-0.225,0,0,0.275,3.7470118186847e-07
-0.2,0,0,0.3,8.0744883015493e-07
-0.175,0,0,0.325,1.7262242659492e-06
-0.15,0,0,0.35,3.6594785907458e-06
-0.125,0,0,0.375,7.68862125637e-06
-0.1,0,0,0.4,1.6000363908247e-05
-0.075,0,0,0.425,3.2959656814176e-05
-0.05,0,0,0.45,6.7157912077041e-05
-0.025,0,0,0.475,0.00013524790477795
0,0,0,0.5,0.00026896892419674
0.025,0,0,0.525,0.00052770085410672
0.05,0,0,0.55,0.0010202663082888
0.075,0,0,0.575,0.0019415450357046
0.1,0,0,0.6,0.0036315382884244
0.125,0,0,0.625,0.006666011447696
0.15,0,0,0.65,0.011986869532965
0.175,0,0,0.675,0.021073444979416
0.2,0,0,0.7,0.036137409162507
0.225,0,0,0.725,0.060287546125658
0.25,0,0,0.75,0.097552506948588
0.275,0,0,0.775,0.15257819252791
0.3,0,0,0.8,0.22976691971109
0.325,0,0,0.825,0.33167611840668
0.35,0,0,0.85,0.45676247154529
0.375,0,0,0.875,0.59713705662434
0.4,0,0,0.9,0.73779010801968
0.425,0,0,0.925,0.85920858892348
0.45,0,0,0.95,0.94437033074974
0.475,0,0,0.975,0.98781175470473
-0.475,0,0,0.025,1.2185845312398e-10
-0.45,0,0,0.05,2.7875098252292e-10
-0.425,0,0,0.075,6.3463321952137e-10
-0.4,0,0,0.1,1.4377312430736e-09
-0.375,0,0,0.125,3.2402379818029e-09
-0.35,0,0,0.15,7.2628728872883e-09
-0.325,0,0,0.175,1.6186459269234e-08
-0.3,0,0,0.2,3.5857277905246e-08
-0.275,0,0,0.225,7.8930455169177e-08
-0.25,0,0,0.25,1.7258459151618e-07
-0.225,0,0,0.275,3.747011818407e-07
-0.2,0,0,0.3,8.0744883009581e-07
-0.175,0,0,0.325,1.7262242658254e-06
-0.15,0,0,0.35,3.6594785904926e-06
-0.125,0,0,0.375,7.6886212558521e-06
-0.1,0,0,0.4,1.6000363907226e-05
-0.075,0,0,0.425,3.2959656812142e-05
-0.05,0,0,0.45,6.7157912073124e-05
-0.025,0,0,0.475,0.00013524790477041
0,0,0,0.5,0.00026896892418293
0.025,0,0,0.525,0.00052770085408123
0.05,0,0,0.55,0.0010202663082451
0.075,0,0,0.575,0.0019415450356275
0.1,0,0,0.6,0.0036315382882957
0.125,0,0,0.625,0.0066660114474918
0.15,0,0,0.65,0.01198686953264
0.175,0,0,0.675,0.021073444978939
0.2,0,0,0.7,0.036137409161867
0.225,0,0,0.725,0.060287546124841
0.25,0,0,0.75,0.097552506947532
0.275,0,0,0.775,0.15257819252699
0.3,0,0,0.8,0.22976691971015
0.325,0,0,0.825,0.33167611840661
0.35,0,0,0.85,0.45676247154574
0.375,0,0,0.875,0.59713705662576
0.4,0,0,0.9,0.73779010802162
0.425,0,0,0.925,0.85920858892545
0.45,0,0,0.95,0.944370330751
0.475,0,0,0.975,0.98781175470517
0.5,0,0,1,1
Binary file not shown.
Binary file not shown.
@@ -5,6 +5,9 @@
csvdiff = 'coarse_csv_xmass_0011.csv'
abs_zero = 1E-7
threading = '!pthreads'
issues = '#10683'
design = 'flow_through_fractured_media.md'
requirement = 'PorousFlow shall be able to simulate flow and solute transport along a fracture embedded in a porous matrix, using a coarse mesh in 2D'
[../]
[./coarse_3D]
type = CSVDiff
@@ -13,14 +16,21 @@
csvdiff = 'coarse_3D_csv_xmass_0021.csv'
abs_zero = 1E-7
threading = '!pthreads'
issues = '#10683'
design = 'flow_through_fractured_media.md'
requirement = 'PorousFlow shall be able to simulate flow and solute transport along a fracture embedded in a porous matrix, using a coarse mesh in 3D'
[../]
[./fine_steady]
type = Exodiff
heavy = true
input = 'fine_steady.i'
exodiff = 'fine_steady_out.e'
abs_zero = 1E-7
max_parallel = 1 # without the influence of a time derivative, MOOSE believes the porepressure in the ultra-low permeability matrix can be almost anything: the residual are swamped by the residuals in the fracture
threading = '!pthreads'
issues = '#10683'
design = 'flow_through_fractured_media.md'
requirement = 'PorousFlow shall be able to find the steady-state solution for flow and solute transport along a fracture embedded in a porous matrix, using a fine mesh'
[../]
[./fine_transient]
type = CSVDiff
@@ -31,14 +41,21 @@
prereq = fine_steady
abs_zero = 1E-7
threading = '!pthreads'
issues = '#10683'
design = 'flow_through_fractured_media.md'
requirement = 'PorousFlow shall be able to simulate flow and solute transport along a fracture embedded in a porous matrix, using a fine mesh'
[../]
[./fine_thick_fracture_steady]
type = Exodiff
heavy = true
input = 'fine_thick_fracture_steady.i'
exodiff = 'fine_thick_fracture_steady_out.e'
abs_zero = 1E-7
max_parallel = 1 # without the influence of a time derivative, MOOSE believes the porepressure in the ultra-low permeability matrix can be almost anything: the residual are swamped by the residuals in the fracture
threading = '!pthreads'
issues = '#10683'
design = 'flow_through_fractured_media.md'
requirement = 'PorousFlow shall be able to find the steady-state solution for flow and solute transport along a finite-sized fracture embedded in a porous matrix, using a fine mesh'
[../]
[./fine_thick_fracture_transient]
type = CSVDiff
@@ -49,11 +66,18 @@
prereq = fine_thick_fracture_steady
abs_zero = 1E-7
threading = '!pthreads'
issues = '#10683'
design = 'flow_through_fractured_media.md'
requirement = 'PorousFlow shall be able to simulate flow and solute transport along a finite-sized fracture embedded in a porous matrix, using a fine mesh'
[../]
[./diffusion]
type = Exodiff
input = 'diffusion.i'
exodiff = 'diffusion_out.e'
abs_zero = 1E-5
threading = '!pthreads'
issues = '#10683'
design = 'flow_through_fractured_media.md'
requirement = 'MOOSE shall be able to simulate diffusion along fracture embedded in a porous matrix'
[../]
[]
@@ -111,9 +111,6 @@
[./basic]
type = SMP
full = true
petsc_options = '-ksp_diagonal_scale -ksp_diagonal_scale_fix'
petsc_options_iname = '-pc_type -sub_pc_type -sub_pc_factor_shift_type -pc_asm_overlap'
petsc_options_value = ' asm lu NONZERO 2'
[../]
[./preferred_but_might_not_be_installed]
type = SMP
@@ -128,7 +125,7 @@
solve_type = Newton
end_time = 1E6
dt = 1E5
nl_abs_tol = 1E-10
nl_abs_tol = 1E-13
[]

[Outputs]
@@ -256,7 +256,8 @@
solve_type = Newton
end_time = 1E6
dt = 1E5
nl_abs_tol = 1E-10
nl_abs_tol = 1E-15
nl_rel_tol = 1E-14
[]

[Outputs]
@@ -145,7 +145,7 @@
solve_type = Newton
end_time = 1E6
dt = 1E5
nl_abs_tol = 1E-7
nl_rel_tol = 1E-14
[]

[Outputs]
@@ -76,6 +76,14 @@
flux_limiter_type = superbee
[]

[UserObjects]
[./this_just_adds_correct_relationship_manager_for_ghosting_13388]
type = PorousFlowAdvectiveFluxCalculatorSaturated
gravity = '0 0 0'
flux_limiter_type = superbee
[../]
[]

[BCs]
[./constant_injection_porepressure]
type = PresetBC
@@ -147,7 +155,7 @@
solve_type = Newton
end_time = 1E6
dt = 1E5
nl_abs_tol = 1E-7
nl_rel_tol = 1E-14
[]

[Outputs]
@@ -70,6 +70,14 @@
flux_limiter_type = None
[]

[UserObjects]
[./this_just_adds_correct_relationship_manager_for_ghosting_13388]
type = PorousFlowAdvectiveFluxCalculatorSaturated
gravity = '0 0 0'
flux_limiter_type = superbee
[../]
[]

[BCs]
[./production]
type = PorousFlowSink
@@ -129,9 +137,9 @@
[Executioner]
type = Transient
solve_type = Newton
end_time = 1E6
end_time = 1E5
dt = 1E5
nl_abs_tol = 1E-7
nl_rel_tol = 1E-14
[]

[Outputs]
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -124,7 +124,8 @@
solve_type = Newton
end_time = 1e4
dt = 1e3
nl_abs_tol = 1e-10
nl_abs_tol = 1e-15
nl_rel_tol = 1E-14
[]

[Outputs]
@@ -94,6 +94,12 @@
value = 0
boundary = 'top bottom'
[../]
[./right]
type = PresetBC
variable = disp_x
value = 0
boundary = right
[../]
[]

[Modules]
@@ -149,7 +155,8 @@
solve_type = Newton
end_time = 1e4
dt = 1e3
nl_abs_tol = 1e-10
nl_abs_tol = 1e-14
nl_rel_tol = 1e-14
[]

[Outputs]
@@ -150,7 +150,8 @@
solve_type = Newton
end_time = 1e4
dt = 1e3
nl_abs_tol = 1e-10
nl_abs_tol = 1e-15
nl_rel_tol = 1e-14
[]

[Outputs]
@@ -105,6 +105,12 @@
value = 0
boundary = 'top bottom'
[../]
[./right]
type = PresetBC
variable = disp_x
value = 0
boundary = right
[../]
[]

[Modules]
@@ -184,7 +190,8 @@
solve_type = Newton
end_time = 1e4
dt = 1e3
nl_abs_tol = 1e-10
nl_abs_tol = 1e-12
nl_rel_tol = 1E-10
[]

[Outputs]
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -82,7 +82,6 @@
input = 'heat04_action_KT.i'
csvdiff = 'heat04_action.csv'
prereq = heat04_action
max_parallel = 1 # 1 element only
rel_err = 1.0E-5
threading = '!pthreads'
issues = '#8123 #10426'
@@ -108,18 +108,9 @@
[]

[Preconditioning]
active = andy
[./andy]
type = SMP
full = true
petsc_options_iname = '-ksp_type -pc_type -snes_atol -snes_rtol -snes_max_it'
petsc_options_value = 'bcgs bjacobi 1E-15 1E-10 10000'
[../]
[./check]
type = SMP
full = true
petsc_options_iname = '-ksp_type -pc_type -snes_atol -snes_rtol -snes_max_it -snes_type'
petsc_options_value = 'bcgs bjacobi 1E-15 1E-10 10000 test'
[../]
[]

@@ -108,18 +108,9 @@
[]

[Preconditioning]
active = andy
[./andy]
type = SMP
full = true
petsc_options_iname = '-ksp_type -pc_type -snes_atol -snes_rtol -snes_max_it'
petsc_options_value = 'bcgs bjacobi 1E-15 1E-10 10000'
[../]
[./check]
type = SMP
full = true
petsc_options_iname = '-ksp_type -pc_type -snes_atol -snes_rtol -snes_max_it -snes_type'
petsc_options_value = 'bcgs bjacobi 1E-15 1E-10 10000 test'
[../]
[]

Oops, something went wrong.

0 comments on commit c1f5f90

Please sign in to comment.
You can’t perform that action at this time.