Mercurial > fem-fenics-eugenio
changeset 82:5a4371f45fc4
Create the corresponding function following new naming convention.
| author | gedeone-octave <marcovass89@hotmail.it> |
|---|---|
| date | Sat, 03 Aug 2013 14:45:57 +0200 |
| parents | 3b01e1bd7420 |
| children | 6471e239941d |
| files | inst/generate_fs.m inst/generate_lhs.m inst/generate_makefile.m inst/generate_rhs.m |
| diffstat | 4 files changed, 19 insertions(+), 28 deletions(-) [+] |
line wrap: on
line diff
--- a/inst/generate_fs.m Sat Aug 03 14:44:07 2013 +0200 +++ b/inst/generate_fs.m Sat Aug 03 14:45:57 2013 +0200 @@ -6,7 +6,7 @@ #include ""mesh.h""\n\ #include ""@@UFL_NAME@@.h""\n\ \n\ -DEFUN_DLD (fem_fs_@@UFL_NAME@@, args, , ""initialize a fs from a mesh declared with fem_init_mesh"")\n\ +DEFUN_DLD (@@UFL_NAME@@_FunctionSpace, args, , ""initialize a fs from a mesh declared with fem_init_mesh"")\n\ {\n\ int nargin = args.length ();\n\ octave_value retval;\n\ @@ -44,7 +44,7 @@ STRING = strrep (STRING, "@@UFL_NAME@@", ufl_name); -fid = fopen (sprintf ("fem_fs_%s.cc", ufl_name), 'w'); +fid = fopen (sprintf ("%s_FunctionSpace.cc", ufl_name), 'w'); if (fid >= 0) fputs (fid, STRING); output = fclose (fid);
--- a/inst/generate_lhs.m Sat Aug 03 14:44:07 2013 +0200 +++ b/inst/generate_lhs.m Sat Aug 03 14:45:57 2013 +0200 @@ -8,7 +8,7 @@ #include ""coefficient.h""\n\ #include ""function.h""\n\ \n\ -DEFUN_DLD (fem_lhs_@@UFL_NAME@@, args, , "" b = fem_lhs_@@UFL_NAME@@ (FUNCTIONAL SPACE, COEFF, BC)"")\n\ +DEFUN_DLD (@@UFL_NAME@@_LinearForm, args, , "" b = fem_lhs_@@UFL_NAME@@ (FUNCTIONAL SPACE, COEFF, BC)"")\n\ {\n\ int nargin = args.length ();\n\ octave_value retval;\n\ @@ -121,7 +121,7 @@ STRING = strrep (STRING, "@@UFL_NAME@@", ufl_name); -fid = fopen (sprintf ("fem_lhs_%s.cc", ufl_name), 'w'); +fid = fopen (sprintf ("%s_LinearForm.cc", ufl_name), 'w'); if (fid >= 0) fputs (fid, STRING); output = fclose (fid);
--- a/inst/generate_makefile.m Sat Aug 03 14:44:07 2013 +0200 +++ b/inst/generate_makefile.m Sat Aug 03 14:45:57 2013 +0200 @@ -8,30 +8,21 @@ MKOCTFILE = mkoctfile\n\ FFC = ffc\n\ \n\ -OCTFILES = fem_fs_@@UFL_NAME@@.oct fem_rhs_@@UFL_NAME@@.oct fem_lhs_@@UFL_NAME@@.oct\n\ +OCTFILES = @@UFL_NAME@@_FunctionSpace.oct @@UFL_NAME@@_BilinearForm.oct @@UFL_NAME@@_LinearForm.oct\n\ \n\ all : $(OCTFILES)\n\ -fs : fem_fs_@@UFL_NAME@@.oct\n\ -rhs : fem_rhs_@@UFL_NAME@@.oct\n\ -lhs : fem_lhs_@@UFL_NAME@@.oct\n\ -\n\ -fem_fs_@@UFL_NAME@@.o: fem_fs_@@UFL_NAME@@.cc\n\ - $(MKOCTFILE) -I$(DIR) -I. $(CPPFLAGS) $(LDFLAGS) $< -c $@\n\ -\n\ -fem_fs_@@UFL_NAME@@.oct: @@UFL_NAME@@.h fem_fs_@@UFL_NAME@@.o\n\ - $(MKOCTFILE) -s fem_fs_@@UFL_NAME@@.o $(DIR)fem_init_env.o $(LDFLAGS) $(LIBS) -o $@\n\ +fs : @@UFL_NAME@@_FunctionSpace.oct\n\ +rhs : @@UFL_NAME@@_BilinearForm.oct\n\ +lhs : @@UFL_NAME@@_LinearForm.oct\n\ \n\ -fem_rhs_@@UFL_NAME@@.o: fem_rhs_@@UFL_NAME@@.cc\n\ - $(MKOCTFILE) -I$(DIR) -I. $(LDFLAGS) $(CPPFLAGS) $< -c $@\n\ -\n\ -fem_rhs_@@UFL_NAME@@.oct: @@UFL_NAME@@.h fem_rhs_@@UFL_NAME@@.o\n\ - $(MKOCTFILE) -s fem_rhs_@@UFL_NAME@@.o $(DIR)fem_init_env.o $(LDFLAGS) $(LIBS) -o $@\n\ +@@UFL_NAME@@_FunctionSpace.oct: @@UFL_NAME@@.h @@UFL_NAME@@_FunctionSpace.cc\n\ + $(MKOCTFILE) @@UFL_NAME@@_FunctionSpace.cc -I$(DIR) -I. $(LDFLAGS) $(CPPFLAGS) $(LIBS)\n\ \n\ -fem_lhs_@@UFL_NAME@@.o: fem_lhs_@@UFL_NAME@@.cc\n\ - $(MKOCTFILE) -I$(DIR) -I. $(LDFLAGS) $(CPPFLAGS) $< -c $@\n\ +@@UFL_NAME@@_BilinearForm.oct: @@UFL_NAME@@.h @@UFL_NAME@@_BilinearForm.cc\n\ + $(MKOCTFILE) @@UFL_NAME@@_BilinearForm.cc -I$(DIR) -I. $(LDFLAGS) $(CPPFLAGS) $(LIBS)\n\ \n\ -fem_lhs_@@UFL_NAME@@.oct: @@UFL_NAME@@.h fem_lhs_@@UFL_NAME@@.o\n\ - $(MKOCTFILE) -s fem_lhs_@@UFL_NAME@@.o $(DIR)fem_init_env.o $(LDFLAGS) $(LIBS) -o $@\n\ +@@UFL_NAME@@_LinearForm.oct: @@UFL_NAME@@.h @@UFL_NAME@@_LinearForm.cc\n\ + $(MKOCTFILE) @@UFL_NAME@@_LinearForm.cc -I$(DIR) -I. $(LDFLAGS) $(CPPFLAGS) $(LDFLAGS) $(LIBS)\n\ \n\ @@UFL_NAME@@.h: @@UFL_NAME@@.ufl\n\ $(FFC) -l dolfin @@UFL_NAME@@.ufl\n\ @@ -39,9 +30,9 @@ .PHONY: clean\n\ \n\ clean:\n\ - rm -f fem_fs_@@UFL_NAME@@.o fem_fs_@@UFL_NAME@@.cc @@UFL_NAME@@.h\n\ - rm -f fem_rhs_@@UFL_NAME@@.o fem_rhs_@@UFL_NAME@@.cc\n\ - rm -f fem_lhs_@@UFL_NAME@@.o fem_lhs_@@UFL_NAME@@.cc\n\ + rm -f @@UFL_NAME@@_FunctionSpace.o @@UFL_NAME@@_FunctionSpace.cc @@UFL_NAME@@.h\n\ + rm -f @@UFL_NAME@@_BilinearForm.o @@UFL_NAME@@_BilinearForm.cc\n\ + rm -f @@UFL_NAME@@_LinearForm.o @@UFL_NAME@@_LinearForm.cc\n\ rm -f Makefile_@@UFL_NAME@@\n\ ";
--- a/inst/generate_rhs.m Sat Aug 03 14:44:07 2013 +0200 +++ b/inst/generate_rhs.m Sat Aug 03 14:45:57 2013 +0200 @@ -8,7 +8,7 @@ #include ""coefficient.h""\n\ #include ""function.h""\n\ \n\ -DEFUN_DLD (fem_rhs_@@UFL_NAME@@, args, , ""A = fem_rhs_@@UFL_NAME@@ (FUNCTIONAL SPACE, COEFF, BC)"")\n\ +DEFUN_DLD (@@UFL_NAME@@_BilinearForm, args, , ""A = fem_rhs_@@UFL_NAME@@ (FUNCTIONAL SPACE, COEFF, BC)"")\n\ {\n\ \n\ int nargin = args.length ();\n\ @@ -143,7 +143,7 @@ STRING = strrep (STRING, "@@UFL_NAME@@", ufl_name); -fid = fopen (sprintf ("fem_rhs_%s.cc", ufl_name), 'w'); +fid = fopen (sprintf ("%s_BilinearForm.cc", ufl_name), 'w'); if (fid >= 0) fputs (fid, STRING); output = fclose (fid);