Skip to content

Update test input files to use ParsedFunction's expression param #295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 7, 2025
Merged

Update test input files to use ParsedFunction's expression param #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions test/tests/accelerations/Acceleration_By_Shooting_Method.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,15 +589,15 @@ dom0Scale=25.4e-3
[Functions]
[potential_bc_func]
type = ParsedFunction
value = '0.100*sin(2*pi*13.56e6*t)'
expression = '0.100*sin(2*pi*13.56e6*t)'
[]
[density_ic_func]
type = ParsedFunction
value = 'log((1e13 + 1e15 * (1-x/(1.0))^2 * (x/(1.0))^2)/6.02e23)'
expression = 'log((1e13 + 1e15 * (1-x/(1.0))^2 * (x/(1.0))^2)/6.02e23)'
[]
[energy_density_ic_func]
type = ParsedFunction
value = 'log(32.) + log((1e13 + 1e15 * (1-x/(1.0))^2 * (x/(1.0))^2)/6.02e23)'
expression = 'log(32.) + log((1e13 + 1e15 * (1-x/(1.0))^2 * (x/(1.0))^2)/6.02e23)'
[]
[]

Expand Down
40 changes: 20 additions & 20 deletions test/tests/mms/bcs/1D_LymberopoulosElectronBC.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,14 +160,14 @@
type = ParsedFunction
vars = 'diffem'
vals = 'diffem'
value = 'diffem'
expression = 'diffem'
[]
#Ion mobility coeff.
[muion]
type = ParsedFunction
vars = 'muem'
vals = 'muem'
value = 'muem'
expression = 'muem'
[]
[N_A]
type = ConstantFunction
Expand All @@ -189,21 +189,21 @@
type = ParsedFunction
vars = 'l f N_A'
vals = 'l f N_A'
value = 'log(((sin(2.*pi*f*t) + 2.) * ((x/l)*(1. - x/l) + 1.)) / N_A)'
expression = 'log(((sin(2.*pi*f*t) + 2.) * ((x/l)*(1. - x/l) + 1.)) / N_A)'
[]
#The manufactured ion density solution
[ion_fun]
type = ParsedFunction
vars = 'em_fun'
vals = 'em_fun'
value = 'em_fun'
expression = 'em_fun'
[]
#The manufactured electron density solution
[potential_fun]
type = ParsedFunction
vars = 'l f'
vals = 'l f'
value = '-sin(2.*pi*f*t)*(x/l)^2. + (x/l)^2.'
expression = '-sin(2.*pi*f*t)*(x/l)^2. + (x/l)^2.'
[]

#Source Terms in moles
Expand All @@ -212,75 +212,75 @@
type = ParsedFunction
vars = 'l f diffem muem N_A'
vals = 'l f diffem muem N_A'
value = '((2.*diffem*(sin(2.*pi*f*t) + 2.))/l^2. + (2.*f*pi*cos(2.*pi*f*t)*(l^2. + l*x - x^2.))/l^2. -
(2.*muem*(sin(2.*pi*f*t) - 1.)*(sin(2.*pi*f*t) + 2.)*(l^2. + l*x - x^2.))/l^4. -
(2.*muem*x*(sin(2.*pi*f*t) - 1.)*(sin(2.*pi*f*t) + 2.)*(l - 2.*x))/l^4.) / N_A'
expression = '((2.*diffem*(sin(2.*pi*f*t) + 2.))/l^2. + (2.*f*pi*cos(2.*pi*f*t)*(l^2. + l*x - x^2.))/l^2. -
(2.*muem*(sin(2.*pi*f*t) - 1.)*(sin(2.*pi*f*t) + 2.)*(l^2. + l*x - x^2.))/l^4. -
(2.*muem*x*(sin(2.*pi*f*t) - 1.)*(sin(2.*pi*f*t) + 2.)*(l - 2.*x))/l^4.) / N_A'
[]
[ion_source]
type = ParsedFunction
vars = 'l f diffion muion N_A'
vals = 'l f diffion muion N_A'
value = '((2.*diffion*(sin(2.*pi*f*t) + 2.))/l^2. + (2.*f*pi*cos(2.*pi*f*t)*(l^2. + l*x - x^2.))/l^2. +
(2.*muion*(sin(2.*pi*f*t) - 1.)*(sin(2.*pi*f*t) + 2.)*(l^2. + l*x - x^2.))/l^4. +
(2.*muion*x*(sin(2.*pi*f*t) - 1.)*(sin(2.*pi*f*t) + 2.)*(l - 2.*x))/l^4.) / N_A'
expression = '((2.*diffion*(sin(2.*pi*f*t) + 2.))/l^2. + (2.*f*pi*cos(2.*pi*f*t)*(l^2. + l*x - x^2.))/l^2. +
(2.*muion*(sin(2.*pi*f*t) - 1.)*(sin(2.*pi*f*t) + 2.)*(l^2. + l*x - x^2.))/l^4. +
(2.*muion*x*(sin(2.*pi*f*t) - 1.)*(sin(2.*pi*f*t) + 2.)*(l - 2.*x))/l^4.) / N_A'
[]
[potential_source]
type = ParsedFunction
vars = 'l f'
vals = 'l f'
value = 'sin(2.*pi*f*t)*(2./l^2.) - (2./l^2.)'
expression = 'sin(2.*pi*f*t)*(2./l^2.) - (2./l^2.)'
[]

#The left BC dirichlet function
[em_left_BC]
type = ParsedFunction
vars = 'l f N_A'
vals = 'l f N_A'
value = 'log((sin(2.*pi*f*t) + 2.) / N_A)'
expression = 'log((sin(2.*pi*f*t) + 2.) / N_A)'
[]
[ion_left_BC]
type = ParsedFunction
vars = 'l f N_A'
vals = 'l f N_A'
value = 'log((sin(2.*pi*f*t) + 2.) / N_A)'
expression = 'log((sin(2.*pi*f*t) + 2.) / N_A)'
[]
[potential_left_BC]
type = ParsedFunction
vars = 'N_A'
vals = 'N_A'
value = '0.0'
expression = '0.0'
[]
#The right BC dirichlet function
[em_right_BC]
type = ParsedFunction
vars = 'l f N_A'
vals = 'l f N_A'
value = 'log((sin(2.*pi*f*t) + 2.) / N_A)'
expression = 'log((sin(2.*pi*f*t) + 2.) / N_A)'
[]
[ion_right_BC]
type = ParsedFunction
vars = 'l f N_A'
vals = 'l f N_A'
value = 'log((sin(2.*pi*f*t) + 2.) / N_A)'
expression = 'log((sin(2.*pi*f*t) + 2.) / N_A)'
[]
[potential_right_BC]
type = ParsedFunction
vars = 'f N_A'
vals = 'f N_A'
value = '1. - sin(2.*pi*f*t)'
expression = '1. - sin(2.*pi*f*t)'
[]

[em_ICs]
type = ParsedFunction
vars = 'N_A'
vals = 'N_A'
value = 'log((1.) / N_A)'
expression = 'log((1.) / N_A)'
[]
[ion_ICs]
type = ParsedFunction
vars = 'N_A'
vals = 'N_A'
value = 'log((1.) / N_A)'
expression = 'log((1.) / N_A)'
[]
[]

Expand Down
32 changes: 16 additions & 16 deletions test/tests/mms/bcs/1D_LymberopoulosIonBC.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,14 +149,14 @@
type = ParsedFunction
vars = 'l N_A'
vals = 'l N_A'
value = 'log((1.0 + x^2*(1 - x/l)^2/l^2) / N_A)'
expression = 'log((1.0 + x^2*(1 - x/l)^2/l^2) / N_A)'
[]
#The manufactured electron density solution
[potential_fun]
type = ParsedFunction
vars = 'l f ee diffpotential'
vals = 'l f ee diffpotential'
value = '-(ee*l^2*sin((pi*x)/l)*sin(2*pi*f*t))/(5*diffpotential*pi^2)'
expression = '-(ee*l^2*sin((pi*x)/l)*sin(2*pi*f*t))/(5*diffpotential*pi^2)'
[]

#Source Terms in moles
Expand All @@ -165,44 +165,44 @@
type = ParsedFunction
vars = 'l f ee diffpotential diffion muion N_A'
vals = 'l f ee diffpotential diffion muion N_A'
value = '(-2*diffion/l^2 +
12*diffion*x/l^3 -
12*diffion*x^2/l^4 -
0.2*ee*muion*sin(2*pi*f*t)*sin(pi*x/l)/diffpotential +
2*ee*muion*x*sin(2*pi*f*t)*cos(pi*x/l)/(5*pi*diffpotential*l) -
ee*muion*x^2*sin(2*pi*f*t)*sin(pi*x/l)/(5*diffpotential*l^2) -
6*ee*muion*x^2*sin(2*pi*f*t)*cos(pi*x/l)/(5*pi*diffpotential*l^2) +
2*ee*muion*x^3*sin(2*pi*f*t)*sin(pi*x/l)/(5*diffpotential*l^3) +
4*ee*muion*x^3*sin(2*pi*f*t)*cos(pi*x/l)/(5*pi*diffpotential*l^3) -
ee*muion*x^4*sin(2*pi*f*t)*sin(pi*x/l)/(5*diffpotential*l^4)) / N_A'
expression = '(-2*diffion/l^2 +
12*diffion*x/l^3 -
12*diffion*x^2/l^4 -
0.2*ee*muion*sin(2*pi*f*t)*sin(pi*x/l)/diffpotential +
2*ee*muion*x*sin(2*pi*f*t)*cos(pi*x/l)/(5*pi*diffpotential*l) -
ee*muion*x^2*sin(2*pi*f*t)*sin(pi*x/l)/(5*diffpotential*l^2) -
6*ee*muion*x^2*sin(2*pi*f*t)*cos(pi*x/l)/(5*pi*diffpotential*l^2) +
2*ee*muion*x^3*sin(2*pi*f*t)*sin(pi*x/l)/(5*diffpotential*l^3) +
4*ee*muion*x^3*sin(2*pi*f*t)*cos(pi*x/l)/(5*pi*diffpotential*l^3) -
ee*muion*x^4*sin(2*pi*f*t)*sin(pi*x/l)/(5*diffpotential*l^4)) / N_A'
[]
[potential_source]
type = ParsedFunction
vars = 'l f ee diffpotential'
vals = 'l f ee diffpotential'
value = '-ee*sin(2*pi*f*t)*sin(pi*x/l)/5 - 2*ee*f*l^2*sin(pi*x/l)*cos(2*pi*f*t)/(5*pi*diffpotential)'
expression = '-ee*sin(2*pi*f*t)*sin(pi*x/l)/5 - 2*ee*f*l^2*sin(pi*x/l)*cos(2*pi*f*t)/(5*pi*diffpotential)'
[]

#The left Flux BC function
[ion_left_Flux_BC]
type = ParsedFunction
vars = 'l f ee diffpotential muion N_A'
vals = 'l f ee diffpotential muion N_A'
value = '(0.2*ee*l*muion*sin(2*pi*f*t)/(pi*diffpotential)) / N_A'
expression = '(0.2*ee*l*muion*sin(2*pi*f*t)/(pi*diffpotential)) / N_A'
[]
#The right Flux BC function
[ion_right_Flux_BC]
type = ParsedFunction
vars = 'l f ee diffpotential muion N_A'
vals = 'l f ee diffpotential muion N_A'
value = '-1.0 * (-0.2*ee*l*muion*sin(2*pi*f*t)/(pi*diffpotential)) / N_A'
expression = '-1.0 * (-0.2*ee*l*muion*sin(2*pi*f*t)/(pi*diffpotential)) / N_A'
[]

[ion_ICs]
type = ParsedFunction
vars = 'N_A'
vals = 'N_A'
value = '(1.) / N_A'
expression = '(1.) / N_A'
[]
[]

Expand Down
Loading