Changeset 12481

Timestamp:

06/20/12 14:49:59 (13 years ago)

Author:

utke

Message:

these are supposed to be non-differentiable (confirmed w M. Morlighem)

Location:

issm/trunk-jpl/src/c/objects/Gauss

Files:

• GaussTria.cpp (modified) (3 diffs)
• GaussTria.h (modified) (2 diffs)

issm/trunk-jpl/src/c/objects/Gauss/GaussTria.cpp

@@ -51 +51 @@
 
         /*Allocate GaussTria fields*/
-        coords1=xNew<IssmDouble>(numgauss*sizeof(IssmDouble));
-        coords2=xNew<IssmDouble>(numgauss*sizeof(IssmDouble));
-        coords3=xNew<IssmDouble>(numgauss*sizeof(IssmDouble));
-        weights=xNew<IssmDouble>(numgauss*sizeof(IssmDouble));
+        coords1=xNew<IssmPDouble>(numgauss);
+        coords2=xNew<IssmPDouble>(numgauss);
+        coords3=xNew<IssmPDouble>(numgauss);
+        weights=xNew<IssmPDouble>(numgauss);
 
         /*Reverse index1 and 2 if necessary*/
@@ -97 +97 @@
 /*FUNCTION GaussTria::~GaussTria(){{{*/
 GaussTria::~GaussTria(){
-        xDelete<IssmDouble>(weights);
-        xDelete<IssmDouble>(coords1);
-        xDelete<IssmDouble>(coords2);
-        xDelete<IssmDouble>(coords3);
+        xDelete<IssmPDouble>(weights);
+        xDelete<IssmPDouble>(coords1);
+        xDelete<IssmPDouble>(coords2);
+        xDelete<IssmPDouble>(coords3);
 }
 /*}}}*/
@@ -199 +199 @@
 /*}}}*/
 /*FUNCTION GaussTria::GaussFromCoords{{{*/
-void GaussTria::GaussFromCoords(IssmDouble x,IssmDouble y,IssmDouble* xyz_list){
+void GaussTria::GaussFromCoords(IssmPDouble x,IssmPDouble y,IssmPDouble* xyz_list){
 
         /*Intermediaries*/
-        IssmDouble    area = 0;
-        IssmDouble    x1,y1,x2,y2,x3,y3;
+        IssmPDouble    area = 0;
+        IssmPDouble    x1,y1,x2,y2,x3,y3;
 
         /*in debugging mode: check that the default constructor has been called*/

issm/trunk-jpl/src/c/objects/Gauss/GaussTria.h

@@ -15 +15 @@
         private:
                 int numgauss;
-                IssmDouble* weights;
-                IssmDouble* coords1;
-                IssmDouble* coords2;
-                IssmDouble* coords3;
+                IssmPDouble* weights;
+                IssmPDouble* coords1;
+                IssmPDouble* coords2;
+                IssmPDouble* coords3;
 
         public:
-                IssmDouble weight;
-                IssmDouble coord1;
-                IssmDouble coord2;
-                IssmDouble coord3;
+                IssmPDouble weight;
+                IssmPDouble coord1;
+                IssmPDouble coord2;
+                IssmPDouble coord3;
                 
         public:
@@ -38 +38 @@
                 int  end(void);
                 void Echo(void);
-                void GaussFromCoords(IssmDouble x1,IssmDouble y1,IssmDouble* xyz_list);
+                void GaussFromCoords(IssmPDouble x1,IssmPDouble y1,IssmPDouble* xyz_list);
                 void GaussPoint(int ig);
                 void GaussVertex(int iv);