Mercurial > fem-fenics-eugenio
changeset 33:f992cee90bd6
Compile and register also the new clas expression.h
| author | gedeone-octave <marco.vassallo@outlook.com> |
|---|---|
| date | Thu, 18 Jul 2013 14:28:54 +0200 |
| parents | fe36aa05d7e5 |
| children | 5f8e72452780 |
| files | src/Makefile.in src/fem_init_env.cc |
| diffstat | 2 files changed, 13 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Makefile.in Thu Jul 18 14:27:02 2013 +0200 +++ b/src/Makefile.in Thu Jul 18 14:28:54 2013 +0200 @@ -1,6 +1,6 @@ MKOCTFILE ?= mkoctfile -OCTFILES=fem_init_env.oct fem_init_mesh.oct fem_get_mesh.oct fem_fs.oct fem_bc.oct +OCTFILES=fem_init_env.oct fem_init_mesh.oct fem_get_mesh.oct fem_fs.oct fem_bc.oct fem_coeff.oct LIBS += -ldolfin @@ -40,6 +40,12 @@ fem_bc.o: fem_bc.cc functionspace.h boundarycondition.h expression.h $(MKOCTFILE) $(CPPFLAGS) -c fem_bc.cc $(LDFLAGS) -o $@ -I. +fem_coeff.oct: fem_coeff.o fem_init_env.o + $(MKOCTFILE) $(CPPFLAGS) -s fem_init_env.o fem_coeff.o -o $@ $(LDFLAGS) $(LIBS) + +fem_coeff.o: fem_coeff.cc expression.h coefficient.h + $(MKOCTFILE) $(CPPFLAGS) -c fem_coeff.cc $(LDFLAGS) -o $@ -I. + Laplace.h: Laplace.ufl ffc -l dolfin Laplace.ufl
--- a/src/fem_init_env.cc Thu Jul 18 14:27:02 2013 +0200 +++ b/src/fem_init_env.cc Thu Jul 18 14:28:54 2013 +0200 @@ -19,7 +19,7 @@ #include "mesh.h" #include "functionspace.h" #include "boundarycondition.h" - +#include "coefficient.h" DEFINE_OCTAVE_ALLOCATOR (mesh); DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (mesh, "mesh", "mesh"); @@ -30,6 +30,9 @@ DEFINE_OCTAVE_ALLOCATOR (boundarycondition); DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (boundarycondition, "boundarycondition", "boundarycondition"); +DEFINE_OCTAVE_ALLOCATOR (coefficient); +DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (coefficient, "coefficient", "coefficient"); + DEFUN_DLD (fem_init_env, args, , "-*- texinfo -*-\n\ @deftypefn {Function File} {[]} = \ fem_init_env ( ) \n\ @@ -49,6 +52,8 @@ std::cout << "functionspace_type_loaded" << std::endl; boundarycondition::register_type (); std::cout << "boundarycondition_type_loaded" << std::endl; + coefficient::register_type (); + std::cout << "coefficient_type_loaded" << std::endl; mlock (); } return retval;