mulimoen
/
SummationByParts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow mutable contexts for evalexpr strings 

These may be slow when used as boundary conditions, but produces results
consistent with the special "vortex" type for the example.
This commit is contained in:
Magnus Ulimoen 2021-06-29 23:12:48 +02:00
parent ea90bb8655
commit 92ad7bc580
3 changed files with 51 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
multigrid/examples/expressions_vortex.json
View File

@ -18,10 +18,10 @@
"initial_conditions": {
"expressions": {
"globals": "uinf=1;vinf=0;beta=5;y0=0;x0=0;Tfactor=(GAMMA-1)*beta*beta/(8*GAMMA*PI*PI)",
"rho": "math::pow(1 - Tfactor*math::exp(1 - ((x-x0)*(x-x0) + (y-y0)*(y-y0))), 1.0/(GAMMA - 1))",
"u": "uinf + beta/(2*PI) * math::exp((1 - ((x-x0)*(x-x0) + (y-y0)*(y-y0)))/2)*(-(y-y0))",
"v": "vinf + beta/(2*PI) * math::exp((1 - ((x-x0)*(x-x0) + (y-y0)*(y-y0)))/2)*((x-x0))",
"globals": "uinf=1;vinf=1;beta=5;y00=0;x00=0;Tfactor=(GAMMA-1)*beta*beta/(8*GAMMA*PI*PI)",
"rho": "x0=x00+uinf*t;y0=y00+vinf*t; math::pow(1 - Tfactor*math::exp(1 - ((x-x0)*(x-x0) + (y-y0)*(y-y0))), 1.0/(GAMMA - 1))",
"u": "x0=x00+uinf*t;y0=y00+vinf*t; uinf + beta/(2*PI) * math::exp((1 - ((x-x0)*(x-x0) + (y-y0)*(y-y0)))/2)*(-(y-y0))",
"v": "x0=x00+uinf*t;y0=y00+vinf*t; vinf + beta/(2*PI) * math::exp((1 - ((x-x0)*(x-x0) + (y-y0)*(y-y0)))/2)*((x-x0))",
"p": "math::pow(rho, GAMMA)"
}
},

55
multigrid/src/eval.rs
View File

@ -57,6 +57,7 @@ struct ContextWrapper<'a> {
v: Option<Value>,
rhou: Option<Value>,
rhov: Option<Value>,
id: std::collections::HashMap<String, Value>,
}
impl<'a> ContextWrapper<'a> {
@ -71,6 +72,7 @@ impl<'a> ContextWrapper<'a> {
rhov: None,
u: None,
v: None,
id: std::collections::HashMap::new(),
}
}
}
@ -86,7 +88,7 @@ impl Context for ContextWrapper<'_> {
"rhov" => self.rhov.as_ref(),
"u" => self.u.as_ref(),
"v" => self.v.as_ref(),
id => self.ctx.get_value(id),
id => self.id.get(id).or_else(|| self.ctx.get_value(id)),
}
}
@ -95,6 +97,13 @@ impl Context for ContextWrapper<'_> {
}
}
impl ContextWithMutableVariables for ContextWrapper<'_> {
fn set_value(&mut self, identifier: String, value: Value) -> EvalexprResult<()> {
self.id.insert(identifier, value);
Ok(())
}
}
impl<D: Dimension> euler::eval::Evaluator<D> for EvaluatorConservation {
fn evaluate(
&self,
@ -112,7 +121,7 @@ impl<D: Dimension> euler::eval::Evaluator<D> for EvaluatorConservation {
ctx.x = Some(x.into());
ctx.y = Some(y.into());
*rho = self.rho.eval_number_with_context(&ctx).unwrap();
*rho = self.rho.eval_number_with_context_mut(&mut ctx).unwrap();
});
azip!((&x in &x, &y in &y, &rho in &rho, rhou in &mut rhou) {
@ -120,7 +129,7 @@ impl<D: Dimension> euler::eval::Evaluator<D> for EvaluatorConservation {
ctx.y = Some(y.into());
ctx.rho = Some(rho.into());
*rhou = self.rhou.eval_number_with_context(&ctx).unwrap();
*rhou = self.rhou.eval_number_with_context_mut(&mut ctx).unwrap();
});
azip!((&x in &x, &y in &y, &rho in &rho, rhov in &mut rhov) {
@ -128,7 +137,7 @@ impl<D: Dimension> euler::eval::Evaluator<D> for EvaluatorConservation {
ctx.y = Some(y.into());
ctx.rho = Some(rho.into());
*rhov = self.rhov.eval_number_with_context(&ctx).unwrap();
*rhov = self.rhov.eval_number_with_context_mut(&mut ctx).unwrap();
});
azip!((&x in &x, &y in &y, &rho in &rho, &rhou in &rhou, &rhov in &rhov, e in &mut e) {
@ -138,7 +147,7 @@ impl<D: Dimension> euler::eval::Evaluator<D> for EvaluatorConservation {
ctx.rhou = Some(rhou.into());
ctx.rhov = Some(rhov.into());
*e = self.e.eval_number_with_context(&ctx).unwrap();
*e = self.e.eval_number_with_context_mut(&mut ctx).unwrap();
});
}
}
@ -157,7 +166,7 @@ impl<D: Dimension> euler::eval::EvaluatorPressure<D> for EvaluatorPressure {
ctx.x = Some(x.into());
ctx.y = Some(y.into());
*rho = self.rho.eval_number_with_context(&ctx).unwrap();
*rho = self.rho.eval_number_with_context_mut(&mut ctx).unwrap();
})
}
@ -176,7 +185,7 @@ impl<D: Dimension> euler::eval::EvaluatorPressure<D> for EvaluatorPressure {
ctx.y = Some(y.into());
ctx.rho = Some(rho.into());
*u = self.u.eval_number_with_context(&ctx).unwrap();
*u = self.u.eval_number_with_context_mut(&mut ctx).unwrap();
})
}
fn v(
@ -194,7 +203,7 @@ impl<D: Dimension> euler::eval::EvaluatorPressure<D> for EvaluatorPressure {
ctx.y = Some(y.into());
ctx.rho = Some(rho.into());
*v = self.v.eval_number_with_context(&ctx).unwrap();
*v = self.v.eval_number_with_context_mut(&mut ctx).unwrap();
})
}
@ -217,7 +226,7 @@ impl<D: Dimension> euler::eval::EvaluatorPressure<D> for EvaluatorPressure {
ctx.u = Some(u.into());
ctx.v = Some(v.into());
*p = self.p.eval_number_with_context(&ctx).unwrap();
*p = self.p.eval_number_with_context_mut(&mut ctx).unwrap();
})
}
}
@ -326,5 +335,33 @@ pub fn default_context() -> HashMapContext {
)
.unwrap();
context
.set_function(
"math::exp".into(),
Function::new(|arg| {
let arg = arg.as_number()?;
Ok(arg.exp().into())
}),
)
.unwrap();
context
.set_function(
"math::pow".into(),
Function::new(|arg| {
let arg = arg.as_tuple()?;
if arg.len() != 2 {
return Err(error::EvalexprError::WrongFunctionArgumentAmount {
expected: 2,
actual: arg.len(),
});
}
let s = arg[0].as_number()?;
let o = arg[1].as_number()?;
Ok(s.powf(o).into())
}),
)
.unwrap();
context
}

1
multigrid/src/main.rs
View File

@ -342,6 +342,7 @@ fn main() {
let output = File::create(&opt.output, sys.grids.as_slice(), names).unwrap();
let mut output = OutputThread::new(output);
output.add_timestep(0, &sys.fnow);
let progressbar = progressbar(opt.no_progressbar, ntime);