Changeset 23158

Timestamp:

08/22/18 09:12:40 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: simplifying function

Location:

issm/trunk-jpl/src/c/modules/SetActiveNodesLSMx

Files:

• SetActiveNodesLSMx.cpp (modified) (4 diffs)
• SetActiveNodesLSMx.h (modified) (1 diff)

issm/trunk-jpl/src/c/modules/SetActiveNodesLSMx/SetActiveNodesLSMx.cpp

@@ -13 +13 @@
         /* activate/deactivate nodes for levelset method according to IceMaskNodeActivation */
 
-        /* intermediaries */
-        bool solvein2d=false;
-        int i,in,domaintype,analysis_type;
-        Elements* elements = femmodel->elements;
-
         /* find parameters */
+        int domaintype;
         femmodel->parameters->FindParam(&domaintype,DomainTypeEnum);
 
-        for(i=0;i<elements->Size();i++){
-                Element    *element  = xDynamicCast<Element*>(elements->GetObjectByOffset(i));
+        for(int i=0;i<femmodel->elements->Size();i++){
+                Element    *element  = xDynamicCast<Element*>(femmodel->elements->GetObjectByOffset(i));
                 int         numnodes = element->GetNumberOfNodes();
                 IssmDouble *mask     = xNew<IssmDouble>(numnodes);
-                // include switch for elements with multiple different sets of nodes
+
+                /*include switch for elements with multiple different sets of nodes*/
                 switch(element->GetElementType()){
                         case MINIEnum:case MINIcondensedEnum:
@@ -51 +48 @@
                 }
 
-                for(in=0;in<numnodes;in++){
+                for(int in=0;in<numnodes;in++){
                         Node* node=element->GetNode(in);
-                        if(mask[in]==1.){
-                                node->Activate();
-                        }
-                        else {
-                                node->Deactivate();
-                        }
+                        if(mask[in]==1.) node->Activate();
+                        else             node->Deactivate();
                 }
-
                 xDelete<IssmDouble>(mask);
         }
@@ -66 +58 @@
 void GetMaskOfIceVerticesLSMx(FemModel* femmodel){/*{{{*/
 
-        /* Intermediaries */
-        int i;
+        /*Initialize vector with number of vertices*/
+        int numvertices=femmodel->vertices->NumberOfVertices();
+        if(numvertices==0)  return;
+        Vector<IssmDouble>* vec_mask_ice=new Vector<IssmDouble>(numvertices);
 
-        /*Initialize vector with number of vertices*/
-        int numvertices=femmodel->vertices->NumberOfVertices(); if (numvertices==0)return;
-        Vector<IssmDouble>* vec_mask_ice=new Vector<IssmDouble>(numvertices); //vertices that have ice at next time step
         /*Fill vector with values: */
-        for(i=0;i<femmodel->elements->Size();i++){
+        for(int i=0;i<femmodel->elements->Size();i++){
                 Element* element=xDynamicCast<Element*>(femmodel->elements->GetObjectByOffset(i));
-                SetMaskOfIceElement(vec_mask_ice, element);
+                if(element->IsIceInElement()){
+                        int nbv = element->GetNumberOfVertices();
+                        for(int iv=0;iv<nbv;iv++){
+                                vec_mask_ice->SetValue(element->vertices[iv]->Sid(),1.,INS_VAL);
+                        }
+                }
         }
 
@@ -86 +82 @@
         delete vec_mask_ice;
         xDelete<IssmDouble>(mask_ice);
-
 }/*}}}*/
-void SetMaskOfIceElement(Vector<IssmDouble>* vec_mask_ice, Element* element){/*{{{*/
-
-        /* Intermediaries */
-        int numvertices = element->GetNumberOfVertices();
-
-        if(element->IsIceInElement()){
-                for(int i = 0;i<numvertices;i++){
-                        vec_mask_ice->SetValue(element->vertices[i]->Sid(),1.,INS_VAL);
-                }
-        }
-}/*}}}*/

issm/trunk-jpl/src/c/modules/SetActiveNodesLSMx/SetActiveNodesLSMx.h

@@ -10 +10 @@
 void SetActiveNodesLSMx(FemModel* femmodel);
 void GetMaskOfIceVerticesLSMx(FemModel* femmodel);
-void SetMaskOfIceElement(Vector<IssmDouble>* vec_mask_ice, Element* element);
 #endif  /* _UPDATESPCSX_H */