Changeset 14780

Timestamp:

04/26/13 21:24:22 (12 years ago)

Author:

utke

Message:

CHG: change declarations of new logic to passive or else values should be assigned to the active members of GaussTria rather than the passive ones. Not sure what the inte is here but without this change the AD-endabled compile fails altogether

Location:

issm/trunk-jpl/src/c/classes/gauss

Files:

• GaussTria.cpp (modified) (2 diffs)
• GaussTria.h (modified) (1 diff)

issm/trunk-jpl/src/c/classes/gauss/GaussTria.cpp

@@ -94 +94 @@
 /*}}}*/
 /*FUNCTION GaussTria::GaussTria(int index,double r1,double r2,int order) {{{*/
-GaussTria::GaussTria(int index,IssmDouble r1,IssmDouble r2,bool mainlyfloating,int order){
+GaussTria::GaussTria(int index,IssmPDouble r1,IssmPDouble r2,bool mainlyfloating,int order){
 
         /*
@@ -112 +112 @@
          */
         int         ig;
-        IssmDouble x,y;
-        IssmDouble xy_list[3][2];
+        IssmPDouble x,y;
+        IssmPDouble xy_list[3][2];
 
         if(mainlyfloating){

issm/trunk-jpl/src/c/classes/gauss/GaussTria.h

@@ -32 +32 @@
                 GaussTria(int order);
                 GaussTria(int index1,int index2,int order);
-                GaussTria(int index,IssmDouble r1, IssmDouble r2,bool maintlyfloating,int order);
+                GaussTria(int index,IssmPDouble r1, IssmPDouble r2,bool maintlyfloating,int order);
                 ~GaussTria();