source: issm/oecreview/Archive/12321-12677/ISSM-12577-12578.diff@ 12679

Last change on this file since 12679 was 12679, checked in by Mathieu Morlighem, 13 years ago

Added 12321-12677
File size: 970 bytes
RevLine 
[12679]1Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Solverx/SolverxGsl.cpp
2===================================================================
3--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Solverx/SolverxGsl.cpp (revision 12577)
4+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/modules/Solverx/SolverxGsl.cpp (revision 12578)
5@@ -42,7 +42,12 @@
6 gsl_vector_view b;
7 gsl_vector *x = NULL;
8 gsl_permutation *p = NULL;
9-
10+#ifdef _HAVE_ADOLC_
11+ // if we use Adol-C then the IssmDouble will be an adouble
12+ // and the calls to gsl_... will not work
13+ // and we should call a suitable wrapped solve instead
14+ _error2_("SolverxGsl: should not be here with Adol-C");
15+#else
16 /*A will be modified by LU decomposition. Use copy*/
17 IssmDouble* Acopy = xNew<IssmDouble>(n*n);
18 xMemCpy<IssmDouble>(Acopy,A,n*n);
19@@ -69,4 +74,5 @@
20 gsl_permutation_free(p);
21 gsl_vector_free(x);
22 *pX=X;
23+#endif
24 }/*}}}*/
Note: See TracBrowser for help on using the repository browser.