Changeset 15464 for issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp

Timestamp:

07/08/13 16:10:26 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: simpler way of creating new nodes

File:

• issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp

@@ -11 +11 @@
 void    CreateNodesDiagnosticHutter(Nodes** pnodes, IoModel* iomodel){
 
-        /*Intermediary*/
+        /*Fetch parameters: */
         bool ishutter;
-
-        /*Fetch parameters: */
         iomodel->Constant(&ishutter,FlowequationIshutterEnum);
 
-        /*Recover pointer: */
-        Nodes* nodes=*pnodes;
+        /*Now, is the flag ishutter on? otherwise, do nothing: */
+        if(!ishutter) return;
 
-        /*Create nodes if they do not exist yet*/
-        if(!nodes) nodes = new Nodes();
-
-        /*Now, is the flag ishutter on? otherwise, do nothing: */
-        if(!ishutter){
-                *pnodes=nodes;
-                return;
-        }
-
-        /*First fetch data: */
         iomodel->FetchData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum);
-
-        for(int i=0;i<iomodel->numberofvertices;i++){
-                if(iomodel->my_vertices[i]){
-
-                        /*Add node to nodes dataset: */
-                        nodes->AddObject(new Node(iomodel->nodecounter+i+1,i,i+1,i,iomodel,DiagnosticHutterAnalysisEnum));
-
-                }
-        }
-
-        /*Clean fetched data: */
+        CreateNodes(pnodes,iomodel,DiagnosticHutterAnalysisEnum,P1Enum);
         iomodel->DeleteData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum);
-
-        /*Assign output pointer: */
-        *pnodes=nodes;
 }