Mercurial > fem-fenics-eugenio

changeset 52:0aefa30d4ce0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
New function for the creation of the functionalspace * fem_create_fs: create a function fem_fs_name based on a problem defined from the user. name is the name of the problem. * fem_ffc.m: function replaced from fem_create_fs
author gedeone-octave <marco.vassallo@outlook.com>
date Thu, 25 Jul 2013 11:36:57 +0200
parents 54cca651760e
children 78448b5c6df6
files inst/fem_create_fs.m inst/fem_ffc.m
diffstat 2 files changed, 46 insertions(+), 44 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/inst/fem_create_fs.m	Thu Jul 25 11:36:57 2013 +0200
@@ -0,0 +1,46 @@
+## 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/>.
+
+
+## -*- texinfo -*-
+## @deftypefn {Function File} {} = fem_ffc (myproblem.ufl)
+## This function take as input the name of the .ufl file where 
+## the Variational Problem is defined.
+## @example
+## 
+## @end example
+## @seealso{} 
+## @end deftypefn
+
+function fem_create_fs (var_prob)
+
+  if nargin != 1
+    error ("fem_create_fs: wrong number of input parameters.");
+  elseif ! ischar (var_prob)
+    error ("fem_create_fs: first argument is not a valid string");
+  endif
+
+  n = length (mfilename ("fullpath")) - length (mfilename());
+  path = strtrunc(mfilename ("fullpath"), n);
+
+  private = fullfile (path, "private/");
+  program = fullfile (path, "bin/create_fs.py");
+  [output, text] = python (program, var_prob, private);
+  if output != 0
+    display (text);
+    error ("Compilation failed");
+  endif
+
+endfunction
--- a/inst/fem_ffc.m	Thu Jul 25 10:27:32 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +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/>.
-
-
-## -*- texinfo -*-
-## @deftypefn {Function File} {} = fem_ffc (myproblem.ufl)
-## This function take as input a .ufl file with a Variationa Problem
-## @example
-## 
-## @end example
-## @seealso{} 
-## @end deftypefn
-
-function fem_ffc (var_prob)
-
-  if nargin != 1
-    error ("fem_ffc: wrong number of input parameters.");
-  elseif ! isstr (var_prob)
-    error ("fem_ffc: first argument is not a valid string");
-  endif
-
-  command = cstrcat ("ffc -l dolfin ", var_prob);
-  [output, text] = system (command);
-  if output != 0
-    display (text);
-    error ("Compilation failed");
-  endif
-
-endfunction
-
-
-