Changeset 15538 for issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

Timestamp:

07/22/13 14:03:58 (12 years ago)

Author:

seroussi

Message:

NEW: added front in element for Pattyn and Stokes

File:

• issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

@@ -3165 +3165 @@
         }
 
-        return NULL;
         /*If no front, return NULL*/
         if(!isfront) return NULL;
@@ -3200 +3199 @@
                 thickness_input->GetInputValue(&thickness,gauss);
                 bed_input->GetInputValue(&bed,gauss);
+                GetSegmentJacobianDeterminant(&Jdet,&xyz_list_front[0][0],gauss);
+                GetNodalFunctions(basis,gauss);
 
                 surface_under_water=min(0.,thickness+bed); // 0 if the top of the glacier is above water level
@@ -3206 +3207 @@
                 ice_pressure=1.0/2.0*gravity*rho_ice*pow(thickness,2);
                 air_pressure=0;
-
                 pressure = ice_pressure + water_pressure + air_pressure;
-
-                GetSegmentJacobianDeterminant(&Jdet,&xyz_list_front[0][0],gauss);
-                GetNodalFunctions(basis,gauss);
 
                 for (int i=0;i<numnodes;i++){