[Getfem-commits] r5094 - in /trunk/getfem: doc/sphinx/source/.templates/ src/ src/getfem/

[Yves . Renard]

Author: renard
Date: Thu Oct  8 17:54:45 2015
New Revision: 5094

URL: http://svn.gna.org/viewcvs/getfem?rev=5094&view=rev
Log:
minor changes

Modified:
    trunk/getfem/doc/sphinx/source/.templates/download.html
    trunk/getfem/src/Makefile.am
    trunk/getfem/src/getfem/getfem_copyable_ptr.h
    trunk/getfem/src/getfem_generic_assembly.cc

Modified: trunk/getfem/doc/sphinx/source/.templates/download.html
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/doc/sphinx/source/.templates/download.html?rev=5094&r1=5093&r2=5094&view=diff
==============================================================================
--- trunk/getfem/doc/sphinx/source/.templates/download.html     (original)
+++ trunk/getfem/doc/sphinx/source/.templates/download.html     Thu Oct  8 
17:54:45 2015
@@ -36,11 +36,14 @@
 
 <ul>
   <li>Linux with g++ 4.8.x</li>
-  <li>MacOS X (with the python and matlab interface)</li>
+  <li>MacOS X (with the python interface)</li>
   <li>Windows with <a href="http://www.mingw.org";>MinGW</a> and
   <a href="http://www.mingw.org/wiki/msys";>MSys</a>
   ({{ project }} only -- see specific notes for the matlab interface)</li>
 </ul>
+
+<p>Concerning the compilation on MacOS X, the simplest seems to install the 
package qhull and eventually the sequential version of Mumps with the package 
manager Homebrew. For the python interface, python 2 should be installed with 
numpy and scipy packages (you can use pip to install them). The compilation of 
the python interface may fail. Go to interface/src/python directory and try to 
add the right libraries to build the _getfem.so dynamic library.
+</p>
 
 <p>You can find some help on how to build the Matlab interface on <a 
href="http://windhoff.net/wiki/how_to/build_getfem_matlab_toolbox_on_windows_xp";>Windows
 XP</a> and <a 
href="http://windhoff.net/wiki/how_to/build_getfem_matlab_toolbox_on_ubuntu_linux";>Ubuntu</a>
 on the page of Mirko Windhoff.
 </p>

Modified: trunk/getfem/src/Makefile.am
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/Makefile.am?rev=5094&r1=5093&r2=5094&view=diff
==============================================================================
--- trunk/getfem/src/Makefile.am        (original)
+++ trunk/getfem/src/Makefile.am        Thu Oct  8 17:54:45 2015
@@ -87,6 +87,7 @@
        getfem/bgeot_comma_init.h                       \
        getfem/bgeot_ftool.h                            \
        getfem/getfem_arch_config.h                     \
+       getfem/getfem_copyable_ptr.h                    \
        getfem/getfem_integration.h                     \
        getfem/getfem_assembling.h                      \
        getfem/getfem_assembling_tensors.h              \

Modified: trunk/getfem/src/getfem/getfem_copyable_ptr.h
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem/getfem_copyable_ptr.h?rev=5094&r1=5093&r2=5094&view=diff
==============================================================================
--- trunk/getfem/src/getfem/getfem_copyable_ptr.h       (original)
+++ trunk/getfem/src/getfem/getfem_copyable_ptr.h       Thu Oct  8 17:54:45 2015
@@ -36,6 +36,7 @@
 #pragma once
 
 #include <memory>
+#include <cstddef>
 
 namespace getfem {
 
@@ -43,7 +44,7 @@
   A wrapper around a unique_ptr that clones the value on copy
 */
 template<class T> class copyable_ptr{
-  std::unique_ptr<T> p_ = nullptr;
+  std::unique_ptr<T> p_ = std::unique_ptr<T>(nullptr);
 public:
   copyable_ptr() = default;
 
@@ -70,4 +71,4 @@
   T& operator->() const {return *p_;}
 };
 
-} // namespace getfem
+} // namespace getfem

Modified: trunk/getfem/src/getfem_generic_assembly.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_generic_assembly.cc?rev=5094&r1=5093&r2=5094&view=diff
==============================================================================
--- trunk/getfem/src/getfem_generic_assembly.cc (original)
+++ trunk/getfem/src/getfem_generic_assembly.cc Thu Oct  8 17:54:45 2015
@@ -1991,7 +1991,7 @@
     std::string derivative1_, derivative2_;
     mutable omp_distribute<base_vector> t, u;
     mutable omp_distribute<ga_workspace> workspace;
-    copyable_ptr<omp_distribute<ga_instruction_set>> gis = nullptr;
+    copyable_ptr<omp_distribute<ga_instruction_set>> gis;
 
     friend void ga_define_function(const std::string name, size_type nbargs,
                                    const std::string expr, const std::string 
der1,
@@ -2041,17 +2041,17 @@
     pscalar_func_twoargs f2() const {return f2_;}
 
     ga_predef_function(void) : expr_(""), derivative1_(""), derivative2_(""), 
gis(nullptr) {}
-    ga_predef_function(pscalar_func_onearg f, size_type dtype_ = 0,
+    ga_predef_function(pscalar_func_onearg f, size_type dtype__ = 0,
                        const std::string &der = "")
-      : ftype_(0), dtype_(dtype_), nbargs_(1), f1_(f), expr_(""),
+      : ftype_(0), dtype_(dtype__), nbargs_(1), f1_(f), expr_(""),
         derivative1_(der), derivative2_("") {}
-    ga_predef_function(pscalar_func_twoargs f, size_type dtype_ = 0,
+    ga_predef_function(pscalar_func_twoargs f, size_type dtype__ = 0,
                        const std::string &der1 = "",
                        const std::string &der2 = "")
-      : ftype_(0), dtype_(dtype_), nbargs_(2), f2_(f),
+      : ftype_(0), dtype_(dtype__), nbargs_(2), f2_(f),
         expr_(""), derivative1_(der1), derivative2_(der2), gis(nullptr) {}
-    ga_predef_function(const std::string &expr_)
-      : ftype_(1), dtype_(3), nbargs_(1), expr_(expr_),
+    ga_predef_function(const std::string &expr__)
+      : ftype_(1), dtype_(3), nbargs_(1), expr_(expr__),
         derivative1_(""), derivative2_(""), t(1, 0.), u(1, 0.), gis(nullptr) {}
   };