Changeset 15230

Timestamp:

06/10/13 14:00:22 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: added AllActive function to Tria, that checks that all nodes are active

Location:

issm/trunk-jpl/src/c/classes

Files:

• Elements/Tria.cpp (modified) (3 diffs)
• Elements/Tria.h (modified) (1 diff)
• Node.cpp (modified) (1 diff)
• Node.h (modified) (1 diff)

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

@@ -5827 +5827 @@
 
 #ifdef _HAVE_HYDROLOGY_
+/*FUNCTION Tria::AllActive{{{*/
+bool Tria::AllActive(void){
+
+        /*Intermediaries*/
+        const int  numnodes = NUMVERTICES;
+
+        for(int i=0;i<numnodes;i++){
+                if(!this->nodes[i]->IsActive()) return false;
+        }
+
+        return true;
+}
+/*}}}*/
 /*FUNCTION Tria::CreateHydrologyWaterVelocityInput {{{*/
 void Tria::CreateHydrologyWaterVelocityInput(void){
@@ -6061 +6074 @@
         GaussTria   *gauss = NULL;
 
+        /*Check that all nodes are active, else return empty matrix*/
+        if(!this->AllActive()) return NULL;
+
         /*Initialize Element matrix*/
         ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum);
@@ -6229 +6245 @@
         IssmDouble basis[numdof];
         GaussTria* gauss=NULL;
+
+        /*Check that all nodes are active, else return empty matrix*/
+        if(!this->AllActive()) return NULL;
 
         /*Initialize Element vector*/

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

@@ -259 +259 @@
                 void    GetHydrologyDCInefficientHmax(IssmDouble* ph_max, Node* innode);
                 void    GetHydrologyTransfer(Vector<IssmDouble>* transfer);
+                bool    AllActive(void);
                 #endif
                 #ifdef _HAVE_BALANCED_

issm/trunk-jpl/src/c/classes/Node.cpp

@@ -503 +503 @@
 
         indexing.Activate();
+
+}
+/*}}}*/
+/*FUNCTION Node::IsActive{{{*/
+bool Node::IsActive(void){
+
+        return indexing.active;
 
 }

issm/trunk-jpl/src/c/classes/Node.h

@@ -87 +87 @@
                 void   GetLocalDofList(int* poutdoflist,int approximation_enum,int setenum);
                 void   FreezeDof(int dof);
+                bool   IsActive(void);
                 void   Activate(void);
                 void   Deactivate(void);