Mercurial > fem-fenics-eugenio

annotate src/expression.h @ 173:9e944b0d0fc8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Some Formatting improvements (?)
author gedeone-octave <marcovass89@hotmail.it>
date Sat, 12 Oct 2013 16:06:00 +0100
parents 5fe2a157f4eb
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
22
17bad8351f4d New class derived from dolfin::Expression
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
1 /*
151
5fe2a157f4eb Update GPL to v3
gedeone-octave <marcovass89@hotmail.it>
parents: 75
diff changeset
2 Copyright (C) 2013 Marco Vassallo <gedeone-octave@users.sourceforge.net>
22
17bad8351f4d New class derived from dolfin::Expression
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
3
17bad8351f4d New class derived from dolfin::Expression
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
4 This program is free software; you can redistribute it and/or modify it under
17bad8351f4d New class derived from dolfin::Expression
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
5 the terms of the GNU General Public License as published by the Free Software
151
5fe2a157f4eb Update GPL to v3
gedeone-octave <marcovass89@hotmail.it>
parents: 75
diff changeset
6 Foundation; either version 3 of the License, or (at your option) any later
22
17bad8351f4d New class derived from dolfin::Expression
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
7 version.
17bad8351f4d New class derived from dolfin::Expression
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
8
17bad8351f4d New class derived from dolfin::Expression
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
9 This program is distributed in the hope that it will be useful, but WITHOUT
17bad8351f4d New class derived from dolfin::Expression
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
10 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
17bad8351f4d New class derived from dolfin::Expression
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
11 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
17bad8351f4d New class derived from dolfin::Expression
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
12 details.
17bad8351f4d New class derived from dolfin::Expression
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
13
17bad8351f4d New class derived from dolfin::Expression
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
14 You should have received a copy of the GNU General Public License along with
17bad8351f4d New class derived from dolfin::Expression
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
15 this program; if not, see <http://www.gnu.org/licenses/>.
17bad8351f4d New class derived from dolfin::Expression
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
16 */
17bad8351f4d New class derived from dolfin::Expression
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
17
17bad8351f4d New class derived from dolfin::Expression
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
18 #ifndef _EXPRESSION_OCTAVE_
17bad8351f4d New class derived from dolfin::Expression
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
19 #define _EXPRESSION_OCTAVE_
17bad8351f4d New class derived from dolfin::Expression
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
20
17bad8351f4d New class derived from dolfin::Expression
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
21 #include <dolfin.h>
17bad8351f4d New class derived from dolfin::Expression
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
22 #include <octave/oct.h>
17bad8351f4d New class derived from dolfin::Expression
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
23 #include <octave/oct-map.h>
17bad8351f4d New class derived from dolfin::Expression
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
24 #include <octave/ov-fcn-handle.h>
17bad8351f4d New class derived from dolfin::Expression
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
25 #include <octave/ov-fcn.h>
17bad8351f4d New class derived from dolfin::Expression
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
26 #include <octave/parse.h>
17bad8351f4d New class derived from dolfin::Expression
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
27 #include <octave/octave.h>
17bad8351f4d New class derived from dolfin::Expression
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
28
17bad8351f4d New class derived from dolfin::Expression
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
29 class expression : public dolfin::Expression
17bad8351f4d New class derived from dolfin::Expression
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
30 {
17bad8351f4d New class derived from dolfin::Expression
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
31
17bad8351f4d New class derived from dolfin::Expression
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
32 public:
173
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
33 expression()
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
34 : dolfin::Expression() {}
30
eaf8a1e8f377 The eval method now use a for cycle for the initialization of octave_value_list
gedeone-octave <marco.vassallo@outlook.com>
parents: 22
diff changeset
35
173
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
36 expression (octave_fcn_handle & _f)
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
37 : dolfin::Expression (), f (new octave_fcn_handle (_f)) {}
22
17bad8351f4d New class derived from dolfin::Expression
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
38
173
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
39 expression (octave_fcn_handle & _f,
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
40 std::size_t _n)
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
41 : dolfin::Expression (_n), f (new octave_fcn_handle (_f)) {}
75
d6df5cc8ef53 Improve the expression class to deal also with vector fields.
gedeone-octave <marcovass89@hotmail.it>
parents: 41
diff changeset
42
22
17bad8351f4d New class derived from dolfin::Expression
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
43 ~expression (void) { delete f; }
17bad8351f4d New class derived from dolfin::Expression
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
44
173
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
45 void
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
46 eval (dolfin::Array<double>& values,
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
47 const dolfin::Array<double>& x) const
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
48 {
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
49 octave_value_list b;
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
50 b.resize (x.size ());
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
51 for (std::size_t i = 0; i < x.size (); ++i)
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
52 b(i) = x[i];
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
53 octave_value_list tmp = feval (f->function_value (), b);
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
54 Array<double> res = tmp(0).array_value ();
30
eaf8a1e8f377 The eval method now use a for cycle for the initialization of octave_value_list
gedeone-octave <marco.vassallo@outlook.com>
parents: 22
diff changeset
55
173
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
56 for (std::size_t i = 0; i < values.size (); ++i)
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
57 values[i] = res(i);
9e944b0d0fc8 Some Formatting improvements (?)
gedeone-octave <marcovass89@hotmail.it>
parents: 151
diff changeset
58 }
22
17bad8351f4d New class derived from dolfin::Expression
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
59
30
eaf8a1e8f377 The eval method now use a for cycle for the initialization of octave_value_list
gedeone-octave <marco.vassallo@outlook.com>
parents: 22
diff changeset
60 private:
22
17bad8351f4d New class derived from dolfin::Expression
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
61 octave_fcn_handle * f;
17bad8351f4d New class derived from dolfin::Expression
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
62 };
17bad8351f4d New class derived from dolfin::Expression
gedeone-octave <marco.vassallo@outlook.com>
parents:
diff changeset
63 #endif