Changeset 10052 for issm/trunk/src/c/solutions/controltao_core.cpp

Timestamp:

10/03/11 12:18:36 (13 years ago)

Author:

Mathieu Morlighem

Message:

TAO not supported for petsc 3.2

File:

• issm/trunk/src/c/solutions/controltao_core.cpp (modified) (3 diffs)

issm/trunk/src/c/solutions/controltao_core.cpp

@@ -2 +2 @@
  * \brief: core of the control solution 
  */ 
+#include <config.h>
 #include "../toolkits/toolkits.h"
 #include "../objects/objects.h"
@@ -13 +14 @@
 
 
-#ifdef _HAVE_TAO_
+#if defined (_HAVE_TAO_) && (_PETSC_MAJOR_ < 3 || (_PETSC_MAJOR_ == 3 && _PETSC_MINOR_ < 2))
 #include "tao.h"
 
@@ -135 +136 @@
 #else
 void controltao_core(FemModel* femmodel){
-        _error_("TAO not installed");
+        _error_("TAO not installed or PETSc version not supported");
 }
 #endif //_HAVE_TAO_