Merge lp:~ldeo-magma/dolfin/devfixes into lp:dolfin/1.0.x

[Cian Wilson]

The following are so trivial they may not be worth your while merging from this branch but I thought I'd flag them anyway.

meshconvert.py still produces xml headers with 'meshfunction' in them, which produces a warning at runtime. Changing to 'mesh_function'.

defines.h was producing multiple definitions of its various subroutines during linking (I have multiple libraries which include dolfin.h). I've split it up into definitions and implementation now and this fixes my problem but don't know if you have a preferred solution.

This all appears to work for me but hasn't been thoroughly tested.

[Johan Hake (johan-hake)]

Cian!

Thanks for the fixes. They all look good. Have you looked at the webpage for
contributing code?

http://fenicsproject.org/contributing/contributing_code.html

There are a copyright consent you need to sign (if you have not done it).
Basically giving the consent that FEniCS can be distributed with LGPL3.0 or
later.

Johan

On Saturday October 15 2011 17:47:29 Cian Wilson wrote:
> Cian Wilson has proposed merging lp:~ldeo-magma/dolfin/devfixes into
> lp:dolfin.
>
> Requested reviews:
> DOLFIN Core Team (dolfin-core)
>
> For more details, see:
> https://code.launchpad.net/~ldeo-magma/dolfin/devfixes/+merge/79484
>
> The following are so trivial they may not be worth your while merging from
> this branch but I thought I'd flag them anyway.
>
> meshconvert.py still produces xml headers with 'meshfunction' in them,
> which produces a warning at runtime. Changing to 'mesh_function'.
>
> defines.h was producing multiple definitions of its various subroutines
> during linking (I have multiple libraries which include dolfin.h). I've
> split it up into definitions and implementation now and this fixes my
> problem but don't know if you have a preferred solution.
>
> This all appears to work for me but hasn't been thoroughly tested.

[Cian Wilson (cwilson)]

Hi Johan,

I haven't signed the consent form no but am familiar with the procedure. Will get on it straight away - slow bit might be getting my employer to do it, though they've done it in the past.

Cheers,
Cian

[Cian Wilson (cwilson)]

Johan,

Forms are in the mail.

Cheers,
Cian

[Johan Hake (johan-hake)]

On Tuesday October 18 2011 12:48:41 Cian Wilson wrote:
> Johan,
>
> Forms are in the mail.

Execellent!

Johan

> Cheers,
> Cian

=== added file 'dolfin/common/defines.cpp'
--- dolfin/common/defines.cpp	1970-01-01 00:00:00 +0000
+++ dolfin/common/defines.cpp	2011-10-16 00:46:23 +0000
@@ -0,0 +1,170 @@
+// Copyright (C) 2009-2011 Johan Hake
+//
+// This file is part of DOLFIN.
+//
+// DOLFIN is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// DOLFIN 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 Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with DOLFIN. If not, see <http://www.gnu.org/licenses/>.
+//
+// First added:  2011-10-15
+// Last changed: 2011-10-15
+
+#include <dolfin/common/defines.h>
+
+// Return true if DOLFIN is compiled with OpenMP
+bool has_openmp()
+{
+#ifdef HAS_OPENMP
+  return true;
+#else
+  return false;
+#endif
+}
+
+// Return true if DOLFIN is compiled with MPI
+bool has_mpi()
+{
+#ifdef HAS_MPI
+  return true;
+#else
+  return false;
+#endif
+}
+
+// Return true if DOLFIN is compiled with SLEPc
+bool has_slepc()
+{
+#ifdef HAS_SLEPC
+  return true;
+#else
+  return false;
+#endif
+}
+
+// Return true if DOLFIN is compiled with Trilinos
+bool has_trilinos()
+{
+#ifdef HAS_TRILINOS
+  return true;
+#else
+  return false;
+#endif
+}
+
+// Return true if DOLFIN is compiled with Scotch
+bool has_scotch()
+{
+#ifdef HAS_SCOTCH
+  return true;
+#else
+  return false;
+#endif
+}
+
+// Return true if DOLFIN is compiled with CGAL
+bool has_cgal()
+{
+#ifdef HAS_CGAL
+  return true;
+#else
+  return false;
+#endif
+}
+
+// Return true if DOLFIN is compiled with Umfpack
+bool has_umfpack()
+{
+#ifdef HAS_UMFPACK
+  return true;
+#else
+  return false;
+#endif
+}
+
+// Return true if DOLFIN is compiled with Cholmod
+bool has_cholmod()
+{
+#ifdef HAS_CHOLMOD
+  return true;
+#else
+  return false;
+#endif
+}
+
+// Return true if DOLFIN is compiled with parmetis
+bool has_parmetis()
+{
+#ifdef HAS_PARMETIS
+  return true;
+#else
+  return false;
+#endif
+}
+
+// Return true if DOLFIN is compiled with GMP
+bool has_gmp()
+{
+#ifdef HAS_GMP
+  return true;
+#else
+  return false;
+#endif
+}
+
+// Return true if DOLFIN is compiled with ZLIB
+bool has_zlib()
+{
+#ifdef HAS_ZLIB
+  return true;
+#else
+  return false;
+#endif
+}
+
+// Return true if a specific linear algebra backend is supported
+bool has_linear_algebra_backend(std::string backend)
+{
+  if (backend == "uBLAS")
+  {
+    return true;
+  }
+  else if (backend == "PETSc")
+  {
+#ifdef HAS_PETSC
+    return true;
+#else
+    return false;
+#endif
+  }
+  else if (backend == "Epetra")
+  {
+#ifdef HAS_TRILINOS
+    return true;
+#else
+    return false;
+#endif
+  }
+  else if (backend == "MTL4")
+  {
+#ifdef HAS_MTL4
+    return true;
+#else
+    return false;
+#endif
+  }
+  else if (backend == "STL")
+  {
+    return true;
+  }
+  return false;
+}
+
 
=== modified file 'dolfin/common/defines.h'
--- dolfin/common/defines.h	2011-10-10 00:06:19 +0000
+++ dolfin/common/defines.h	2011-10-16 00:46:23 +0000
@@ -19,153 +19,45 @@
 // First added:  2009-09-03
 // Last changed: 2011-10-09
 
+#ifndef __DOLFIN_DEFINES_H
+#define __DOLFIN_DEFINES_H
+
 #include <string>
 
 // Return true if DOLFIN is compiled with OpenMP
-bool has_openmp()
-{
-#ifdef HAS_OPENMP
-  return true;
-#else
-  return false;
-#endif
-}
+bool has_openmp();
 
 // Return true if DOLFIN is compiled with MPI
-bool has_mpi()
-{
-#ifdef HAS_MPI
-  return true;
-#else
-  return false;
-#endif
-}
+bool has_mpi();
 
 // Return true if DOLFIN is compiled with SLEPc
-bool has_slepc()
-{
-#ifdef HAS_SLEPC
-  return true;
-#else
-  return false;
-#endif
-}
+bool has_slepc();
 
 // Return true if DOLFIN is compiled with Trilinos
-bool has_trilinos()
-{
-#ifdef HAS_TRILINOS
-  return true;
-#else
-  return false;
-#endif
-}
+bool has_trilinos();
 
 // Return true if DOLFIN is compiled with Scotch
-bool has_scotch()
-{
-#ifdef HAS_SCOTCH
-  return true;
-#else
-  return false;
-#endif
-}
+bool has_scotch();
 
 // Return true if DOLFIN is compiled with CGAL
-bool has_cgal()
-{
-#ifdef HAS_CGAL
-  return true;
-#else
-  return false;
-#endif
-}
+bool has_cgal();
 
 // Return true if DOLFIN is compiled with Umfpack
-bool has_umfpack()
-{
-#ifdef HAS_UMFPACK
-  return true;
-#else
-  return false;
-#endif
-}
+bool has_umfpack();
 
 // Return true if DOLFIN is compiled with Cholmod
-bool has_cholmod()
-{
-#ifdef HAS_CHOLMOD
-  return true;
-#else
-  return false;
-#endif
-}
+bool has_cholmod();
 
 // Return true if DOLFIN is compiled with parmetis
-bool has_parmetis()
-{
-#ifdef HAS_PARMETIS
-  return true;
-#else
-  return false;
-#endif
-}
+bool has_parmetis();
 
 // Return true if DOLFIN is compiled with GMP
-bool has_gmp()
-{
-#ifdef HAS_GMP
-  return true;
-#else
-  return false;
-#endif
-}
+bool has_gmp();
 
 // Return true if DOLFIN is compiled with ZLIB
-bool has_zlib()
-{
-#ifdef HAS_ZLIB
-  return true;
-#else
-  return false;
-#endif
-}
+bool has_zlib();
 
 // Return true if a specific linear algebra backend is supported
-bool has_linear_algebra_backend(std::string backend)
-{
-  if (backend == "uBLAS")
-  {
-    return true;
-  }
-  else if (backend == "PETSc")
-  {
-#ifdef HAS_PETSC
-    return true;
-#else
-    return false;
-#endif
-  }
-  else if (backend == "Epetra")
-  {
-#ifdef HAS_TRILINOS
-    return true;
-#else
-    return false;
-#endif
-  }
-  else if (backend == "MTL4")
-  {
-#ifdef HAS_MTL4
-    return true;
-#else
-    return false;
-#endif
-  }
-  else if (backend == "STL")
-  {
-    return true;
-  }
-  return false;
-}
+bool has_linear_algebra_backend(std::string backend);
 
+#endif
 
=== modified file 'site-packages/dolfin_utils/meshconvert.py'
--- site-packages/dolfin_utils/meshconvert.py	2011-07-11 15:55:33 +0000
+++ site-packages/dolfin_utils/meshconvert.py	2011-10-16 00:46:23 +0000
@@ -742,7 +742,7 @@
 def write_header_meshfunction(ofile, dimensions, size):
     header = """<?xml version="1.0" encoding="UTF-8"?>
 <dolfin xmlns:dolfin="http://www.fenics.org/dolfin/">
-  <meshfunction type="uint" dim="%d" size="%d">
+  <mesh_function type="uint" dim="%d" size="%d">
 """ % (dimensions, size)
     ofile.write(header)
 
@@ -751,7 +751,7 @@
 """ % (index, value))
 
 def write_footer_meshfunction(ofile):
-    ofile.write("""  </meshfunction>
+    ofile.write("""  </mesh_function>
 </dolfin>""")
 
 def diffpack2xml(ifilename, ofilename):
@@ -763,9 +763,9 @@
     meshfunction_header = """\
 <?xml version="1.0" encoding="UTF-8"?>\n
 <dolfin xmlns:dolfin="http://www.fenics.org/dolfin/">
-  <meshfunction type="uint" dim="%d" size="%d">\n"""
+  <mesh_function type="uint" dim="%d" size="%d">\n"""
     meshfunction_entity = "    <entity index=\"%d\" value=\"%d\"/>\n"
-    meshfunction_footer = "  </meshfunction>\n</dolfin>"
+    meshfunction_footer = "  </mesh_function>\n</dolfin>"
 
     # Open files
     ifile = open(ifilename, "r")