Changeset 1242

Timestamp:

07/07/09 08:39:27 (16 years ago)

Author:

Mathieu Morlighem

Message:

skip water element for stokes and CM also

Location:

issm/trunk/src/c/objects

Files:

• Penta.cpp (modified) (9 diffs)
• Tria.cpp (modified) (2 diffs)

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

@@ -372 +372 @@
 }
 
-
 #undef __FUNCT__ 
 #define __FUNCT__ "Penta:CreateKMatrixDiagnosticHoriz"
@@ -461 +460 @@
         /*If on water, skip stiffness: */
         if(onwater)return;
-
 
         /*recover pointers: */
@@ -789 +787 @@
         double         gravity,rho_ice,rho_water;
 
-        
         /*Collapsed formulation: */
         Tria*  tria=NULL;
@@ -844 +841 @@
         ParameterInputs* inputs=NULL;
 
+        /*If on water, skip stiffness: */
+        if(onwater)return;
+
         /*recover pointers: */
         inputs=(ParameterInputs*)vinputs;
@@ -1208 +1208 @@
 #define __FUNCT__ "Penta::Gradj"
 void  Penta::Gradj(Vec grad_g,void* inputs,int analysis_type,int sub_analysis_type,char* control_type){
+        
+        /*If on water, skip grad (=0): */
+        if(onwater)return;
 
         if (strcmp(control_type,"drag")==0){
@@ -1223 +1226 @@
         
         Tria* tria=NULL;
-        
+
         /*Bail out if this element does not touch the bedrock: */
         if (!onbed) return;
@@ -1279 +1282 @@
         Tria* tria=NULL;
         
+        /*If on water, return 0: */
+        if(onwater)return 0;
+
         /*Bail out if this element if:
          * -> Non collapsed and not on the surface
@@ -3026 +3032 @@
 void Penta::CreatePVectorDiagnosticStokes( Vec pg, void* vinputs,int analysis_type,int sub_analysis_type){
 
-
         /*indexing: */
         int i,j;
@@ -3092 +3097 @@
         ParameterInputs* inputs=NULL;
         Tria*            tria=NULL;
+
+        /*If on water, skip load: */
+        if(onwater)return;
 
         /*recover pointers: */

issm/trunk/src/c/objects/Tria.cpp

@@ -2219 +2219 @@
 void  Tria::Gradj(Vec grad_g,void* inputs,int analysis_type,int sub_analysis_type,char* control_type){
 
+        /*If on water, grad = 0: */
+        if(onwater)return;
+
         if (strcmp(control_type,"drag")==0){
                 GradjDrag( grad_g,inputs,analysis_type,sub_analysis_type);
@@ -2869 +2872 @@
         ParameterInputs* inputs=NULL;
 
+        /*If on water, return 0: */
+        if(onwater)return 0;
+
         /*recover pointers: */
         inputs=(ParameterInputs*)vinputs;