Changeset 17362

Timestamp:

02/27/14 11:33:11 (11 years ago)

Author:

bdef

Message:

CHG: Getting rid of AllActive

Location:

issm/trunk-jpl/src/c

Files:

• analyses/HydrologyDCEfficientAnalysis.cpp (modified) (4 diffs)
• analyses/L2ProjectionEPLAnalysis.cpp (modified) (4 diffs)
• classes/Elements/Element.cpp (modified) (1 diff)
• classes/Elements/Element.h (modified) (1 diff)
• solutionsequences/solutionsequence_hydro_nonlinear.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp

@@ -109 +109 @@
 
         /*Intermediaries*/
+        bool     active_element;
         int      meshtype;
         Element* basalelement;
@@ -125 +126 @@
         }
 
+        Input* active_element_input = basalelement->GetInput(HydrologydcMaskEplactiveEltEnum); _assert_(active_element_input);
+        active_element_input->GetInputValue(&active_element);
+
         /*Check that all nodes are active, else return empty matrix*/
-        if(!basalelement->AllActive()) { /*This could probably replaced by active elt mask*/
+        if(!active_element) {
         if(meshtype!=Mesh2DhorizontalEnum){
                         basalelement->DeleteMaterials(); 
@@ -204 +208 @@
 
         /*Intermediaries*/
+        bool     active_element;
         int      meshtype;
         Element* basalelement;
@@ -219 +224 @@
                 default: _error_("mesh "<<EnumToStringx(meshtype)<<" not supported yet");
         }
+
+        Input* active_element_input = basalelement->GetInput(HydrologydcMaskEplactiveEltEnum); _assert_(active_element_input);
+        active_element_input->GetInputValue(&active_element);
+
         /*Check that all nodes are active, else return empty matrix*/
-        if(!basalelement->AllActive()) {
+        if(!active_element) {
         if(meshtype!=Mesh2DhorizontalEnum){
                         basalelement->DeleteMaterials(); 

issm/trunk-jpl/src/c/analyses/L2ProjectionEPLAnalysis.cpp

@@ -86 +86 @@
         bool     active_element;
         Element* basalelement;
-        Input*   active_element_input=NULL;
 
         /*Get basal element*/
@@ -105 +104 @@
         }
 
-        /* active_element_input=basalelement->GetInput(HydrologydcMaskEplactiveEltEnum); _assert_(active_element_input); */
-        /* active_element_input->GetInputValue(&active_element); */
+        Input* active_element_input=basalelement->GetInput(HydrologydcMaskEplactiveEltEnum); _assert_(active_element_input);
+        active_element_input->GetInputValue(&active_element);
 
         /* Check that all nodes are active, else return empty matrix */
-        if(!basalelement->AllActive()) {
-                //      if(!active_element){
-        if(meshtype!=Mesh2DhorizontalEnum){
+        if(!active_element){
+                if(meshtype!=Mesh2DhorizontalEnum){
                         basalelement->DeleteMaterials();
                         delete basalelement;
@@ -160 +158 @@
         bool     active_element;
         Element* basalelement;
-        Input*   active_element_input=NULL;
 
         /*Get basal element*/
@@ -175 +172 @@
         }
 
-        /* active_element_input=basalelement->GetInput(HydrologydcMaskEplactiveEltEnum); _assert_(active_element_input); */
-        /* active_element_input->GetInputValue(&active_element); */
+        Input* active_element_input = basalelement->GetInput(HydrologydcMaskEplactiveEltEnum); _assert_(active_element_input);
+        active_element_input->GetInputValue(&active_element);
 
         /*Check that all nodes are active, else return empty matrix*/
-        if(!basalelement->AllActive()) {
-                /* if(!active_element){ */
+        if(!active_element) {
                 if(meshtype!=Mesh2DhorizontalEnum){
                         basalelement->DeleteMaterials();

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

@@ -37 +37 @@
         this->inputs->AddInput(input_in);
 }/*}}}*/
-bool Element::AllActive(void){/*{{{*/
-
-        int numnodes = this->GetNumberOfNodes();
-        for(int i=0;i<numnodes;i++){
-                if(!this->nodes[i]->IsActive()) return false;
-        }
-        return true;
-}/*}}}*/
-bool Element::AnyActive(void){/*{{{*/
-
-        int numnodes = this->GetNumberOfNodes();
-        for(int i=0;i<numnodes;i++){
-                if(this->nodes[i]->IsActive()) return true;
-        }
-        return false;
-}/*}}}*/
+/* bool Element::AllActive(void){/\*{{{*\/ */
+
+/*      int numnodes = this->GetNumberOfNodes(); */
+/*      for(int i=0;i<numnodes;i++){ */
+/*              if(!this->nodes[i]->IsActive()) return false; */
+/*      } */
+/*      return true; */
+/* }/\*}}}*\/ */
+/* bool Element::AnyActive(void){/\*{{{*\/ */
+
+/*      int numnodes = this->GetNumberOfNodes(); */
+/*      for(int i=0;i<numnodes;i++){ */
+/*              if(this->nodes[i]->IsActive()) return true; */
+/*      } */
+/*      return false; */
+/* }/\*}}}*\/ */
 void Element::CoordinateSystemTransform(IssmDouble** ptransform,Node** nodes_list,int numnodes,int* cs_array){/*{{{*/
 

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

@@ -52 +52 @@
                 /*Functions*/
                 void       AddInput(Input* input_in);
-                bool       AllActive(void);
-                bool       AnyActive(void);
+                /* bool       AllActive(void); */
+                /* bool       AnyActive(void); */
                 void       CoordinateSystemTransform(IssmDouble** ptransform,Node** nodes,int numnodes,int* cs_array);
                 void       DeleteMaterials(void);

issm/trunk-jpl/src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp

@@ -117 +117 @@
                                         if(num_unstable_constraints==0) sedconverged = true;
                                         if (sedcount>=hydro_maxiter){
-                                                //sedconverged = true;
                                                 _error_("   maximum number of Sediment iterations (" << hydro_maxiter << ") exceeded");
                                         }
@@ -174 +173 @@
                                 /* {{{ *//*Retrieve the EPL head slopes and compute EPL Thickness*/
                                 if(VerboseSolution()) _printf0_("computing EPL Head slope...\n");
+                                inefanalysis->ElementizeEplMask(femmodel);
                                 femmodel->SetCurrentConfiguration(L2ProjectionEPLAnalysisEnum);
                                 femmodel->UpdateConstraintsL2ProjectionEPLx();