Changeset 15396 for issm/trunk/src/c/shared/Numerics/GaussPoints.cpp

Timestamp:

07/02/13 09:24:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 15394

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/c/shared/Numerics/GaussPoints.cpp (modified) (11 diffs)

issm/trunk

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache

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

@@ -1 +1 @@
 /*  Gauss point structures and prototypes  */
-
-#include "../../include/include.h"
-#include "./GaussPoints.h"
-#include "../Alloc/alloc.h"
-#include "../Exceptions/exceptions.h"
 #include <math.h>
 #include <float.h>
+
+#include "./GaussPoints.h"
+#include "../MemOps/MemOps.h"
+#include "../Exceptions/exceptions.h"
+#include "../Numerics/constants.h"
 
 /*General Gauss points*/
@@ -50 +50 @@
                 sizeof(wgt4 )/sizeof(IssmPDouble)};
 
-        //      _pprintLine_("Gauss-Legendre recurrence coefficients ngaus=" << ngaus);
+        //      _printf0_("Gauss-Legendre recurrence coefficients ngaus=" << ngaus << "\n");
         *pxgaus =xNew<IssmPDouble>(ngaus);
         *pxwgt  =xNew<IssmPDouble>(ngaus);
@@ -88 +88 @@
 }/*}}}*/
 /*FUNCTION GaussLegendreTria{{{*/
-void GaussLegendreTria( int* pngaus, IssmPDouble** pl1, IssmPDouble** pl2, IssmPDouble** pl3, IssmPDouble** pwgt, int iord ) {
+void GaussLegendreTria( int* pngaus, IssmDouble** pl1, IssmDouble** pl2, IssmDouble** pl3, IssmDouble** pwgt, int iord ) {
         /*Gauss quadrature points for the triangle.
 
@@ -413 +413 @@
                 0.116251915907597, 0.025734050548330, 0.025734050548330};
         /*}}}*/
-        /*  p=13, npoint=37  {{{*/
+        /*p=13, npoint=37  {{{*/
         static IssmPDouble wgt13[]={
                 0.090968907790622, 0.019537784619314, 0.019537784619314, 
@@ -771 +771 @@
                 0.014663182224828};
         /*}}}*/
-        /*  p=18, npoint=70  {{{*/
+        /*p=18, npoint=70  {{{*/
 
         static IssmPDouble wgt18[]={
@@ -1138 +1138 @@
                 sizeof(wgt20)/sizeof(IssmPDouble)};
 
-        //      _pprintLine_("GaussLegendreTria: iord=" << iord);
+        //      _printf0_("GaussLegendreTria: iord=" << iord << "\n");
 
         /*  check to see if Gauss points need to be calculated  */
@@ -1149 +1149 @@
                 *pngaus=np[iord-1];
 
-                *pl1  =xNew<IssmPDouble>(*pngaus);
-                *pl2  =xNew<IssmPDouble>(*pngaus);
-                *pl3  =xNew<IssmPDouble>(*pngaus);
-                *pwgt =xNew<IssmPDouble>(*pngaus);
+                *pl1  =xNew<IssmDouble>(*pngaus);
+                *pl2  =xNew<IssmDouble>(*pngaus);
+                *pl3  =xNew<IssmDouble>(*pngaus);
+                *pwgt =xNew<IssmDouble>(*pngaus);
 
                 for (i=0; i<*pngaus; i++) {
@@ -1167 +1167 @@
                 *pngaus=nigaus*nigaus;
 
-                *pl1  =xNew<IssmPDouble>(*pngaus);
-                *pl2  =xNew<IssmPDouble>(*pngaus);
-                *pl3  =xNew<IssmPDouble>(*pngaus);
-                *pwgt =xNew<IssmPDouble>(*pngaus);
+                *pl1  =xNew<IssmDouble>(*pngaus);
+                *pl2  =xNew<IssmDouble>(*pngaus);
+                *pl3  =xNew<IssmDouble>(*pngaus);
+                *pwgt =xNew<IssmDouble>(*pngaus);
 
                 /*  get the gauss points in each direction  */
@@ -1198 +1198 @@
         }
 
-        //      _pprintLine_("GaussLegendreTria - ngaus=" << *pngaus);
+        //      _printf0_("GaussLegendreTria - ngaus=" << *pngaus << "\n");
         //      for (i=0; i<*pngaus; i++)
-        //              _printf_(true,"i=%d: l1gaus=%f,l2gaus=%f,l3gaus=%f,wgt=%f\n",
-        //                               i,(*pl1 )[i],(*pl2 )[i],(*pl3 )[i],(*pwgt)[i]);
+        //              _printf0_("i=" << i << ": l1gaus=" << (*pl1 )[i] << ",l2gaus=" << (*pl2 )[i] << ",l3gaus=" << (*pl3 )[i]<< ",wgt=" << (*pwgt)[i]<< "\n\n");
 
         return;
@@ -1397 +1396 @@
                 sizeof(wgt6 )/sizeof(IssmPDouble)};
 
-        //      _pprintLine_("GaussLegendreTetra: iord=" << iord);
+        //      _printf0_("GaussLegendreTetra: iord=" << iord << "\n");
 
         /*  check to see if Gauss points need to be calculated  */
@@ -1520 +1519 @@
                 sizeof(wgt5 )/sizeof(IssmPDouble)};
 
-        //      _pprintLine_("Gauss-Lobatto recurrence coefficients ngaus=" << ngaus);
+        //      _printf0_("Gauss-Lobatto recurrence coefficients ngaus=" << ngaus << "\n");
         *pxgaus =xNew<IssmPDouble>(ngaus);
         *pxwgt  =xNew<IssmPDouble>(ngaus);

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache