Skip to content

Commit

Permalink
Merge pull request #332 from bwspenc/deprecated_parsed_function
Browse files Browse the repository at this point in the history
Update tests to remove deprecated ParsedFunction syntax
  • Loading branch information
bwspenc authored Feb 21, 2023
2 parents 5cffd12 + 6070214 commit 8ec98bd
Show file tree
Hide file tree
Showing 14 changed files with 33 additions and 33 deletions.
2 changes: 1 addition & 1 deletion test/tests/concrete_ASR_validation/asr_validation.i
Original file line number Diff line number Diff line change
Expand Up @@ -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))
[../]
[]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
[Functions]
[./expansion_vs_time]
type = ParsedFunction
value = 'max(0, t - 0.0001)'
expression = 'max(0, t - 0.0001)'
[../]
[]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
[Functions]
[./expansion_vs_time]
type = ParsedFunction
value = 'max(0, t - 0.0001)'
expression = 'max(0, t - 0.0001)'
[../]
[]

Expand Down
2 changes: 1 addition & 1 deletion test/tests/concrete_expansion_microcracking/tests
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion test/tests/concrete_logcreep/concrete_logcreep_humidity.i
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
[Functions]
[./humidity_function]
type = ParsedFunction
value = 0.5
expression = 0.5
[../]
[]

Expand Down
2 changes: 1 addition & 1 deletion test/tests/concrete_logcreep/concrete_logcreep_temp.i
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
[Functions]
[./temp_function]
type = ParsedFunction
value = 60
expression = 60
[../]
[]

Expand Down
4 changes: 2 additions & 2 deletions test/tests/mazars_damage/mazars.i
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,11 @@
[Functions]
[push]
type = ParsedFunction
value = '-t'
expression = '-t'
[]
[pull]
type = ParsedFunction
value = 't'
expression = 't'
[]
[]

Expand Down
6 changes: 3 additions & 3 deletions test/tests/neml_lagrangian_jacobian/jactest.i
Original file line number Diff line number Diff line change
Expand Up @@ -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'
[]
[]

Expand Down
18 changes: 9 additions & 9 deletions test/tests/neml_regression/neml_regression.i
Original file line number Diff line number Diff line change
Expand Up @@ -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'
[]
[]

Expand Down
18 changes: 9 additions & 9 deletions test/tests/neml_regression_lagrangian/neml_regression.i
Original file line number Diff line number Diff line change
Expand Up @@ -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'
[]
[]

Expand Down
2 changes: 1 addition & 1 deletion test/tests/steel_creep_damage_oh/ad_steel_creep_damage.i
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
[Functions]
[pull]
type = ParsedFunction
value = '5*t'
expression = '5*t'
[]
[]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
[Functions]
[pull]
type = ParsedFunction
value = '5*t'
expression = '5*t'
[]
[]

Expand Down
2 changes: 1 addition & 1 deletion test/tests/steel_creep_damage_oh/steel_creep_damage.i
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
[Functions]
[pull]
type = ParsedFunction
value = '5*t'
expression = '5*t'
[]
[]

Expand Down
2 changes: 1 addition & 1 deletion test/tests/steel_creep_damage_oh/steel_creep_damage_2d.i
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
[Functions]
[pull]
type = ParsedFunction
value = '5*t'
expression = '5*t'
[]
[]

Expand Down

0 comments on commit 8ec98bd

Please sign in to comment.