Skip to content

Commit

Permalink
Merge pull request idaholab#14731 from permcody/race_conditions
Browse files Browse the repository at this point in the history
Avoiding race conditions
  • Loading branch information
lindsayad committed Feb 18, 2020
2 parents 48fe948 + eab307c commit db0c38e
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 15 deletions.
6 changes: 3 additions & 3 deletions modules/combined/test/tests/beam_eigenstrain_transfer/tests
Expand Up @@ -19,7 +19,7 @@
[./error_2]
type = RunException
input = 'master_uo_transfer.i'
cli_args = "MultiApps/sub/input_files='subapp_err_2.i subapp2_uo_transfer.i' Outputs/csv=false Outputs/exodus=false"
cli_args = "MultiApps/sub/input_files='subapp_err_2.i subapp2_uo_transfer.i' Outputs/csv=false Outputs/exodus=false :Outputs/csv=false :Outputs/exodus=false"
expect_err = 'LineValueSampler: When calling getValue\(\) on LineValueSampler, only one variable can be provided as input to LineValueSampler.'
method='OPT OPROF' # Test triggers an assert before reaching the expected runtime error
detail = 'and LineValueSampler shall report an error if multiple variables'
Expand All @@ -29,15 +29,15 @@
[./error_3]
type = RunException
input = 'master_uo_transfer.i'
cli_args = "MultiApps/sub/input_files='subapp_err_3.i subapp2_uo_transfer.i' Outputs/csv=false Outputs/exodus=false"
cli_args = "MultiApps/sub/input_files='subapp_err_3.i subapp2_uo_transfer.i' Outputs/csv=false Outputs/exodus=false :Outputs/csv=false :Outputs/exodus=false"
expect_err = 'LineValueSampler: When calling getValue\(\) on LineValueSampler, `sort_by` should be set to `id`.'
detail = 'and LineValueSampler shall report an error if sorting method'
' is not set to `id` when it is used with MultiAppUserObjectTransfer.'
[../]
[./error_4]
type = RunException
input = 'master_uo_transfer.i'
cli_args = "MultiApps/sub/input_files='subapp_err_4.i subapp2_uo_transfer.i' Outputs/csv=false Outputs/exodus=false"
cli_args = "MultiApps/sub/input_files='subapp_err_4.i subapp2_uo_transfer.i' Outputs/csv=false Outputs/exodus=false :Outputs/csv=false :Outputs/exodus=false"
expect_err = 'MultiAppUserObjectTransfer: Point corresponding to master node at'
detail = 'and LineValueSampler shall report an return value of infinity'
' when the projection of the queried point onto the line'
Expand Down
Expand Up @@ -95,7 +95,6 @@
[exo]
type = Exodus
[]
checkpoint = true
[]

[Preconditioning]
Expand Down
Expand Up @@ -161,10 +161,6 @@
[Outputs]
exodus = true
file_base = lid_driven_stabilized_out
[dofmap]
type = DOFMap
execute_on = 'initial'
[]
[]

[Postprocessors]
Expand Down
Expand Up @@ -156,10 +156,6 @@

[Outputs]
exodus = true
[dofmap]
type = DOFMap
execute_on = 'initial'
[]
[]

[Postprocessors]
Expand Down
2 changes: 1 addition & 1 deletion modules/tensor_mechanics/test/tests/jacobian/cto15.i
Expand Up @@ -406,7 +406,7 @@


[Outputs]
file_base = cto14
file_base = cto15
exodus = false
csv = true
[]
Expand Up @@ -58,7 +58,7 @@
type = 'PetscJacobianTester'
input = 'ad_constant_expansion_coeff.i'
run_sim = 'True'
cli_args = 'Outputs/exodus=false Executioner/num_steps=2'
cli_args = 'Outputs/exodus=false Outputs/csv=false Executioner/num_steps=2'
difference_tol = 1e-5
issues = '#13091'
design = 'ADComputeThermalExpansionEigenstrain.md'
Expand Down
1 change: 1 addition & 0 deletions test/tests/kernels/simple_transient_diffusion/speedtests
Expand Up @@ -8,5 +8,6 @@
type = SpeedTest
input = simple_transient_diffusion.i
cli_args = 'Mesh/nx=100 Mesh/ny=100 Executioner/num_steps=10'
prereq = 'trans_diffusion_100x100_t5'
[../]
[]
2 changes: 1 addition & 1 deletion test/tests/postprocessors/relative_difference/tests
Expand Up @@ -17,7 +17,7 @@
input = 'relative_difference.i'
csvdiff = 'relative_difference_zero_out.csv'
cli_args = 'Postprocessors/relative_difference/value2=zero '
'Outputs/out/file_base=relative_difference_zero_out'
'Outputs/out/file_base=relative_difference_zero_out Outputs/file_base=close_to_zero'

detail = 'when values are approximately zero.'
[]
Expand Down
2 changes: 2 additions & 0 deletions test/tests/vectorpostprocessors/csv_reader/tests
Expand Up @@ -17,6 +17,7 @@
input = read.i
cli_args = 'UserObjects/tester/rank=1 Outputs/csv=false'
min_parallel = 2
recover = false

requirement = 'The system shall support the ability to read CSV data on only one processor and broadcast it to other ranks.'
[../]
Expand All @@ -26,6 +27,7 @@
cli_args = "UserObjects/tester/rank=1 UserObjects/tester/gold='1 2 3' Outputs/csv=false"
min_parallel = 2
expect_err = "The supplied gold data does not match the VPP data on the given rank."
recover = false

requirement = 'The system shall error if the broadcast CSV data does not match on all ranks in a parallel job.'
[../]
Expand Down

0 comments on commit db0c38e

Please sign in to comment.