Changeset 4684

Timestamp:

07/21/10 07:50:16 (15 years ago)

Author:

Mathieu Morlighem

Message:

Do not add penalties and ice front if Stokes not activated

Location:

issm/trunk/src/c/objects/Loads

Files:

• Icefront.cpp (modified) (3 diffs)
• Pengrid.cpp (modified) (2 diffs)

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

@@ -654 +654 @@
         Node**   nodes=NULL;
         Element* element=NULL;
+        Penta*   penta=NULL;
 
         /*quad grids: */
@@ -668 +669 @@
         double v35[3];
         double v45[3];
+        bool isstokes;
 
         /*Recover hook objects: */
@@ -673 +675 @@
         element=(Element*)helement->delivers();
         nodes=(Node**)hnodes->deliverp();
-        
+
         /*check icefront is associated to a pentaelem: */
         if(element->Enum()!=PentaEnum) ISSMERROR("Only Penta supported yet");
+        penta=(Penta*)element;
+
+        /*If not Stokes, return*/
+        penta->inputs->GetParameterValue(&isstokes,IsStokesEnum);
+        if(!isstokes) return;
 
         /* Get dof list and node coordinates: */

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

@@ -558 +558 @@
         double Ke[4][4]={0.0};
         double penalty_offset;
+        bool isstokes;
 
         /*pointers: */
@@ -569 +570 @@
         node=(Node*)hnode->delivers();
         penta=(Penta*)helement->delivers();
+
+        /*If not Stokes, return*/
+        penta->inputs->GetParameterValue(&isstokes,IsStokesEnum);
+        if(!isstokes) return;
 
         //recover slope: */