Mercurial > fem-fenics-eugenio

changeset 78:670a5d91c397

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename the function visible from the user accordingly to dolfin interface. * fem_bc.cc -> DirichletBC.cc * fem_coeff.cc -> Expression.cc * fem_func.cc -> Function.cc
author gedeone-octave <marcovass89@hotmail.it>
date Sat, 03 Aug 2013 14:29:04 +0200
parents ff95326e6f13
children 3e49ef16d74a
files src/DirichletBC.cc src/Expression.cc src/Function.cc src/fem_bc.cc src/fem_coeff.cc src/fem_func.cc
diffstat 6 files changed, 230 insertions(+), 230 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/DirichletBC.cc	Sat Aug 03 14:29:04 2013 +0200
@@ -0,0 +1,94 @@
+/*
+ Copyright (C) 2013 Marco Vassallo
+
+ This program is free software; you can redistribute it and/or modify it under
+ the terms of the GNU General Public License as published by the Free Software
+ Foundation; either version 2 of the License, or (at your option) any later
+ version.
+
+ This program is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ details.
+
+ You should have received a copy of the GNU General Public License along with
+ this program; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "boundarycondition.h"
+#include "functionspace.h"
+#include "expression.h"
+
+DEFUN_DLD (DirichletBC, args, , "-*- texinfo -*-\n\
+@deftypefn {Function File} {[@var{bc}]} = \
+DirichletBC (@var{Functional Space}, @var{Function handle}, \
+@var{Boundary Label}) \n\
+The input parameters are\n\
+@itemize @bullet \n\
+@item @var{Functional Space} is a fem-fenics functional space where\
+we want to apply the BC\n\
+@item @var{Functio handle} is a function handle which contains the expression\
+that we want to apply on the BC\n\
+@item @var{Boundary} is an Array which specify the label of the \
+sides where the BC is applied\n\
+@end itemize\n\
+The output @var{BC} is an object which contains the boundary conditions\n\
+@seealso{fem_init_mesh, fem_fs}\n\
+@end deftypefn")
+{
+  int nargin = args.length ();
+  octave_value retval;
+
+  if (nargin < 3 || nargin > 3)
+    print_usage ();
+  else
+    {
+
+      if (! functionspace_type_loaded)
+        {
+          functionspace::register_type ();
+          functionspace_type_loaded = true;
+          mlock ();
+        }
+
+      if (args(0).type_id () == functionspace::static_type_id ())
+        {
+          const functionspace & fspo = static_cast<const functionspace&> (args(0).get_rep ());
+          octave_fcn_handle * fh = args(1).fcn_handle_value ();
+          Array<octave_idx_type> side = args(2).array_value ();
+
+          if (!error_state)
+            {
+              const boost::shared_ptr <const dolfin::FunctionSpace> & V (fspo.get_pfsp ());
+
+              octave_value_list b (3, 1);
+              octave_value_list tmp = feval (fh->function_value (), b);
+              Array<double> res = tmp(0).array_value ();
+              std::size_t l = res.length ();
+
+              expression * pf;
+              if (l > 1)
+                pf = new expression (*fh, l);
+              else
+                pf = new expression (*fh);
+
+              boost::shared_ptr<const expression> f (pf);
+
+              if (! boundarycondition_type_loaded)
+                {
+                  boundarycondition::register_type ();
+                  boundarycondition_type_loaded = true;
+                  mlock ();
+                }
+
+              boundarycondition * pbc = new boundarycondition ();
+
+              for (octave_idx_type i = 0; i < side.length (); ++i)
+                  pbc->add_bc (V, f, side(i));
+
+              retval = octave_value (pbc);
+            }
+        }
+    }
+  return retval;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/Expression.cc	Sat Aug 03 14:29:04 2013 +0200
@@ -0,0 +1,66 @@
+/*
+ Copyright (C) 2013 Marco Vassallo
+
+ This program is free software; you can redistribute it and/or modify it under
+ the terms of the GNU General Public License as published by the Free Software
+ Foundation; either version 2 of the License, or (at your option) any later
+ version.
+
+ This program is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ details.
+
+ You should have received a copy of the GNU General Public License along with
+ this program; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "coefficient.h"
+
+DEFUN_DLD (Expression, args, , "-*- texinfo -*-\n\
+@deftypefn {Function File} {[@var{f}]} = \
+Expression (@var{name}, @var{Functio handle}\n\
+The input parameters are\n\
+@itemize @bullet \n\
+@item @var{name} is the name of the coefficient declared in the .ufl file\n\
+@item @var{Functio handle} is a function handle which contains the expression\
+that we want to apply for our coefficient\n\
+@end itemize\n\
+The output @var{f} is an object which contains a representation of the function\n\
+@seealso{fem_init_mesh, fem_fs}\n\
+@end deftypefn")
+{
+  int nargin = args.length ();
+  octave_value retval;
+
+  if (nargin < 2 || nargin > 2)
+    print_usage ();
+  else
+    {
+      std::string str = args(0).string_value ();
+      octave_fcn_handle * fh = args(1).fcn_handle_value ();
+
+      if (! coefficient_type_loaded)
+        {
+          coefficient::register_type ();
+          coefficient_type_loaded = true;
+          mlock ();
+        }
+
+      if (!error_state)
+        {
+          octave_value_list b (3, 1);
+          octave_value_list tmp = feval (fh->function_value (), b);
+          Array<double> res = tmp(0).array_value ();
+          std::size_t l = res.length ();
+
+          if (l > 1)
+            retval = new coefficient (str, *fh, l);
+          else
+            retval = new coefficient (str, *fh);
+        }
+
+   }
+
+  return retval;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/Function.cc	Sat Aug 03 14:29:04 2013 +0200
@@ -0,0 +1,70 @@
+#include <dolfin.h>
+#include "functionspace.h"
+#include "function.h"
+
+DEFUN_DLD (Function, args, , "-*- texinfo -*-\n\
+@deftypefn {Function File} {[@var{func}]} = \
+fem_func (@var{name}, @var{Functional Space}, @var{Vector})\n\
+The input parameters are\n\
+@itemize @bullet \n\
+@item @var{name} is a string representing the name of the function\n\
+@item @var{Functional Space} is the fem-fenics functional space where\
+the vector is defined\n\
+@item @var{Vector} contains the value of the coefficients\
+for the basis functions of @var{Functional Space}\n\
+@end itemize\n\
+The output @var{func} is an object which contain a representation of the\
+function @var{Vector} which can be plotted or saved.\n\
+@seealso{fem_plot, fem_save}\n\
+@end deftypefn")
+{
+
+  int nargin = args.length ();
+  octave_value retval=0;
+  
+  if (nargin < 3 || nargin > 3)
+    print_usage ();
+  else
+    {
+      if (! functionspace_type_loaded)
+        {
+          functionspace::register_type ();
+          functionspace_type_loaded = true;
+          mlock ();
+        }
+      if (args(1).type_id () == functionspace::static_type_id ())
+        {
+          std::string str = args(0).string_value ();
+          const functionspace & fspo =
+            static_cast<const functionspace&> (args(1).get_rep ());
+          Array <double> myu = args(2).array_value ();
+
+          if (!error_state)
+            {
+              const boost::shared_ptr<const dolfin::FunctionSpace> & V = fspo.get_pfsp ();
+
+              if (V->dim () != myu.length ())
+                error ("The size of the functional space and of the vector must agree");
+              else
+                {
+                  dolfin::Vector du(myu.length ());
+                  for (std::size_t i = 0; i < myu.length (); ++i)
+                    du.setitem (i, myu(i));
+
+                  boost::shared_ptr<dolfin::Vector> uu (new dolfin::Vector(du));
+                  boost::shared_ptr <const dolfin::Function> u (new dolfin::Function(V, uu));
+
+                  if (! function_type_loaded)
+                    {
+                      function::register_type ();
+                      function_type_loaded = true;
+                      mlock ();
+                    }
+
+                  retval = new function (str, u);
+               }
+            }
+        }
+    }
+  return retval;
+}
--- a/src/fem_bc.cc	Fri Aug 02 23:18:01 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +0,0 @@
-/*
- Copyright (C) 2013 Marco Vassallo
-
- This program is free software; you can redistribute it and/or modify it under
- the terms of the GNU General Public License as published by the Free Software
- Foundation; either version 2 of the License, or (at your option) any later
- version.
-
- This program is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- details.
-
- You should have received a copy of the GNU General Public License along with
- this program; if not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "boundarycondition.h"
-#include "functionspace.h"
-#include "expression.h"
-
-DEFUN_DLD (fem_bc, args, , "-*- texinfo -*-\n\
-@deftypefn {Function File} {[@var{bc}]} = \
-fem_get_mesh (@var{Functional Space}, @var{Functio handle}, \
-@var{Boundary}) \n\
-The input parameters are\n\
-@itemize @bullet \n\
-@item @var{Functional Space} is a fem-fenics functional space where\
-we want to apply the BC\n\
-@item @var{Functio handle} is a function handle which contains the expression\
-that we want to apply on the BC\n\
-@item @var{Boundary} is an Array which specify the label of the \
-sides where the BC is applied\n\
-@end itemize\n\
-The output @var{BC} is an object which contains the boundary conditions\n\
-@seealso{fem_init_mesh, fem_fs}\n\
-@end deftypefn")
-{
-  int nargin = args.length ();
-  octave_value retval;
-
-  if (nargin < 3 || nargin > 3)
-    print_usage ();
-  else
-    {
-
-      if (! functionspace_type_loaded)
-        {
-          functionspace::register_type ();
-          functionspace_type_loaded = true;
-          mlock ();
-        }
-
-      if (args(0).type_id () == functionspace::static_type_id ())
-        {
-          const functionspace & fspo = static_cast<const functionspace&> (args(0).get_rep ());
-          octave_fcn_handle * fh = args(1).fcn_handle_value ();
-          Array<octave_idx_type> side = args(2).array_value ();
-
-          if (!error_state)
-            {
-              const boost::shared_ptr <const dolfin::FunctionSpace> & V (fspo.get_pfsp ());
-
-              octave_value_list b (3, 1);
-              octave_value_list tmp = feval (fh->function_value (), b);
-              Array<double> res = tmp(0).array_value ();
-              std::size_t l = res.length ();
-
-              expression * pf;
-              if (l > 1)
-                pf = new expression (*fh, l);
-              else
-                pf = new expression (*fh);
-
-              boost::shared_ptr<const expression> f (pf);
-
-              if (! boundarycondition_type_loaded)
-                {
-                  boundarycondition::register_type ();
-                  boundarycondition_type_loaded = true;
-                  mlock ();
-                }
-
-              boundarycondition * pbc = new boundarycondition ();
-
-              for (octave_idx_type i = 0; i < side.length (); ++i)
-                  pbc->add_bc (V, f, side(i));
-
-              retval = octave_value (pbc);
-            }
-        }
-    }
-  return retval;
-}
--- a/src/fem_coeff.cc	Fri Aug 02 23:18:01 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-/*
- Copyright (C) 2013 Marco Vassallo
-
- This program is free software; you can redistribute it and/or modify it under
- the terms of the GNU General Public License as published by the Free Software
- Foundation; either version 2 of the License, or (at your option) any later
- version.
-
- This program is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- details.
-
- You should have received a copy of the GNU General Public License along with
- this program; if not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "coefficient.h"
-
-DEFUN_DLD (fem_coeff, args, , "-*- texinfo -*-\n\
-@deftypefn {Function File} {[@var{f}]} = \
-fem_coeff (@var{name}, @var{Functio handle}\n\
-The input parameters are\n\
-@itemize @bullet \n\
-@item @var{name} is the name of the coefficient declared in the .ufl file\n\
-@item @var{Functio handle} is a function handle which contains the expression\
-that we want to apply for our coefficient\n\
-@end itemize\n\
-The output @var{f} is an object which contains a representation of the function\n\
-@seealso{fem_init_mesh, fem_fs}\n\
-@end deftypefn")
-{
-  int nargin = args.length ();
-  octave_value retval=0;
-
-  if (nargin < 2 || nargin > 2)
-    print_usage ();
-  else
-    {
-      std::string str = args(0).string_value ();
-      octave_fcn_handle * fh = args(1).fcn_handle_value ();
-
-      if (! coefficient_type_loaded)
-        {
-          coefficient::register_type ();
-          coefficient_type_loaded = true;
-          mlock ();
-        }
-
-      if (!error_state)
-        {
-          octave_value_list b (3, 1);
-          octave_value_list tmp = feval (fh->function_value (), b);
-          Array<double> res = tmp(0).array_value ();
-          std::size_t l = res.length ();
-
-          if (l > 1)
-            retval = new coefficient (str, *fh, l);
-          else
-            retval = new coefficient (str, *fh);
-        }
-
-   }
-
-  return retval;
-}
--- a/src/fem_func.cc	Fri Aug 02 23:18:01 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-#include <dolfin.h>
-#include "functionspace.h"
-#include "function.h"
-
-DEFUN_DLD (fem_func, args, , "-*- texinfo -*-\n\
-@deftypefn {Function File} {[@var{func}]} = \
-fem_func (@var{name}, @var{Functional Space}, @var{Vector})\n\
-The input parameters are\n\
-@itemize @bullet \n\
-@item @var{name} is a string representing the name of the function\n\
-@item @var{Functional Space} is the fem-fenics functional space where\
-the vector is defined\n\
-@item @var{Vector} contains the value of the coefficients\
-for the basis functions of @var{Functional Space}\n\
-@end itemize\n\
-The output @var{func} is an object which contain a representation of the\
-function @var{Vector} which can be plotted or saved.\n\
-@seealso{fem_plot, fem_save}\n\
-@end deftypefn")
-{
-
-  int nargin = args.length ();
-  octave_value retval=0;
-  
-  if (nargin < 3 || nargin > 3)
-    print_usage ();
-  else
-    {
-      if (! functionspace_type_loaded)
-        {
-          functionspace::register_type ();
-          functionspace_type_loaded = true;
-          mlock ();
-        }
-      if (args(1).type_id () == functionspace::static_type_id ())
-        {
-          std::string str = args(0).string_value ();
-          const functionspace & fspo =
-            static_cast<const functionspace&> (args(1).get_rep ());
-          Array <double> myu = args(2).array_value ();
-
-          if (!error_state)
-            {
-              const boost::shared_ptr<const dolfin::FunctionSpace> & V = fspo.get_pfsp ();
-
-              if (V->dim () != myu.length ())
-                error ("The size of the functional space and of the vector must agree");
-              else
-                {
-                  dolfin::Vector du(myu.length ());
-                  for (std::size_t i = 0; i < myu.length (); ++i)
-                    du.setitem (i, myu(i));
-
-                  boost::shared_ptr<dolfin::Vector> uu (new dolfin::Vector(du));
-                  boost::shared_ptr <const dolfin::Function> u (new dolfin::Function(V, uu));
-
-                  if (! function_type_loaded)
-                    {
-                      function::register_type ();
-                      function_type_loaded = true;
-                      mlock ();
-                    }
-
-                  retval = new function (str, u);
-               }
-            }
-        }
-    }
-  return retval;
-}