Changeset 12472 for issm/trunk-jpl/src/c/objects/Loads/Numericalflux.cpp

Timestamp:

06/20/12 09:19:54 (13 years ago)

Author:

utke

Message:

type renames

File:

• issm/trunk-jpl/src/c/objects/Loads/Numericalflux.cpp (modified) (10 diffs)

issm/trunk-jpl/src/c/objects/Loads/Numericalflux.cpp

@@ -60 +60 @@
 
         /*First, see wether this is an internal or boundary edge (if e2=NaN)*/
-        if (isnan((double)iomodel->Data(MeshEdgesEnum)[4*i+3])){ //edges are [node1 node2 elem1 elem2]
+        if (isnan((IssmDouble)iomodel->Data(MeshEdgesEnum)[4*i+3])){ //edges are [node1 node2 elem1 elem2]
                 /* Boundary edge, only one element */
                 e1=(int)iomodel->Data(MeshEdgesEnum)[4*i+2];
@@ -312 +312 @@
 /*}}}*/
 /*FUNCTION Numericalflux::PenaltyCreateKMatrix {{{*/
-void  Numericalflux::PenaltyCreateKMatrix(Matrix* Kff, Matrix* Kfs,double kmax){
+void  Numericalflux::PenaltyCreateKMatrix(Matrix* Kff, Matrix* Kfs,IssmDouble kmax){
 
         /*No stiffness loads applied, do nothing: */
@@ -320 +320 @@
 /*}}}*/
 /*FUNCTION Numericalflux::PenaltyCreatePVector{{{*/
-void  Numericalflux::PenaltyCreatePVector(Vector* pf,double kmax){
+void  Numericalflux::PenaltyCreatePVector(Vector* pf,IssmDouble kmax){
 
         /*No penalty loads applied, do nothing: */
@@ -359 +359 @@
         /* Intermediaries*/
         int        i,j,ig,index1,index2;
-        double     DL1,DL2,Jdet,dt,vx,vy,UdotN;
-        double     xyz_list[NUMVERTICES_INTERNAL][3];
-        double     normal[2];
-        double     B[numdof];
-        double     Bprime[numdof];
-        double     Ke_g1[numdof][numdof];
-        double     Ke_g2[numdof][numdof];
+        IssmDouble     DL1,DL2,Jdet,dt,vx,vy,UdotN;
+        IssmDouble     xyz_list[NUMVERTICES_INTERNAL][3];
+        IssmDouble     normal[2];
+        IssmDouble     B[numdof];
+        IssmDouble     Bprime[numdof];
+        IssmDouble     Ke_g1[numdof][numdof];
+        IssmDouble     Ke_g2[numdof][numdof];
         GaussTria *gauss;
 
@@ -424 +424 @@
         /* Intermediaries*/
         int        i,j,ig,index1,index2;
-        double     DL,Jdet,dt,vx,vy,mean_vx,mean_vy,UdotN;
-        double     xyz_list[NUMVERTICES_BOUNDARY][3];
-        double     normal[2];
-        double     L[numdof];
-        double     Ke_g[numdof][numdof];
+        IssmDouble     DL,Jdet,dt,vx,vy,mean_vx,mean_vy,UdotN;
+        IssmDouble     xyz_list[NUMVERTICES_BOUNDARY][3];
+        IssmDouble     normal[2];
+        IssmDouble     L[numdof];
+        IssmDouble     Ke_g[numdof][numdof];
         GaussTria *gauss;
 
@@ -512 +512 @@
         /* Intermediaries*/
         int        i,j,ig,index1,index2;
-        double     DL1,DL2,Jdet,vx,vy,UdotN;
-        double     xyz_list[NUMVERTICES_INTERNAL][3];
-        double     normal[2];
-        double     B[numdof];
-        double     Bprime[numdof];
-        double     Ke_g1[numdof][numdof];
-        double     Ke_g2[numdof][numdof];
+        IssmDouble     DL1,DL2,Jdet,vx,vy,UdotN;
+        IssmDouble     xyz_list[NUMVERTICES_INTERNAL][3];
+        IssmDouble     normal[2];
+        IssmDouble     B[numdof];
+        IssmDouble     Bprime[numdof];
+        IssmDouble     Ke_g1[numdof][numdof];
+        IssmDouble     Ke_g2[numdof][numdof];
         GaussTria *gauss;
 
@@ -576 +576 @@
         /* Intermediaries*/
         int        i,j,ig,index1,index2;
-        double     DL,Jdet,vx,vy,mean_vx,mean_vy,UdotN;
-        double     xyz_list[NUMVERTICES_BOUNDARY][3];
-        double     normal[2];
-        double     L[numdof];
-        double     Ke_g[numdof][numdof];
+        IssmDouble     DL,Jdet,vx,vy,mean_vx,mean_vy,UdotN;
+        IssmDouble     xyz_list[NUMVERTICES_BOUNDARY][3];
+        IssmDouble     normal[2];
+        IssmDouble     L[numdof];
+        IssmDouble     Ke_g[numdof][numdof];
         GaussTria *gauss;
 
@@ -703 +703 @@
         /* Intermediaries*/
         int        i,j,ig,index1,index2;
-        double     DL,Jdet,dt,vx,vy,mean_vx,mean_vy,UdotN,thickness;
-        double     xyz_list[NUMVERTICES_BOUNDARY][3];
-        double     normal[2];
-        double     L[numdof];
+        IssmDouble     DL,Jdet,dt,vx,vy,mean_vx,mean_vy,UdotN,thickness;
+        IssmDouble     xyz_list[NUMVERTICES_BOUNDARY][3];
+        IssmDouble     normal[2];
+        IssmDouble     L[numdof];
         GaussTria *gauss;
 
@@ -797 +797 @@
         /* Intermediaries*/
         int        i,j,ig,index1,index2;
-        double     DL,Jdet,vx,vy,mean_vx,mean_vy,UdotN,thickness;
-        double     xyz_list[NUMVERTICES_BOUNDARY][3];
-        double     normal[2];
-        double     L[numdof];
+        IssmDouble     DL,Jdet,vx,vy,mean_vx,mean_vy,UdotN,thickness;
+        IssmDouble     xyz_list[NUMVERTICES_BOUNDARY][3];
+        IssmDouble     normal[2];
+        IssmDouble     L[numdof];
         GaussTria *gauss;
 
@@ -864 +864 @@
 /*}}}*/
 /*FUNCTION Numericalflux::GetNormal {{{*/
-void Numericalflux:: GetNormal(double* normal,double xyz_list[4][3]){
+void Numericalflux:: GetNormal(IssmDouble* normal,IssmDouble xyz_list[4][3]){
 
         /*Build unit outward pointing vector*/
-        double vector[2];
-        double norm;
+        IssmDouble vector[2];
+        IssmDouble norm;
 
         vector[0]=xyz_list[1][0] - xyz_list[0][0];