Changeset 22445

Timestamp:

02/21/18 16:25:58 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: added if adolc for controlad to compile

Location:

issm/trunk-jpl/src/c/cores

Files:

• controladm1qn3_core.cpp (modified) (2 diffs)
• controlm1qn3_core.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/cores/controladm1qn3_core.cpp

@@ -11 +11 @@
 #include "../solutionsequences/solutionsequences.h"
 
-#if defined (_HAVE_M1QN3_) 
-//& !defined(_HAVE_ADOLC_)
+#if defined (_HAVE_M1QN3_) && defined(_HAVE_ADOLC_)
 /*m1qn3 prototypes*/
 extern "C" void *ctonbe_; // DIS mode : Conversion
@@ -467 +466 @@
 
 #else
-void controladm1qn3_core(FemModel* femmodel){_error_("M1QN3 not installed");}
+void controladm1qn3_core(FemModel* femmodel){_error_("M1QN3 or ADOLC not installed");}
 #endif //_HAVE_M1QN3_

issm/trunk-jpl/src/c/cores/controlm1qn3_core.cpp

@@ -11 +11 @@
 #include "../solutionsequences/solutionsequences.h"
 
-#if defined (_HAVE_M1QN3_) & !defined(_HAVE_ADOLC_)
+#if defined (_HAVE_M1QN3_) && !defined(_HAVE_ADOLC_)
 /*m1qn3 prototypes*/
 extern "C" void *ctonbe_; // DIS mode : Conversion