Changeset 1313

Timestamp:

07/14/09 14:56:43 (15 years ago)

Author:

Eric.Larour

Message:

Bypassing of standard routines for elements on water

File:

• issm/trunk/src/c/objects/Penta.cpp (modified) (17 diffs)

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

@@ -672 +672 @@
         Tria*  tria=NULL;
 
+        /*If on water, skip stiffness: */
+        if(onwater)return;
+
         /*recover pointers: */
         inputs=(ParameterInputs*)vinputs;
@@ -1099 +1102 @@
         ParameterInputs* inputs=NULL;
 
+        /*If on water, skip: */
+        if(onwater)return;
+
         /*recover pointers: */
         inputs=(ParameterInputs*)vinputs;
@@ -1180 +1186 @@
         int i;
         Tria* tria=NULL;
+
+        /*If on water, skip: */
+        if(onwater)return;
         
         /*Bail out if this element if:
@@ -1227 +1236 @@
         Tria* tria=NULL;
 
+        /*If on water, skip: */
+        if(onwater)return;
+
         /*Bail out if this element does not touch the bedrock: */
         if (!onbed) return;
@@ -1254 +1266 @@
 
         Tria* tria=NULL;
+
+        /*If on water, skip: */
+        if(onwater)return;
 
         if (collapse){
@@ -2218 +2233 @@
         inputs=(ParameterInputs*)vinputs;
 
+        /*If on water, skip: */
+        if(onwater)return;
+
         /*If we are on the bedrock, spawn a tria on the bedrock, and use it to build the 
          *diagnostic base vertical stifness: */
@@ -2317 +2335 @@
         double rho_ice,g;
         double       xyz_list[numgrids][3];
+
+        /*If on water, skip: */
+        if(onwater)return;
                 
         /*Get node data: */
@@ -2347 +2368 @@
         /*Collapsed formulation: */
         Tria*  tria=NULL;
+
+        /*If on water, skip: */
+        if(onwater)return;
         
         /*Is this element on the bed? :*/
@@ -2366 +2390 @@
         /*Collapsed formulation: */
         Tria*  tria=NULL;
+
+        /*If on water, skip: */
+        if(onwater)return;
         
         /*Is this element on the bed? :*/
@@ -2384 +2411 @@
         /*Collapsed formulation: */
         Tria*  tria=NULL;
+
+        /*If on water, skip: */
+        if(onwater)return;
         
         /*Is this element on the bed? :*/
@@ -2403 +2433 @@
         /*Collapsed formulation: */
         Tria*  tria=NULL;
+
+        /*If on water, skip: */
+        if(onwater)return;
         
         /*Is this element on the bed? :*/
@@ -3333 +3366 @@
 #define __FUNCT__ "Penta::CreateKMatrixThermal"
 void  Penta::CreateKMatrixThermal(Mat Kgg,void* vinputs,int analysis_type,int sub_analysis_type){
-
+        
         /* local declarations */
         int i,j;
@@ -3405 +3438 @@
         ParameterInputs* inputs=NULL;
 
+        /*If on water, skip: */
+        if(onwater)return;
+
         /*recover pointers: */
         inputs=(ParameterInputs*)vinputs;
@@ -3530 +3566 @@
         }
 
+
         /*Add Ke_gg to global matrix Kgg: */
         MatSetValues(Kgg,numdof,doflist,numdof,doflist,(const double*)K_terms,ADD_VALUES);
@@ -3658 +3695 @@
         
         Tria* tria=NULL;
+        
+        /*If on water, skip: */
+        if(onwater)return;
+
         if (!onbed){
                 return;
@@ -3745 +3786 @@
         ParameterInputs* inputs=NULL;
 
+        /*If on water, skip: */
+        if(onwater)return;
+
         /*recover pointers: */
         inputs=(ParameterInputs*)vinputs;
@@ -3853 +3897 @@
                 delete tria;
         }
+        extern int my_rank;
 
         cleanup_and_return: