Changeset 17479

Timestamp:

03/19/14 12:22:11 (11 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixinf AD compilation, gauss tetra needs to have IssmDouble and not PDouble

Location:

issm/trunk-jpl/src/c/shared/Numerics

Files:

• GaussPoints.cpp (modified) (3 diffs)
• GaussPoints.h (modified) (1 diff)

issm/trunk-jpl/src/c/shared/Numerics/GaussPoints.cpp

@@ -1199 +1199 @@
 }/*}}}*/
 /*FUNCTION GaussLegendreTetra{{{*/
-void GaussLegendreTetra( int* pngaus, IssmPDouble** pl1, IssmPDouble** pl2, IssmPDouble** pl3, IssmPDouble** pl4, IssmPDouble** pwgt, int iord ) {
+void GaussLegendreTetra( int* pngaus, IssmDouble** pl1, IssmDouble** pl2, IssmDouble** pl3, IssmDouble** pl4, IssmDouble** pwgt, int iord ) {
         /* Gauss quadrature points for the tetrahedron.
 
@@ -1402 +1402 @@
                 *pngaus=np[iord-1];
 
-                *pl1  =xNew<IssmPDouble>(*pngaus);
-                *pl2  =xNew<IssmPDouble>(*pngaus);
-                *pl3  =xNew<IssmPDouble>(*pngaus);
-                *pl4  =xNew<IssmPDouble>(*pngaus);
-                *pwgt =xNew<IssmPDouble>(*pngaus);
+                *pl1  =xNew<IssmDouble>(*pngaus);
+                *pl2  =xNew<IssmDouble>(*pngaus);
+                *pl3  =xNew<IssmDouble>(*pngaus);
+                *pl4  =xNew<IssmDouble>(*pngaus);
+                *pwgt =xNew<IssmDouble>(*pngaus);
 
                 for (i=0; i<*pngaus; i++) {
@@ -1422 +1422 @@
                 *pngaus=nigaus*nigaus*nigaus;
 
-                *pl1  =xNew<IssmPDouble>(*pngaus);
-                *pl2  =xNew<IssmPDouble>(*pngaus);
-                *pl3  =xNew<IssmPDouble>(*pngaus);
-                *pl4  =xNew<IssmPDouble>(*pngaus);
-                *pwgt =xNew<IssmPDouble>(*pngaus);
+                *pl1  =xNew<IssmDouble>(*pngaus);
+                *pl2  =xNew<IssmDouble>(*pngaus);
+                *pl3  =xNew<IssmDouble>(*pngaus);
+                *pl4  =xNew<IssmDouble>(*pngaus);
+                *pwgt =xNew<IssmDouble>(*pngaus);
 
                 /*  get the gauss points in each direction  */

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

@@ -12 +12 @@
 void GaussLegendreTria(int* pngaus, IssmDouble** pl1, IssmDouble** pl2, IssmDouble** pl3, IssmDouble** pwgt, int iord);
 #define MAX_TETRA_SYM_ORD    6
-void GaussLegendreTetra(int* pngaus, IssmPDouble** pl1, IssmPDouble** pl2, IssmPDouble** pl3, IssmPDouble** pl4, IssmPDouble** pwgt, int iord);
+void GaussLegendreTetra(int* pngaus, IssmDouble** pl1, IssmDouble** pl2, IssmDouble** pl3, IssmDouble** pl4, IssmDouble** pwgt, int iord);
 #define MAX_LINE_GLOB_PTS    5
 void GaussLobatto(IssmPDouble** pxgaus, IssmPDouble** pxwgt, int ngaus);