Mercurial > fem-fenics-eugenio

changeset 15:b760ffba8f63

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
DEFINE_OCTAVE_ALLOCATOR moved to fem_init_env.cc * fem_init_env.cc: the DEFINE_OCTAVE_ALLOCATOR and DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA functions are now implemented inside fem_init_env.cc for all the classes * mesh.cc: the functions DEFINE_OCTAVE_ALLOCATOR and DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA are no longer implemented here
author gedeone-octave <marco.vassallo@outlook.com>
date Mon, 08 Jul 2013 21:43:24 +0200
parents f329fc94b1a2
children 448e01d4411f
files src/Makefile.in src/fem_init_env.cc src/mesh.cc
diffstat 3 files changed, 33 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/src/Makefile.in	Mon Jul 08 21:35:44 2013 +0200
+++ b/src/Makefile.in	Mon Jul 08 21:43:24 2013 +0200
@@ -1,6 +1,6 @@
 MKOCTFILE ?= mkoctfile
 
-OCTFILES=fem_init_env.oct fem_init_mesh.oct fem_get_mesh.oct
+OCTFILES=fem_init_env.oct fem_init_mesh.oct fem_get_mesh.oct fem_fs.oct
 LIBS = 
 
 HAVE_DOLFIN_H = @HAVE_DOLFIN_H@
@@ -11,14 +11,14 @@
 
 all: $(OCTFILES)
 
-fem_init_env.oct:  mesh.o fem_init_env.o
-	$(MKOCTFILE) $(CPPFLAGS) -s mesh.o fem_init_env.o -o $@ $(LDFLAGS) $(LIBS)
+fem_init_env.oct: fem_init_env.o
+	$(MKOCTFILE) $(CPPFLAGS) -s fem_init_env.o -o $@ $(LDFLAGS) $(LIBS)
 
-fem_init_mesh.oct:  mesh.o fem_init_mesh.o
-	$(MKOCTFILE) $(CPPFLAGS) -s mesh.o fem_init_mesh.o -o $@ $(LDFLAGS) $(LIBS)
+fem_init_env.o:  fem_init_env.cc mesh.h functionspace.h
+	$(MKOCTFILE) $(CPPFLAGS) -c fem_init_env.cc $(LDFLAGS) -o $@ -I.
 
-fem_get_mesh.oct:  mesh.o fem_get_mesh.o
-	$(MKOCTFILE) $(CPPFLAGS) -s mesh.o fem_get_mesh.o -o $@ $(LDFLAGS) $(LIBS)
+fem_init_mesh.oct:  mesh.o fem_init_mesh.o fem_init_env.o
+	$(MKOCTFILE) $(CPPFLAGS) -s mesh.o fem_init_env.o fem_init_mesh.o -o $@ $(LDFLAGS) $(LIBS)
 
 mesh.o:  mesh.cc mesh.h
 	$(MKOCTFILE) $(CPPFLAGS) -c mesh.cc $(LDFLAGS) -o $@ -I.
@@ -26,12 +26,24 @@
 fem_init_mesh.o:  fem_init_mesh.cc mesh.cc mesh.h
 	$(MKOCTFILE) $(CPPFLAGS) -c fem_init_mesh.cc $(LDFLAGS) -o $@ -I.
 
-fem_get_mesh.o:  fem_get_mesh.cc mesh.cc mesh.h
+fem_get_mesh.oct:  mesh.o fem_get_mesh.o fem_init_env.o
+	$(MKOCTFILE) $(CPPFLAGS) -s mesh.o fem_init_env.o fem_get_mesh.o -o $@ $(LDFLAGS) $(LIBS)
+
+fem_get_mesh.o:  fem_get_mesh.cc mesh.o
 	$(MKOCTFILE) $(CPPFLAGS) -c fem_get_mesh.cc $(LDFLAGS) -o $@ -I.
 
-fem_init_env.o:  fem_init_env.cc mesh.cc mesh.h
-	$(MKOCTFILE) $(CPPFLAGS) -c fem_init_env.cc $(LDFLAGS) -o $@ -I.
+fem_fs.oct:  mesh.o fem_fs.o fem_init_env.o
+	$(MKOCTFILE) $(CPPFLAGS) -s mesh.o fem_init_env.o fem_fs.o -o $@ $(LDFLAGS) $(LIBS)
+
+fem_fs.o:  fem_fs.cc functionspace.h
+	$(MKOCTFILE) $(CPPFLAGS) -c fem_fs.cc $(LDFLAGS) -o $@ -I.
 
 clean:
 	-rm -f *.o core octave-core *.oct *~ *.xml
 
+cleanall:
+	-rm -f *.o core octave-core *.oct *~ *.xml *.status *.log octave-workspace configure
+	-rm -r autom4te.cache
+	-rm -f Makefile
+
+
--- a/src/fem_init_env.cc	Mon Jul 08 21:35:44 2013 +0200
+++ b/src/fem_init_env.cc	Mon Jul 08 21:43:24 2013 +0200
@@ -16,8 +16,14 @@
 */
 
 
+#include <mesh.h>
+#include <functionspace.h>
 
-#include <mesh.h>
+DEFINE_OCTAVE_ALLOCATOR (mesh);
+DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (mesh, "mesh", "mesh");
+
+DEFINE_OCTAVE_ALLOCATOR (functionspace);
+DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (functionspace, "functionspace", "functionspace");
 
 DEFUN_DLD (fem_init_env, args, ,  "initialize a fem-fenics environment") 
 {
@@ -31,6 +37,10 @@
        mesh::register_type ();
        mlock ();
        std::cout << "mesh_type_loaded" << std::endl;
+       functionspace::register_type ();
+       mlock ();
+       std::cout << "functionspace_type_loaded" << std::endl;
+
     }
   return retval;
 }
--- a/src/mesh.cc	Mon Jul 08 21:35:44 2013 +0200
+++ b/src/mesh.cc	Mon Jul 08 21:43:24 2013 +0200
@@ -18,9 +18,6 @@
 
 #include <mesh.h>
 
-DEFINE_OCTAVE_ALLOCATOR (mesh);
-DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (mesh, "mesh", "mesh");
-
 const dolfin::Mesh & 
 mesh::get_msh () const
 {