Changeset 17116

Timestamp:

01/14/14 19:45:33 (11 years ago)

Author:

seroussi

Message:

CHG: improved analytical FS

File:

• issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp ¶

@@ -2750 +2750 @@
         /*Retrieve all inputs and parameters*/
         element->GetVerticesCoordinates(&xyz_list);
-        IssmDouble  rho_ice =element->GetMaterialParameter(MaterialsRhoIceEnum);
 
         /* Start  looping on the number of gaussian points: */
@@ -2764 +2763 @@
                 z_coord=element->GetZcoord(gauss);
 
-                forcex=fx(x_coord,y_coord,z_coord);
-                forcey=fy(x_coord,y_coord,z_coord);
-                forcez=fz(x_coord,y_coord,z_coord);
+                forcex=fx1(x_coord,y_coord,z_coord);
+                forcey=fy1(x_coord,y_coord,z_coord);
+                forcez=fz1(x_coord,y_coord,z_coord);
 
                 for(i=0;i<vnumnodes;i++){
-                        pe->values[i*dim+0] += +rho_ice*forcex *Jdet*gauss->weight*vbasis[i];
-                        pe->values[i*dim+1] += +rho_ice*forcey *Jdet*gauss->weight*vbasis[i];
-                        pe->values[i*dim+2] += +rho_ice*forcez *Jdet*gauss->weight*vbasis[i];
+                        pe->values[i*dim+0] += forcex *Jdet*gauss->weight*vbasis[i];
+                        pe->values[i*dim+1] += forcey *Jdet*gauss->weight*vbasis[i];
+                        pe->values[i*dim+2] += forcez *Jdet*gauss->weight*vbasis[i];
                 }
         }