Changeset 4452

Timestamp:

07/07/10 16:56:31 (15 years ago)

Author:

seroussi

Message:

some fixing in icefront

Location:

issm/trunk/src/c

Files:

• objects/Loads/Icefront.cpp (modified) (3 diffs)
• solutions/stokescontrolinit.cpp (modified) (1 diff)

issm/trunk/src/c/objects/Loads/Icefront.cpp

@@ -641 +641 @@
         Node**   nodes=NULL;
         Element* element=NULL;
-        int     element_type;
-                
 
         /*quad grids: */
@@ -664 +662 @@
         
         /*check icefront is associated to a pentaelem: */
-        if(element_type!=PentaEnum){
-                ISSMERROR(" quad icefront is associated to a TriaElem!");
-        }
+        if(element->Enum()!=PentaEnum) ISSMERROR("Only Penta supported yet");
 
         /* Get dof list and node coordinates: */
@@ -673 +669 @@
         
         //Identify which grids are comprised in the quad: 
-        if(element_type==PentaEnum)element_nodes=(Node**)xmalloc(6*sizeof(Node*));
+        element_nodes=(Node**)xmalloc(6*sizeof(Node*));
         element->GetNodes((void**)element_nodes);
 

issm/trunk/src/c/solutions/stokescontrolinit.cpp

@@ -51 +51 @@
 
         if(verbose)_printf_("%s\n"," update boundary conditions for stokes using velocities previously computed...");
-        ResetBoundaryConditions(femmodel,DiagnosticAnalysisEnum,StokesAnalysisEnum);
+        ResetBoundaryConditions(femmodel,DiagnosticStokesAnalysisEnum);
 
         if(verbose)_printf_("%s\n"," computing stokes velocities and pressure ...");