Mercurial > fem-fenics-eugenio

changeset 67:5a781e79bee1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Call new octave script instead of python script
author gedeone-octave <marco.vassallo@outlook.com>
date Sat, 27 Jul 2013 17:09:55 +0200
parents 5a1f8f5e2617
children 4ef8dbafcdfc
files inst/fem_create_fs.m inst/fem_create_lhs.m inst/fem_create_rhs.m
diffstat 3 files changed, 40 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/inst/fem_create_fs.m	Sat Jul 27 17:02:06 2013 +0200
+++ b/inst/fem_create_fs.m	Sat Jul 27 17:09:55 2013 +0200
@@ -36,11 +36,21 @@
   path = strtrunc(mfilename ("fullpath"), n);
 
   private = fullfile (path, "private/");
-  program = fullfile (path, "bin/create_fs.py");
-  [output, text] = python (program, var_prob, private);
+  output = generate_fs (var_prob);
+  output += generate_makefile (var_prob, private);
   if output != 0
-    display (text);
     error ("Compilation failed");
+  else
+    [output, textfile] = system (sprintf ("make -f Makefile_%s fs", var_prob));
+    if output != 0
+      display (text);
+      error ("Compilation failed");
+    endif
+    [output, textfile] = system ("make -f Makefile_%s clean", var_prob);
+    if output != 0
+      display (text);
+      error ("Compilation failed");
+    endif
   endif
 
 endfunction
--- a/inst/fem_create_lhs.m	Sat Jul 27 17:02:06 2013 +0200
+++ b/inst/fem_create_lhs.m	Sat Jul 27 17:09:55 2013 +0200
@@ -36,11 +36,22 @@
   path = strtrunc(mfilename ("fullpath"), n);
 
   private = fullfile (path, "private/");
-  program = fullfile (path, "bin/create_lhs.py");
-  [output, text] = python (program, var_prob, private);
+
+  output = generate_lhs (var_prob);
+  output += generate_makefile (var_prob, private);
   if output != 0
-    display (text);
     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 ("make -f Makefile_%s clean", var_prob);
+    if output != 0
+      display (text);
+      error ("Compilation failed");
+    endif
   endif
 
 endfunction
--- a/inst/fem_create_rhs.m	Sat Jul 27 17:02:06 2013 +0200
+++ b/inst/fem_create_rhs.m	Sat Jul 27 17:09:55 2013 +0200
@@ -36,11 +36,20 @@
   path = strtrunc(mfilename ("fullpath"), n);
 
   private = fullfile (path, "private/");
-  program = fullfile (path, "bin/create_rhs.py");
-  [output, text] = python (program, var_prob, private);
+  output = generate_rhs (var_prob);
+  output += generate_makefile (var_prob, private);
   if output != 0
-    display (text);
     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 ("make -f Makefile_%s clean", var_prob);
+    if output != 0
+      display (text);
+      error ("Compilation failed");
+    endif
   endif
-
 endfunction