From 02f1010dcc849dcf73dadbf882659dbd79905646 Mon Sep 17 00:00:00 2001 From: Ben Spencer Date: Fri, 23 Apr 2021 13:25:01 -0600 Subject: [PATCH] Clean up errors and add error tests ref #210 --- src/materials/ConcreteASREigenstrain.C | 6 +++--- src/materials/ConcreteExpansionEigenstrainBase.C | 2 +- test/tests/concrete_expansion_microcracking/tests | 8 ++++++++ test/tests/concrete_moisture_heat_transfer/tests | 1 - test/tests/concrete_sulfide_attack/tests | 8 ++++++++ 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/materials/ConcreteASREigenstrain.C b/src/materials/ConcreteASREigenstrain.C index 914cbec5a..85b697044 100644 --- a/src/materials/ConcreteASREigenstrain.C +++ b/src/materials/ConcreteASREigenstrain.C @@ -155,7 +155,7 @@ ConcreteASREigenstrain::ConcreteASREigenstrain(const InputParameters & parameter else if (temperature_unit == "Kelvin") _temp_offset = 0.0; else - mooseError("Unsupported temperature unit"); + mooseAssert(false, "Unsupported temperature unit"); // Convert input value of reference temperature to Kelvin _ref_temp += _temp_offset; @@ -271,7 +271,7 @@ ConcreteASREigenstrain::computeResidual(unsigned qp, Real scalar) } } else - mooseError("Invalid expansion type"); + mooseAssert(false, "Invalid expansion type"); // Convert current temperature to Kelvin const Real T = _temperature[qp] + _temp_offset; @@ -306,7 +306,7 @@ ConcreteASREigenstrain::computeDerivative(unsigned qp, Real scalar) } } else - mooseError("Invalid expansion type"); + mooseAssert(false, "Invalid expansion type"); // Convert current temperature to Kelvin const Real T = _temperature[qp] + _temp_offset; diff --git a/src/materials/ConcreteExpansionEigenstrainBase.C b/src/materials/ConcreteExpansionEigenstrainBase.C index b0ba7cc29..f304cc954 100644 --- a/src/materials/ConcreteExpansionEigenstrainBase.C +++ b/src/materials/ConcreteExpansionEigenstrainBase.C @@ -127,7 +127,7 @@ ConcreteExpansionEigenstrainBase::computeQpEigenstrain() _eigenstrain[_qp] = _eigenstrain_old[_qp] + inc_weighted_strain; } else - mooseError("Invalid expansion type"); + mooseAssert(false, "Invalid expansion type"); } Real diff --git a/test/tests/concrete_expansion_microcracking/tests b/test/tests/concrete_expansion_microcracking/tests index 8a0709dd3..bebf1fae3 100644 --- a/test/tests/concrete_expansion_microcracking/tests +++ b/test/tests/concrete_expansion_microcracking/tests @@ -93,4 +93,12 @@ detail = 'and with a 10 MPa compressive pressure in the x, y, and z directions.' [] [] + [concrete_microcracking_damage_isotropic_error] + type = 'RunException' + input = 'concrete_expansion_microcracking.i' + expect_err = 'ConcreteExpansionMicrocrackingDamage requires that the elasticity tensor be guaranteed isotropic' + cli_args = 'Materials/inactive=concrete Materials/aniso/type=ComputeElasticityTensor Materials/aniso/fill_methode=orthotropic Materials/aniso/C_ijkl="2.0e5 2.0e5 2.0e5 0.71428571e5 0.71428571e5 0.71428571e5 0.4 0.4 0.4"' + allow_test_objects = True + requirement = 'The ConcreteExpansionMicrocrackingDamage model shall generate an error if used with a material that is not guaranteed isotropic' + [] [] diff --git a/test/tests/concrete_moisture_heat_transfer/tests b/test/tests/concrete_moisture_heat_transfer/tests index 34dd1de36..0e6f27597 100644 --- a/test/tests/concrete_moisture_heat_transfer/tests +++ b/test/tests/concrete_moisture_heat_transfer/tests @@ -6,6 +6,5 @@ type = 'Exodiff' input = 'maqbeth.i' exodiff = 'maqbeth_out.e' - skip = 'temporary - avoid failure in debug tests' [] [] diff --git a/test/tests/concrete_sulfide_attack/tests b/test/tests/concrete_sulfide_attack/tests index ddd438605..d1641ebb1 100644 --- a/test/tests/concrete_sulfide_attack/tests +++ b/test/tests/concrete_sulfide_attack/tests @@ -2,9 +2,17 @@ issues = '#171' design = 'ConcreteThermalMoisture.md ReactionNetwork/index.md' [./test] + [test] type = 'Exodiff' input = 'sulfide_attack.i' exodiff = 'sulfide_attack_out.e' requirement = 'Blackbear shall model the migration and reactions between chemical species involved in sulfide attack on concrete' + [] + [aqueous_speciations_syntax] + type = 'RunException' + input = 'sulfide_attack.i' + cli_args = 'ReactionNetwork/aqueous_speciations="(1.0)ca / (1.0)cl = (1.0)cacl -0.7"' + expect_err = 'Error parsing term: /' + requirement = 'The ReactionNetwork model shall generate an error if an incorrect form is provided for aqueous speciacions' [../] []