Ignore:
Timestamp:
07/24/13 13:53:00 (12 years ago)
Author:
Mathieu Morlighem
Message:

CHG: Nodes do not look for iomodel->flowequations[i] but the approximation must now be provided to the constructor

File:
1 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp ΒΆ

    r15564 r15583  
    1818        if(!isSIA) return;
    1919
    20         iomodel->FetchData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum);
    21         CreateNodes(pnodes,iomodel,DiagnosticSIAAnalysisEnum,P1Enum);
    22         iomodel->DeleteData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum);
     20        /*First create nodes*/
     21        Nodes* nodes=*pnodes;
     22        if(!nodes) nodes = new Nodes();
     23
     24        iomodel->FetchData(9,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationBorderSSAEnum,FlowequationBorderFSEnum,
     25                                MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,MaskVertexonwaterEnum,FlowequationVertexEquationEnum,DiagnosticReferentialEnum);
     26        for(int i=0;i<iomodel->numberofvertices;i++){
     27                if(iomodel->my_vertices[i]){
     28                        nodes->AddObject(new Node(iomodel->nodecounter+i+1,i,i,iomodel,DiagnosticSIAAnalysisEnum,reCast<int>(iomodel->Data(FlowequationVertexEquationEnum)[i])));
     29                }
     30        }
     31        iomodel->DeleteData(9,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationBorderSSAEnum,FlowequationBorderFSEnum,
     32                                MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,MaskVertexonwaterEnum,FlowequationVertexEquationEnum,DiagnosticReferentialEnum);
     33
     34        /*Assign output pointer: */
     35        *pnodes=nodes;
    2336}
Note: See TracChangeset for help on using the changeset viewer.