]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Conditionalize the workaround for the Trilinos crash on not being on Mac OS X.
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Tue, 8 Dec 2009 04:28:19 +0000 (04:28 +0000)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Tue, 8 Dec 2009 04:28:19 +0000 (04:28 +0000)
git-svn-id: https://svn.dealii.org/trunk@20210 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/base/source/utilities.cc

index 6dd3470dd50fa1e91220d9bad8f3f8d9ef5d5e60..e543ee3838477aaf26f525cd8f5c0dc2d9ea74d2 100644 (file)
@@ -582,7 +582,7 @@ namespace Utilities
     {
 #ifdef DEAL_II_COMPILER_SUPPORTS_MPI
 
-#  ifdef DEAL_II_USE_TRILINOS
+#  if defined(DEAL_II_USE_TRILINOS) && !defined(__APPLE__)
                                       // make memory pool release all
                                       // vectors that are no longer
                                       // used at this point. this is
@@ -592,6 +592,17 @@ namespace Utilities
                                       // the program would run after
                                       // MPI_Finalize is called,
                                       // leading to errors
+                                      //
+                                      // TODO: On Mac OS X, shared libs can
+                                      // only depend on other libs listed
+                                      // later on the command line. This
+                                      // means that libbase can't depend on
+                                      // liblac, and we can't destroy the
+                                      // memory pool here as long as we have
+                                      // separate libraries. Consequently,
+                                      // the #ifdef above. Deal will then
+                                      // just continue to seg fault upon
+                                      // completion of main()
       GrowingVectorMemory<TrilinosWrappers::MPI::Vector>
        ::release_unused_memory ();
       GrowingVectorMemory<TrilinosWrappers::MPI::BlockVector>

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.