diff --git a/src/materials/ConcreteExpansionEigenstrainBase.C b/src/materials/ConcreteExpansionEigenstrainBase.C index b0ba7cc2..de560cfb 100644 --- a/src/materials/ConcreteExpansionEigenstrainBase.C +++ b/src/materials/ConcreteExpansionEigenstrainBase.C @@ -172,10 +172,13 @@ ConcreteExpansionEigenstrainBase::findNeighborIndex(Real sig) return 2; else if (sig > -_sigma_u && sig <= 0) return 1; - else if (sig > 0) - return 0; else - mooseError("Invalid value for sig."); + return 0; + // else if (sig > 0) + // return 0; + // else + // mooseAssert("Invalid value for sig."); + mooseAssert("sig not real", "sig not real"); } Real @@ -189,10 +192,16 @@ ConcreteExpansionEigenstrainBase::computeAB(const Real ab1, ab = ab1; else if (pbound == 1) ab = ab2; - else if (pbound == 2) - ab = ab3; else - mooseError("Invalid value for pbound. Got ", pbound, ", expected 0, 1, or 2."); + ab = ab3; + + // else if (pbound == 2) + // ab = ab3; + // else + // mooseAssert("Invalid value for pbound. Got ", pbound, ", expected 0, 1, or 2."); + + // mooseAssert("pbound > 2 or pbound < 0", "pbound can only be 0 1 2"); + return ab; } diff --git a/test/tests/concrete_anisotropic_eigenstrain/concrete_anisotropic_eigenstrain.i b/test/tests/concrete_anisotropic_eigenstrain/concrete_anisotropic_eigenstrain.i index 4fb5cc59..a0c8f19d 100644 --- a/test/tests/concrete_anisotropic_eigenstrain/concrete_anisotropic_eigenstrain.i +++ b/test/tests/concrete_anisotropic_eigenstrain/concrete_anisotropic_eigenstrain.i @@ -174,7 +174,6 @@ boundary = back value = 0 [../] - [./load_x] type = NeumannBC variable = disp_x @@ -199,28 +198,21 @@ [stress] type = ComputeLinearElasticStress [] - [./concrete] type = ComputeIsotropicElasticityTensor youngs_modulus = 30e9 poissons_ratio = 0.2 [../] - [./strain] type = ComputeSmallStrain displacements = 'disp_x disp_y disp_z' eigenstrain_names = 'concrete_expansion' [../] - [concrete_expansion] type = TestConcreteExpansionEigenstrain expansion_type = Anisotropic function = expansion_vs_time eigenstrain_name = concrete_expansion - - compressive_strength = 30e6 - tensile_strength = 3e6 - expansion_stress_limit = 10e6 [] [] diff --git a/test/tests/concrete_anisotropic_eigenstrain/gold/concrete_expansion_load_10_out.csv b/test/tests/concrete_anisotropic_eigenstrain/gold/concrete_expansion_load_10_out.csv deleted file mode 100644 index 8c9c6bc2..00000000 --- a/test/tests/concrete_anisotropic_eigenstrain/gold/concrete_expansion_load_10_out.csv +++ /dev/null @@ -1,13 +0,0 @@ -time,expansion_strain_xx,expansion_strain_yy,expansion_strain_zz,expansion_vol_strain,strain_xx,strain_yy,strain_zz,stress_xx,stress_yy,stress_zz -0,0,0,0,0,0,0,0,0,0,0 -0.0001,0,0,0,0,-0.0003332888992563,6.6657779851259e-05,6.6657779851259e-05,-9998666.9776889,-3.2014213502407e-10,-4.6566128730774e-10 -0.0002,4.4434077036047e-09,4.9997778296148e-05,4.9997778296148e-05,0.0001,-0.00033325113760079,0.00011664889449788,0.00011664889449788,-9997667.4302543,1.1935917427763e-06,1.1933734640479e-06 -0.0003,1.22186401892e-08,9.9993890679905e-05,9.9993890679905e-05,0.0002,-0.00033321005022565,0.0001666383444531,0.0001666383444531,-9996668.0659748,1.194013748318e-06,1.1927913874388e-06 -0.0004,2.3325086939729e-08,0.00014998833745653,0.00014998833745653,0.0003,-0.00033316563773969,0.00021662613002188,0.00021662613002188,-9995668.8847983,1.1937809176743e-06,1.194013748318e-06 -0.0005,3.776213761212e-08,0.00019998111893119,0.00019998111893119,0.0004,-0.00033311790075152,0.00026661225150905,0.00026661225150905,-9994669.8866736,1.1953088687733e-06,1.1942465789616e-06 -0.0006,5.5529182033402e-08,0.00024997223540898,0.00024997223540898,0.0005,-0.00033306683986965,0.00031659670921935,0.00031659670921935,-9993671.0715499,1.1921511031687e-06,1.1922675184906e-06 -0.0007,7.6625610200449e-08,0.0002999616871949,0.0002999616871949,0.0006,-0.00033301245570235,0.00036657950345744,0.00036657950345744,-9992672.4393761,1.1945958249271e-06,1.1952943168581e-06 -0.0008,1.010508122801e-07,0.00034994947459386,0.00034994947459386,0.0007,-0.00033295474885778,0.0004165606345279,0.0004165606345279,-9991673.9901013,1.191277988255e-06,1.1924421414733e-06 -0.0009,1.2880417860901e-07,0.0003999355979107,0.0003999355979107,0.0008,-0.00033289371994389,0.00046654010273522,0.00046654010273522,-9990675.7236746,1.1927913874388e-06,1.1950032785535e-06 -0.001,1.5988509969359e-07,0.00044992005745015,0.00044992005745015,0.0009,-0.00033282936956849,0.00051651790838382,0.00051651790838382,-9989677.6400451,1.1936208466068e-06,1.1909287422895e-06 -0.0011,1.942929662099e-07,0.0004999028535169,0.0004999028535169,0.001,-0.0003327616983392,0.00056649405177801,0.00056649405177801,-9988679.7391619,1.1938391253352e-06,1.1937227100134e-06 diff --git a/test/tests/concrete_anisotropic_eigenstrain/gold/concrete_expansion_load_50_out.csv b/test/tests/concrete_anisotropic_eigenstrain/gold/concrete_expansion_load_50_out.csv new file mode 100644 index 00000000..d4fe60c0 --- /dev/null +++ b/test/tests/concrete_anisotropic_eigenstrain/gold/concrete_expansion_load_50_out.csv @@ -0,0 +1,13 @@ +time,expansion_strain_xx,expansion_strain_yy,expansion_strain_zz,expansion_vol_strain,strain_xx,strain_yy,strain_zz,stress_xx,stress_yy,stress_zz +0,0,0,0,0,0,0,0,0,0,0 +0.0001,0,0,0,0,-0.0016655568500029,0.00033311137000059,0.00033311137000059,-49966705.500088,1.1641532182693e-09,1.3969838619232e-09 +0.0002,4.0407154020135e-37,5e-05,5e-05,0.0001,-0.0016653904730541,0.00038307809461086,0.00038307809461086,-49961714.191624,1.1996598914266e-06,1.2002419680357e-06 +0.0003,8.8894966257367e-37,0.0001,0.0001,0.0002,-0.0016652241210173,0.00043304482420349,0.00043304482420349,-49956723.630519,1.1994270607829e-06,1.1990778148174e-06 +0.0004,3.5254263760279e-36,0.00015,0.00015,0.0003,-0.0016650577938874,0.00048301155877751,0.00048301155877751,-49951733.816622,1.2001255527139e-06,1.200707629323e-06 +0.0005,4.3078694856466e-36,0.0002,0.0002,0.0004,-0.0016648914916595,0.00053297829833194,0.00053297829833194,-49946744.749786,1.1991360224783e-06,1.1972151696682e-06 +0.0006,5.0447289533329e-36,0.00025,0.00025,0.0005,-0.0016647252143287,0.00058294504286576,0.00058294504286576,-49941756.42986,1.2006494216621e-06,1.2002419680357e-06 +0.0007,6.0356005287523e-36,0.0003,0.0003,0.0006,-0.0016645589618899,0.000632911792378,0.000632911792378,-49936768.856696,1.2008240446448e-06,1.1993106454611e-06 +0.0008,7.1415772009698e-36,0.00035,0.00035,0.0007,-0.0016643927343382,0.00068287854686766,0.00068287854686766,-49931782.030144,1.2018135748804e-06,1.2016389518976e-06 +0.0009,7.9626511844921e-36,0.0004,0.0004,0.0008,-0.0016642265316686,0.00073284530633375,0.00073284530633375,-49926795.950057,1.1936645023525e-06,1.1934898793697e-06 +0.001,8.7016754749121e-36,0.00045,0.00045,0.0009,-0.0016640603538762,0.00078281207077527,0.00078281207077527,-49921810.616285,1.1992524378002e-06,1.1960510164499e-06 +0.0011,9.8374790946429e-36,0.0005,0.0005,0.001,-0.001663894200956,0.00083277884019123,0.00083277884019123,-49916826.028679,1.2004747986794e-06,1.1988449841738e-06 diff --git a/test/tests/concrete_anisotropic_eigenstrain/tests b/test/tests/concrete_anisotropic_eigenstrain/tests index ca6b002f..9ec06919 100644 --- a/test/tests/concrete_anisotropic_eigenstrain/tests +++ b/test/tests/concrete_anisotropic_eigenstrain/tests @@ -12,73 +12,126 @@ input = 'concrete_anisotropic_eigenstrain.i' csvdiff = 'concrete_free_expansion_out.csv' abs_zero = 1e-5 - cli_args = 'Outputs/file_base=concrete_free_expansion_out' + cli_args = 'Materials/concrete_expansion/compressive_strength=30e6 + Materials/concrete_expansion/tensile_strength=3e6 + Materials/concrete_expansion/expansion_stress_limit=10e6 + Outputs/file_base=concrete_free_expansion_out' allow_test_objects = True detail = 'under free expansion conditions, ' [] - [concrete_expansion_load_5] type = 'CSVDiff' input = 'concrete_anisotropic_eigenstrain.i' csvdiff = 'concrete_expansion_load_5_out.csv' abs_zero = 1e-5 - cli_args = 'BCs/load_x/value=-5e6 Outputs/file_base=concrete_expansion_load_5_out' + cli_args = 'Materials/concrete_expansion/compressive_strength=30e6 + Materials/concrete_expansion/tensile_strength=3e6 + Materials/concrete_expansion/expansion_stress_limit=10e6 + BCs/load_x/value=-5e6 + Outputs/file_base=concrete_expansion_load_5_out' allow_test_objects = True detail = 'with a 5 MPa compressive pressure in the x direction, ' [] - - [concrete_expansion_load_10] + [concrete_expansion_load_50] type = 'CSVDiff' input = 'concrete_anisotropic_eigenstrain.i' - csvdiff = 'concrete_expansion_load_10_out.csv' + csvdiff = 'concrete_expansion_load_50_out.csv' abs_zero = 1e-5 - cli_args = 'BCs/load_x/value=-10e6 Outputs/file_base=concrete_expansion_load_10_out' + cli_args = 'Materials/concrete_expansion/compressive_strength=30e6 + Materials/concrete_expansion/tensile_strength=3e6 + Materials/concrete_expansion/expansion_stress_limit=10e6 + BCs/load_x/value=-50e6 + Outputs/file_base=concrete_expansion_load_50_out' allow_test_objects = True - detail = 'with a 10 MPa compressive pressure in the x direction, ' + detail = 'with a 50 MPa compressive pressure in the x direction, ' [] - [concrete_expansion_load_5_5] type = 'CSVDiff' input = 'concrete_anisotropic_eigenstrain.i' csvdiff = 'concrete_expansion_load_5_5_out.csv' abs_zero = 1e-5 - cli_args = 'BCs/load_x/value=-5e6 BCs/load_y/value=-5e6 ' - 'Outputs/file_base=concrete_expansion_load_5_5_out' + cli_args = 'Materials/concrete_expansion/compressive_strength=30e6 + Materials/concrete_expansion/tensile_strength=3e6 + Materials/concrete_expansion/expansion_stress_limit=10e6 + BCs/load_x/value=-5e6 + BCs/load_y/value=-5e6 + Outputs/file_base=concrete_expansion_load_5_5_out' allow_test_objects = True detail = 'with 5 MPa compressive pressure in the x and y directions, ' [] - [concrete_expansion_load_10_10] type = 'CSVDiff' input = 'concrete_anisotropic_eigenstrain.i' csvdiff = 'concrete_expansion_load_10_10_out.csv' abs_zero = 1e-6 - cli_args = 'BCs/load_x/value=-10e6 BCs/load_y/value=-10e6 ' - 'Outputs/file_base=concrete_expansion_load_10_10_out' + cli_args = 'Materials/concrete_expansion/compressive_strength=30e6 + Materials/concrete_expansion/tensile_strength=3e6 + Materials/concrete_expansion/expansion_stress_limit=10e6 + BCs/load_x/value=-10e6 + BCs/load_y/value=-10e6 + Outputs/file_base=concrete_expansion_load_10_10_out' allow_test_objects = True detail = 'with 10 MPa compressive pressure in the x and y directions, ' [] - [concrete_expansion_load_5_5_5] type = 'CSVDiff' input = 'concrete_anisotropic_eigenstrain.i' csvdiff = 'concrete_expansion_load_5_5_5_out.csv' abs_zero = 1e-6 - cli_args = 'BCs/load_x/value=-5e6 BCs/load_y/value=-5e6 BCs/load_z/value=-5e6 ' - 'Outputs/file_base=concrete_expansion_load_5_5_5_out' + cli_args = 'Materials/concrete_expansion/compressive_strength=30e6 + Materials/concrete_expansion/tensile_strength=3e6 + Materials/concrete_expansion/expansion_stress_limit=10e6 + BCs/load_x/value=-5e6 + BCs/load_y/value=-5e6 + BCs/load_z/value=-5e6 + Outputs/file_base=concrete_expansion_load_5_5_5_out' allow_test_objects = True detail = 'with 5 MPa compressive pressure in the x, y, and z directions, ' [] - [concrete_expansion_load_10_10_10] type = 'CSVDiff' input = 'concrete_anisotropic_eigenstrain.i' csvdiff = 'concrete_expansion_load_10_10_10_out.csv' abs_zero = 1e-6 - cli_args = 'BCs/load_x/value=-10e6 BCs/load_y/value=-10e6 BCs/load_z/value=-10e6 ' - 'Outputs/file_base=concrete_expansion_load_10_10_10_out' + cli_args = 'Materials/concrete_expansion/compressive_strength=30e6 + Materials/concrete_expansion/tensile_strength=3e6 + Materials/concrete_expansion/expansion_stress_limit=10e6 + BCs/load_x/value=-10e6 + BCs/load_y/value=-10e6 + BCs/load_z/value=-10e6 + Outputs/file_base=concrete_expansion_load_10_10_10_out' allow_test_objects = True detail = 'and with 10 MPa compressive pressure in the x, y, and z directions.' [] [] + [error_message_check] + requirement = 'Blackbear shall produce an error message when parameter(s) required for the anisotropic expansion_type are not set by user:' + [compressive_strength] + type = 'RunException' + input = 'concrete_anisotropic_eigenstrain.i' + cli_args = 'Materials/concrete_expansion/tensile_strength=3e6 + Materials/concrete_expansion/expansion_stress_limit=10e6' + expect_err = "parameter is required for expansion_type = Anisotropic" + allow_test_objects = True + detail = "Anisotropic expansion_type shall generate error if compressive_strength is not set by user." + [] + [expansion_stress_limit] + type = 'RunException' + input = 'concrete_anisotropic_eigenstrain.i' + cli_args = 'Materials/concrete_expansion/compressive_strength=30e6 + Materials/concrete_expansion/tensile_strength=3e6' + expect_err = "parameter is required for expansion_type = Anisotropic" + allow_test_objects = True + detail = "Anisotropic expansion_type shall generate error if expansion_stress_limit is not set by user." + [] + [tensile_strength] + type = 'RunException' + input = 'concrete_anisotropic_eigenstrain.i' + cli_args = 'Materials/concrete_expansion/compressive_strength=30e6 + Materials/concrete_expansion/expansion_stress_limit=10e6' + expect_err = "parameter is required for expansion_type = Anisotropic" + allow_test_objects = True + detail = "Anisotropic expansion_type shall generate error if tensile_strength is not set by user." + [] + [] []