Mercurial > fem-fenics-eugenio

changeset 135:547763139e1a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix minor bug
author gedeone-octave <marcovass89@hotmail.it>
date Fri, 06 Sep 2013 13:30:10 +0200
parents 286930e440cf
children c445cdf36fb1
files inst/fem_create_all.m inst/fem_create_lhs.m inst/fem_create_rhs.m inst/import_ufl_BilinearForm.m inst/import_ufl_LinearForm.m inst/import_ufl_problem.m post_install.m src/DirichletBC.cc
diffstat 8 files changed, 172 insertions(+), 172 deletions(-) [+]
line wrap: on
line diff
--- a/inst/fem_create_all.m	Fri Sep 06 13:16:33 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +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 the name of the .ufl file where 
-## the Variational Problem is defined.
-## @example
-## 
-## @end example
-## @seealso{} 
-## @end deftypefn
-
-function fem_create_all (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/");
-  output = generate_fs (var_prob);
-  output += generate_rhs (var_prob);
-  output += generate_lhs (var_prob);
-  output += generate_makefile (var_prob, private);
-  if output != 0
-    error ("Compilation failed");
-  else
-    [output, textfile] = system (sprintf ("make -f Makefile_%s all", var_prob));
-    if output != 0
-      display (text);
-      error ("Compilation failed");
-    endif
-    [output, textfile] = system (sprintf ("make -f Makefile_%s clean", var_prob));
-    if output != 0
-      display (text);
-      error ("Compilation failed");
-    endif
-  endif
-
-endfunction
--- a/inst/fem_create_lhs.m	Fri Sep 06 13:16:33 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +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 the name of the .ufl file where 
-## the Variational Problem is defined.
-## @example
-## 
-## @end example
-## @seealso{} 
-## @end deftypefn
-
-function fem_create_lhs (var_prob)
-
-  if nargin != 1
-    error ("fem_create_lhs: wrong number of input parameters.");
-  elseif ! ischar (var_prob)
-    error ("fem_create_lhs: first argument is not a valid string");
-  endif
-
-  n = length (mfilename ("fullpath")) - length (mfilename());
-  path = strtrunc(mfilename ("fullpath"), n);
-
-  private = fullfile (path, "private/");
-
-  output = generate_lhs (var_prob);
-  output += generate_makefile (var_prob, private);
-  if output != 0
-    error ("Compilation failed");
-  else
-    [output, textfile] = system (sprintf ("make -f Makefile_%s lhs", var_prob));
-    if output != 0
-      display (text);
-      error ("Compilation failed");
-    endif
-    [output, textfile] = system (sprintf ("make -f Makefile_%s clean", var_prob));
-    if output != 0
-      display (text);
-      error ("Compilation failed");
-    endif
-  endif
-
-endfunction
--- a/inst/fem_create_rhs.m	Fri Sep 06 13:16:33 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +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 the name of the .ufl file where 
-## the Variational Problem is defined.
-## @example
-## 
-## @end example
-## @seealso{} 
-## @end deftypefn
-
-function fem_create_rhs (var_prob)
-
-  if nargin != 1
-    error ("fem_create_rhs: wrong number of input parameters.");
-  elseif ! ischar (var_prob)
-    error ("fem_create_rhs: first argument is not a valid string");
-  endif
-
-  n = length (mfilename ("fullpath")) - length (mfilename());
-  path = strtrunc(mfilename ("fullpath"), n);
-
-  private = fullfile (path, "private/");
-  output = generate_rhs (var_prob);
-  output += generate_makefile (var_prob, private);
-  if output != 0
-    error ("Compilation failed");
-  else
-    [output, textfile] = system (sprintf ("make -f Makefile_%s rhs", var_prob));
-    if output != 0
-      display (text);
-      error ("Compilation failed");
-    endif
-    [output, textfile] = system (sprintf ("make -f Makefile_%s clean", var_prob));
-    if output != 0
-      display (text);
-      error ("Compilation failed");
-    endif
-  endif
-endfunction
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/inst/import_ufl_BilinearForm.m	Fri Sep 06 13:30:10 2013 +0200
@@ -0,0 +1,55 @@
+## 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_rhs (var_prob)
+
+  if nargin != 1
+    error ("fem_create_rhs: wrong number of input parameters.");
+  elseif ! ischar (var_prob)
+    error ("fem_create_rhs: first argument is not a valid string");
+  endif
+
+  n = length (mfilename ("fullpath")) - length (mfilename());
+  path = strtrunc(mfilename ("fullpath"), n);
+
+  private = fullfile (path, "private/");
+  output = generate_rhs (var_prob);
+  output += generate_makefile (var_prob, private);
+  if output != 0
+    error ("Compilation failed");
+  else
+    [output, textfile] = system (sprintf ("make -f Makefile_%s rhs", var_prob));
+    if output != 0
+      display (text);
+      error ("Compilation failed");
+    endif
+    [output, textfile] = system (sprintf ("make -f Makefile_%s clean", var_prob));
+    if output != 0
+      display (text);
+      error ("Compilation failed");
+    endif
+  endif
+endfunction
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/inst/import_ufl_LinearForm.m	Fri Sep 06 13:30:10 2013 +0200
@@ -0,0 +1,57 @@
+## 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_lhs (var_prob)
+
+  if nargin != 1
+    error ("fem_create_lhs: wrong number of input parameters.");
+  elseif ! ischar (var_prob)
+    error ("fem_create_lhs: first argument is not a valid string");
+  endif
+
+  n = length (mfilename ("fullpath")) - length (mfilename());
+  path = strtrunc(mfilename ("fullpath"), n);
+
+  private = fullfile (path, "private/");
+
+  output = generate_lhs (var_prob);
+  output += generate_makefile (var_prob, private);
+  if output != 0
+    error ("Compilation failed");
+  else
+    [output, textfile] = system (sprintf ("make -f Makefile_%s lhs", var_prob));
+    if output != 0
+      display (text);
+      error ("Compilation failed");
+    endif
+    [output, textfile] = system (sprintf ("make -f Makefile_%s clean", var_prob));
+    if output != 0
+      display (text);
+      error ("Compilation failed");
+    endif
+  endif
+
+endfunction
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/inst/import_ufl_problem.m	Fri Sep 06 13:30:10 2013 +0200
@@ -0,0 +1,58 @@
+## 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_all (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/");
+  output = generate_fs (var_prob);
+  output += generate_rhs (var_prob);
+  output += generate_lhs (var_prob);
+  output += generate_makefile (var_prob, private);
+  if output != 0
+    error ("Compilation failed");
+  else
+    [output, textfile] = system (sprintf ("make -f Makefile_%s all", var_prob));
+    if output != 0
+      display (text);
+      error ("Compilation failed");
+    endif
+    [output, textfile] = system (sprintf ("make -f Makefile_%s clean", var_prob));
+    if output != 0
+      display (text);
+      error ("Compilation failed");
+    endif
+  endif
+
+endfunction
--- a/post_install.m	Fri Sep 06 13:16:33 2013 +0200
+++ b/post_install.m	Fri Sep 06 13:30:10 2013 +0200
@@ -37,7 +37,7 @@
 
   delete ('./src/save.oct');
 
-  new_name = copyfile (func, 'plot.oct');
+  new_name = fullfile (func, 'plot.oct');
   [status, msg, msgid] = movefile ('./src/plot_func.oct', new_name, 'f');
   if (status != 1)
     error ("couldn't copy file: %s", msg);
--- a/src/DirichletBC.cc	Fri Sep 06 13:16:33 2013 +0200
+++ b/src/DirichletBC.cc	Fri Sep 06 13:30:10 2013 +0200
@@ -21,7 +21,7 @@
 
 DEFUN_DLD (DirichletBC, args, , "-*- texinfo -*-\n\
 @deftypefn {Function File} {[@var{bc}]} = \
-DirichletBC (@var{Functional Space}, @var{Boundary Label}, @var{Function handle}}) \n\
+DirichletBC (@var{Functional Space}, @var{Boundary Label}, @var{Function handle}) \n\
 The input parameters are\n\
 @itemize @bullet \n\
 @item @var{Functional Space} is a fem-fenics functional space where\