diff --git a/test/tests/concrete_ASR_validation/asr_validation.i b/test/tests/concrete_ASR_validation/asr_validation.i index 5edac7d7..7e58b61d 100644 --- a/test/tests/concrete_ASR_validation/asr_validation.i +++ b/test/tests/concrete_ASR_validation/asr_validation.i @@ -160,7 +160,7 @@ [Functions] [./strain_function] type = ParsedFunction - value = 1.24e-3*(1-exp(-t/86400/8.68))/(1+exp((8.68-t/86400)/16.22)) + expression = 1.24e-3*(1-exp(-t/86400/8.68))/(1+exp((8.68-t/86400)/16.22)) [../] [] diff --git a/test/tests/concrete_anisotropic_eigenstrain/concrete_anisotropic_eigenstrain.i b/test/tests/concrete_anisotropic_eigenstrain/concrete_anisotropic_eigenstrain.i index a0c8f19d..4bda446d 100644 --- a/test/tests/concrete_anisotropic_eigenstrain/concrete_anisotropic_eigenstrain.i +++ b/test/tests/concrete_anisotropic_eigenstrain/concrete_anisotropic_eigenstrain.i @@ -63,7 +63,7 @@ [Functions] [./expansion_vs_time] type = ParsedFunction - value = 'max(0, t - 0.0001)' + expression = 'max(0, t - 0.0001)' [../] [] diff --git a/test/tests/concrete_expansion_microcracking/concrete_expansion_microcracking.i b/test/tests/concrete_expansion_microcracking/concrete_expansion_microcracking.i index a3625e00..bfd40bac 100644 --- a/test/tests/concrete_expansion_microcracking/concrete_expansion_microcracking.i +++ b/test/tests/concrete_expansion_microcracking/concrete_expansion_microcracking.i @@ -71,7 +71,7 @@ [Functions] [./expansion_vs_time] type = ParsedFunction - value = 'max(0, t - 0.0001)' + expression = 'max(0, t - 0.0001)' [../] [] diff --git a/test/tests/concrete_expansion_microcracking/tests b/test/tests/concrete_expansion_microcracking/tests index 54ab47bd..9e9931c0 100644 --- a/test/tests/concrete_expansion_microcracking/tests +++ b/test/tests/concrete_expansion_microcracking/tests @@ -21,7 +21,7 @@ input = 'concrete_expansion_microcracking.i' csvdiff = 'concrete_expansion_microcracking_shrinkage_out.csv' abs_zero = 1e-5 - cli_args = 'Functions/expansion_vs_time/value="-max(0, t - 0.0001)" ' + cli_args = 'Functions/expansion_vs_time/expression="-max(0, t - 0.0001)" ' 'Materials/microcracking/expansion_stress_limit=10e6 ' 'Materials/microcracking/eigenstrain_factor=-1.0 ' 'Outputs/file_base=concrete_expansion_microcracking_shrinkage_out' diff --git a/test/tests/concrete_logcreep/concrete_logcreep_humidity.i b/test/tests/concrete_logcreep/concrete_logcreep_humidity.i index a170e7a7..7f1f344f 100644 --- a/test/tests/concrete_logcreep/concrete_logcreep_humidity.i +++ b/test/tests/concrete_logcreep/concrete_logcreep_humidity.i @@ -32,7 +32,7 @@ [Functions] [./humidity_function] type = ParsedFunction - value = 0.5 + expression = 0.5 [../] [] diff --git a/test/tests/concrete_logcreep/concrete_logcreep_temp.i b/test/tests/concrete_logcreep/concrete_logcreep_temp.i index f1b787e3..83fa6ce3 100644 --- a/test/tests/concrete_logcreep/concrete_logcreep_temp.i +++ b/test/tests/concrete_logcreep/concrete_logcreep_temp.i @@ -34,7 +34,7 @@ [Functions] [./temp_function] type = ParsedFunction - value = 60 + expression = 60 [../] [] diff --git a/test/tests/mazars_damage/mazars.i b/test/tests/mazars_damage/mazars.i index afad211b..7902fe8f 100644 --- a/test/tests/mazars_damage/mazars.i +++ b/test/tests/mazars_damage/mazars.i @@ -94,11 +94,11 @@ [Functions] [push] type = ParsedFunction - value = '-t' + expression = '-t' [] [pull] type = ParsedFunction - value = 't' + expression = 't' [] [] diff --git a/test/tests/neml_lagrangian_jacobian/jactest.i b/test/tests/neml_lagrangian_jacobian/jactest.i index 0f81ac02..82ed3759 100644 --- a/test/tests/neml_lagrangian_jacobian/jactest.i +++ b/test/tests/neml_lagrangian_jacobian/jactest.i @@ -55,15 +55,15 @@ [Functions] [pullx] type = ParsedFunction - value = '4000 * t' + expression = '4000 * t' [] [pully] type = ParsedFunction - value = '-2000 * t' + expression = '-2000 * t' [] [pullz] type = ParsedFunction - value = '3000 * t' + expression = '3000 * t' [] [] diff --git a/test/tests/neml_regression/neml_regression.i b/test/tests/neml_regression/neml_regression.i index 8ae2a1c4..d6678723 100644 --- a/test/tests/neml_regression/neml_regression.i +++ b/test/tests/neml_regression/neml_regression.i @@ -124,21 +124,21 @@ [] [u_x] type = ParsedFunction - vars = 'strain_xx strain_xy strain_xz' - vals = 'strain_xx strain_xy strain_xz' - value = 'x*strain_xx + 1/sqrt(2)*y*strain_xy + 1/sqrt(2)*z*strain_xz' + symbol_names = 'strain_xx strain_xy strain_xz' + symbol_values = 'strain_xx strain_xy strain_xz' + expression = 'x*strain_xx + 1/sqrt(2)*y*strain_xy + 1/sqrt(2)*z*strain_xz' [] [u_y] type = ParsedFunction - vars = 'strain_yy strain_xy strain_yz' - vals = 'strain_yy strain_xy strain_yz' - value = 'y*strain_yy + 1/sqrt(2)*x*strain_xy + 1/sqrt(2)*z*strain_yz' + symbol_names = 'strain_yy strain_xy strain_yz' + symbol_values = 'strain_yy strain_xy strain_yz' + expression = 'y*strain_yy + 1/sqrt(2)*x*strain_xy + 1/sqrt(2)*z*strain_yz' [] [u_z] type = ParsedFunction - vars = 'strain_zz strain_xz strain_yz' - vals = 'strain_zz strain_xz strain_yz' - value = 'z*strain_zz + 1/sqrt(2)*x*strain_xz + 1/sqrt(2)*y*strain_yz' + symbol_names = 'strain_zz strain_xz strain_yz' + symbol_values = 'strain_zz strain_xz strain_yz' + expression = 'z*strain_zz + 1/sqrt(2)*x*strain_xz + 1/sqrt(2)*y*strain_yz' [] [] diff --git a/test/tests/neml_regression_lagrangian/neml_regression.i b/test/tests/neml_regression_lagrangian/neml_regression.i index a9180420..51679d99 100644 --- a/test/tests/neml_regression_lagrangian/neml_regression.i +++ b/test/tests/neml_regression_lagrangian/neml_regression.i @@ -128,21 +128,21 @@ [] [u_x] type = ParsedFunction - vars = 'strain_xx strain_xy strain_xz' - vals = 'strain_xx strain_xy strain_xz' - value = 'x*strain_xx + 1/sqrt(2)*y*strain_xy + 1/sqrt(2)*z*strain_xz' + symbol_names = 'strain_xx strain_xy strain_xz' + symbol_values = 'strain_xx strain_xy strain_xz' + expression = 'x*strain_xx + 1/sqrt(2)*y*strain_xy + 1/sqrt(2)*z*strain_xz' [] [u_y] type = ParsedFunction - vars = 'strain_yy strain_xy strain_yz' - vals = 'strain_yy strain_xy strain_yz' - value = 'y*strain_yy + 1/sqrt(2)*x*strain_xy + 1/sqrt(2)*z*strain_yz' + symbol_names = 'strain_yy strain_xy strain_yz' + symbol_values = 'strain_yy strain_xy strain_yz' + expression = 'y*strain_yy + 1/sqrt(2)*x*strain_xy + 1/sqrt(2)*z*strain_yz' [] [u_z] type = ParsedFunction - vars = 'strain_zz strain_xz strain_yz' - vals = 'strain_zz strain_xz strain_yz' - value = 'z*strain_zz + 1/sqrt(2)*x*strain_xz + 1/sqrt(2)*y*strain_yz' + symbol_names = 'strain_zz strain_xz strain_yz' + symbol_values = 'strain_zz strain_xz strain_yz' + expression = 'z*strain_zz + 1/sqrt(2)*x*strain_xz + 1/sqrt(2)*y*strain_yz' [] [] diff --git a/test/tests/steel_creep_damage_oh/ad_steel_creep_damage.i b/test/tests/steel_creep_damage_oh/ad_steel_creep_damage.i index 4d2af940..6c3b1ca1 100644 --- a/test/tests/steel_creep_damage_oh/ad_steel_creep_damage.i +++ b/test/tests/steel_creep_damage_oh/ad_steel_creep_damage.i @@ -112,7 +112,7 @@ [Functions] [pull] type = ParsedFunction - value = '5*t' + expression = '5*t' [] [] diff --git a/test/tests/steel_creep_damage_oh/ad_steel_creep_damage_2d.i b/test/tests/steel_creep_damage_oh/ad_steel_creep_damage_2d.i index 4b61c7ec..db1ac1be 100644 --- a/test/tests/steel_creep_damage_oh/ad_steel_creep_damage_2d.i +++ b/test/tests/steel_creep_damage_oh/ad_steel_creep_damage_2d.i @@ -105,7 +105,7 @@ [Functions] [pull] type = ParsedFunction - value = '5*t' + expression = '5*t' [] [] diff --git a/test/tests/steel_creep_damage_oh/steel_creep_damage.i b/test/tests/steel_creep_damage_oh/steel_creep_damage.i index ed4eaef5..c4ef0805 100644 --- a/test/tests/steel_creep_damage_oh/steel_creep_damage.i +++ b/test/tests/steel_creep_damage_oh/steel_creep_damage.i @@ -111,7 +111,7 @@ [Functions] [pull] type = ParsedFunction - value = '5*t' + expression = '5*t' [] [] diff --git a/test/tests/steel_creep_damage_oh/steel_creep_damage_2d.i b/test/tests/steel_creep_damage_oh/steel_creep_damage_2d.i index c1c3b5b5..6bb7f219 100644 --- a/test/tests/steel_creep_damage_oh/steel_creep_damage_2d.i +++ b/test/tests/steel_creep_damage_oh/steel_creep_damage_2d.i @@ -104,7 +104,7 @@ [Functions] [pull] type = ParsedFunction - value = '5*t' + expression = '5*t' [] []