Changeset 26244

Timestamp:

05/06/21 08:03:10 (4 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixing CoDiPack

File:

• issm/trunk-jpl/src/c/shared/Numerics/types.h (modified) (1 diff)

issm/trunk-jpl/src/c/shared/Numerics/types.h

@@ -25 +25 @@
 /*ADOLC typedefs*/
 #include "adolc/adolc.h"
-typedef adouble  IssmDouble; /*for active variables*/
-typedef acomplex IssmComplex; /*for active variables*/
-typedef double   IssmPDouble; /*for passive variables*/
-typedef std::complex<double> IssmPComplex; /*for passive variables*/
+typedef adouble              IssmDouble;  /*for active variables*/
+typedef acomplex             IssmComplex; /*for active variables*/
+typedef double               IssmPDouble; /*for passive variables*/
+typedef std::complex<double> IssmPComplex;/*for passive variables*/
 
 #elif defined(_HAVE_CODIPACK_) && !defined(_WRAPPERS_)
 /*CoDiPack typedefs*/
 #include <codi.hpp>
-typedef codi::RealReverse    IssmDouble;
-//typedef codi::ComplexReverse IssmComplex; //not defined so far
-typedef std::complex<double>  IssmComplex; /*FIXME: this line is not correct*/
-typedef double               IssmPDouble;
-typedef std::complex<double>  IssmPComplex;
+typedef codi::RealReverse               IssmDouble;
+typedef std::complex<codi::RealReverse> IssmComplex;
+typedef double                          IssmPDouble;
+typedef IssmComplex                     IssmPComplex;
 
+#else 
 /*Non-AD typedefs*/
-#else 
-typedef double              IssmDouble; 
+typedef double               IssmDouble; 
 typedef std::complex<double> IssmComplex; 
-typedef IssmDouble          IssmPDouble;
-typedef IssmComplex         IssmPComplex;
+typedef IssmDouble           IssmPDouble;
+typedef IssmComplex          IssmPComplex;
 #endif