Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ heated_length = 1.0
T_tol = 1.0e-3
implicit = true
segregated = false
staggered_pressure = false
verbose_multiapps = true
verbose_subchannel = false
interpolation_scheme = 'upwind'
Expand Down
1 change: 0 additions & 1 deletion modules/subchannel/examples/MultiApp/fuel_assembly.i
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,6 @@ duct_inside = '${fparse duct_outside - 2 * duct_thickness}'
n_blocks = 10
implicit = false
segregated = true
staggered_pressure = false

# Tolerances
P_tol = 1.0e-4
Expand Down
2 changes: 0 additions & 2 deletions modules/subchannel/include/problems/SubChannel1PhaseProblem.h
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,6 @@ class SubChannel1PhaseProblem : public ExternalProblem, public PostprocessorInte
const Real _dir_grav;
/// Flag to define the usage of a implicit or explicit solution
const bool _implicit_bool;
/// Flag to define the usage of staggered or collocated pressure
const bool _staggered_pressure_bool;
/// Segregated solve
const bool _segregated_bool;
/// Boolean to printout information related to subchannel solve
Expand Down
319 changes: 84 additions & 235 deletions modules/subchannel/src/problems/SubChannel1PhaseProblem.C

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion modules/subchannel/test/tests/positions/pin_positions.i
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,6 @@ duct_inside = '${fparse duct_outside - 2 * duct_thickness}'
n_blocks = 10
implicit = false
segregated = true
staggered_pressure = false

# Tolerances
P_tol = 1.0e-4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ P_out = 1.0e5 # Pa
T_tol = 1.0e-4
implicit = true
segregated = false
staggered_pressure = false
verbose_multiapps = true
verbose_subchannel = true
interpolation_scheme = upwind
Expand Down

This file was deleted.

217 changes: 0 additions & 217 deletions modules/subchannel/test/tests/problems/psbt/psbt_explicit_staggered.i

This file was deleted.

11 changes: 0 additions & 11 deletions modules/subchannel/test/tests/problems/psbt/tests
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,6 @@
max_threads = 1
requirement = 'The system shall be able to solve a PSBT-type case with the subchannel solver using the non-default friction/mixing model.'
[]
[psbt_regression_test_explicit_staggered]
type = CSVDiff
input = psbt_explicit_staggered.i
csvdiff = psbt_explicit_staggered_out.csv
capabilities = 'method!=dbg'
valgrind = NONE
recover = false
abs_zero = 1e-6
max_threads = 1
requirement = 'The system shall be able to solve a PSBT-type case with the subchannel solver using an explicit algorithm and a staggered pressure formulation.'
[]
[psbt_regression_test_implicit]
type = CSVDiff
input = psbt_implicit.i
Expand Down
1 change: 0 additions & 1 deletion modules/subchannel/validation/ORNL_19_pin/test_ORNL_19.i
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ P_out = 2.0e5 # Pa
T_tol = 1.0e-4
implicit = true
segregated = false
staggered_pressure = false
verbose_multiapps = true
verbose_subchannel = true
interpolation_scheme = upwind
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ P_out = 2.0e5 # Pa
T_tol = 1.0e-3
implicit = true
segregated = false
staggered_pressure = false
verbose_multiapps = true
verbose_subchannel = false
# friction model
Expand Down
1 change: 0 additions & 1 deletion modules/subchannel/validation/psbt/psbt_ss/psbt.i
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ P_out = 14.72e6 # Pa
P_out = ${P_out}
implicit = true
segregated = false
staggered_pressure = false
verbose_subchannel = true
interpolation_scheme = exponential
deformation = true # this flag allows the re-calculation of subchannel geometric parameters based on the dpin value
Expand Down