Changeset 4926

Timestamp:

08/02/10 13:22:55 (15 years ago)

Author:

seroussi

Message:

hutter penta now working

File:

• issm/trunk/src/c/objects/Elements/Penta.cpp (modified) (3 diffs)

issm/trunk/src/c/objects/Elements/Penta.cpp

@@ -3377 +3377 @@
         double   ub,vb;
         double   surface,thickness;
-        double   slopex,slopey;
 
         /*flags: */
@@ -3428 +3427 @@
         /*Loop on the three segments*/
         for(i=0;i<3;i++){
-                slopex_input->GetParameterValue(&slopex, &gauss[i][0]);
-                slopey_input->GetParameterValue(&slopey, &gauss[i][0]);
+                slopex_input->GetParameterValue(&slope[0], &gauss[i][0]);
+                slopey_input->GetParameterValue(&slope[1], &gauss[i][0]);
                 surface_input->GetParameterValue(&surface, &gauss[i][0]);
                 thickness_input->GetParameterValue(&thickness, &gauss[i][0]);
 
                 //compute slope2 slopex and slopey
-                slope2=pow(slopex,2)+pow(slopey,2);
+                slope2=pow(slope[0],2)+pow(slope[1],2);
 
                 //%compute constant_part
@@ -3477 +3476 @@
                         //compute ub
                         constant_part=-1.58*pow((double)10.0,-(double)10.0)*rho_ice*gravity*thickness;
-                        ub=constant_part*slopex;
-                        vb=constant_part*slopey;
+                        ub=constant_part*slope[0];
+                        vb=constant_part*slope[1];
 
                         //Add to pe: