Mercurial > fem-fenics-eugenio
diff src/expression.h @ 173:9e944b0d0fc8
Some Formatting improvements (?)
author | gedeone-octave <marcovass89@hotmail.it> |
---|---|
date | Sat, 12 Oct 2013 16:06:00 +0100 |
parents | 5fe2a157f4eb |
children |
line wrap: on
line diff
--- a/src/expression.h Mon Oct 07 21:52:17 2013 +0200 +++ b/src/expression.h Sat Oct 12 16:06:00 2013 +0100 @@ -30,29 +30,32 @@ { public: - expression() : dolfin::Expression() {} + expression() + : dolfin::Expression() {} - expression (octave_fcn_handle & _f) : - dolfin::Expression (), f (new octave_fcn_handle (_f)) {} + expression (octave_fcn_handle & _f) + : dolfin::Expression (), f (new octave_fcn_handle (_f)) {} - expression (octave_fcn_handle & _f, std::size_t _n) : - dolfin::Expression (_n), f (new octave_fcn_handle (_f)) {} + expression (octave_fcn_handle & _f, + std::size_t _n) + : dolfin::Expression (_n), f (new octave_fcn_handle (_f)) {} ~expression (void) { delete f; } + void + eval (dolfin::Array<double>& values, + const dolfin::Array<double>& x) const + { + octave_value_list b; + b.resize (x.size ()); + for (std::size_t i = 0; i < x.size (); ++i) + b(i) = x[i]; + octave_value_list tmp = feval (f->function_value (), b); + Array<double> res = tmp(0).array_value (); - void eval (dolfin::Array<double>& values, const dolfin::Array<double>& x) const - { - octave_value_list b; - b.resize (x.size ()); - for (std::size_t i = 0; i < x.size (); ++i) - b(i) = x[i]; - octave_value_list tmp = feval (f->function_value (), b); - Array<double> res = tmp(0).array_value (); - - for (std::size_t i = 0; i < values.size (); ++i) - values[i] = res(i); - } + for (std::size_t i = 0; i < values.size (); ++i) + values[i] = res(i); + } private: octave_fcn_handle * f;