Changeset 17249

Timestamp:

02/10/14 14:44:56 (11 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixing AD build

File:

• issm/trunk-jpl/src/c/modules/SetActiveNodesLSMx/SetActiveNodesLSMx.cpp (modified) (3 diffs)

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

@@ -12 +12 @@
 void SetActiveNodesLSMx(Elements* elements){/*{{{*/
 
-        // used in femmodel->UpdateConstraintsx
-        int i,in;
-        Element* element = NULL;
-        Node* node = NULL;
-
-        for(i=0;i<elements->Size();i++){
-                element=dynamic_cast<Element*>(elements->GetObjectByOffset(i));
-                int numnodes=element->GetNumberOfNodes();
-                IssmDouble* mask = xNew<IssmDouble>(numnodes);
+        for(int i=0;i<elements->Size();i++){
+                Element    *element  = dynamic_cast<Element*>(elements->GetObjectByOffset(i));
+                int         numnodes = element->GetNumberOfNodes();
+                IssmDouble *mask     = xNew<IssmDouble>(numnodes);
                 element->GetInputListOnNodes(&mask[0],IceMaskNodeActivationEnum);
                 
-                for(in=0;in<numnodes;in++){
-                        node=element->GetNode(in);
+                for(int in=0;in<numnodes;in++){
+                        Node* node=element->GetNode(in);
                         if(mask[in]==1.){
                                 node->Activate();
@@ -38 +33 @@
 void GetMaskOfIceVerticesLSMx(FemModel* femmodel){/*{{{*/
 
-        // use in transient core
-        int                 i;
-        IssmDouble*         mask_ice      = NULL;
-        Vector<IssmDouble>* vec_mask_ice  = NULL;
-        Element*            element       = NULL;
+        /*Initialize vector with number of vertices*/
+        int numvertices=femmodel->vertices->NumberOfVertices();
+        Vector<IssmDouble>* vec_mask_ice=new Vector<IssmDouble>(numvertices); //vertices that have ice at next time step
 
-        /*Initialize vector with number of vertices*/
-        IssmDouble numvertices=femmodel->vertices->NumberOfVertices();
-        vec_mask_ice=new Vector<IssmDouble>(numvertices); //vertices that have ice at next time step
-        for(i=0;i<numvertices;i++)
-                vec_mask_ice[i]=0.;
         /*Fill vector with values: */
-        for(i=0;i<femmodel->elements->Size();i++){
-                element=dynamic_cast<Element*>(femmodel->elements->GetObjectByOffset(i));
+        for(int i=0;i<femmodel->elements->Size();i++){
+                Element* element=dynamic_cast<Element*>(femmodel->elements->GetObjectByOffset(i));
                 SetMaskOfIceElement(vec_mask_ice, element);
         }
@@ -57 +45 @@
         /*Assemble vector and serialize */
         vec_mask_ice->Assemble();
-        mask_ice=vec_mask_ice->ToMPISerial();
+        IssmDouble* mask_ice=vec_mask_ice->ToMPISerial();
         InputUpdateFromVectorx(femmodel,mask_ice,IceMaskNodeActivationEnum,VertexSIdEnum);
+
+        /*Clean up and return*/
         delete vec_mask_ice;
         delete mask_ice;