Changeset 17564


Ignore:
Timestamp:
03/27/14 12:09:21 (11 years ago)
Author:
Mathieu Morlighem
Message:

BUG: fixing some issues realted to mesh subclasses

Location:
issm/trunk-jpl/src
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/analyses/BalancevelocityAnalysis.cpp

    r17555 r17564  
    4444
    4545        /*First fetch data: */
    46         iomodel->FetchData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum);
    4746        ::CreateNodes(nodes,iomodel,BalancevelocityAnalysisEnum,P1Enum);
    48         iomodel->DeleteData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum);
    4947}/*}}}*/
    5048void BalancevelocityAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/

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

    r17555 r17564  
    5151        iomodel->FetchDataToInput(elements,BaseEnum);
    5252        iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum);
    53         iomodel->FetchDataToInput(elements,MeshElementonbedEnum);
    5453        iomodel->FetchDataToInput(elements,EplHeadEnum);
    5554        iomodel->FetchDataToInput(elements,SedimentHeadEnum);
    … …  
    5756        iomodel->FetchDataToInput(elements,HydrologydcSedimentTransmitivityEnum);
    5857        iomodel->FetchDataToInput(elements,HydrologydcEplThicknessEnum);
     58        if(iomodel->meshtype==Mesh3DEnum) iomodel->FetchDataToInput(elements,MeshElementonbedEnum);
    5959       
    6060        //      elements->InputDuplicate(HydrologydcEplInitialThicknessEnum,HydrologydcEplThicknessEnum);
    … …  
    7373        if(!isefficientlayer) return;
    7474
    75         iomodel->FetchData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum);
     75        if(iomodel->meshtype!=Mesh2DhorizontalEnum) iomodel->FetchData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum);
    7676        ::CreateNodes(nodes,iomodel,HydrologyDCEfficientAnalysisEnum,P1Enum);
    77         iomodel->DeleteData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum);
     77        iomodel->DeleteData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum);
    7878}/*}}}*/
    7979void HydrologyDCEfficientAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/

  • issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp

    r17555 r17564  
    8484        iomodel->FetchDataToInput(elements,BaseEnum);
    8585        iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum);
    86         iomodel->FetchDataToInput(elements,MeshElementonbedEnum);
    8786        iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum);
    8887        iomodel->FetchDataToInput(elements,HydrologydcBasalMoulinInputEnum);
    8988        iomodel->FetchDataToInput(elements,SedimentHeadEnum);
    9089        iomodel->FetchDataToInput(elements,HydrologydcSedimentTransmitivityEnum);
    91 
     90        if(iomodel->meshtype==Mesh3DEnum) iomodel->FetchDataToInput(elements,MeshElementonbedEnum);
    9291
    9392        if(isefficientlayer)iomodel->FetchDataToInput(elements,HydrologydcMaskEplactiveNodeEnum);
    … …  
    102101        if(hydrology_model!=HydrologydcEnum) return;
    103102
    104         if(iomodel->meshtype==Mesh3DEnum) iomodel->FetchData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum);
     103        if(iomodel->meshtype!=Mesh2DhorizontalEnum) iomodel->FetchData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum);
    105104        ::CreateNodes(nodes,iomodel,HydrologyDCInefficientAnalysisEnum,P1Enum);
    106105        iomodel->DeleteData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum);
    … …  
    122121        if(hydrology_model!=HydrologydcEnum) return;
    123122
    124         iomodel->FetchData(1,MeshVertexonbedEnum);
     123        if(iomodel->meshtype==Mesh3DEnum) iomodel->FetchData(1,MeshVertexonbedEnum);
    125124
    126125        //create penalties for nodes: no node can have water above the max

  • issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeXAnalysis.cpp

    r17555 r17564  
    3535}/*}}}*/
    3636void SmoothedSurfaceSlopeXAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/
    37         iomodel->FetchData(1,MeshVertexonbedEnum);
     37        if(iomodel->meshtype==Mesh3DEnum) iomodel->FetchData(1,MeshVertexonbedEnum);
    3838        ::CreateNodes(nodes,iomodel,SmoothedSurfaceSlopeXAnalysisEnum,P1Enum);
    39         iomodel->DeleteData(1,MeshVertexonbedEnum);
     39        if(iomodel->meshtype==Mesh3DEnum) iomodel->DeleteData(1,MeshVertexonbedEnum);
    4040}/*}}}*/
    4141void SmoothedSurfaceSlopeXAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/

  • issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeYAnalysis.cpp

    r17555 r17564  
    3535}/*}}}*/
    3636void SmoothedSurfaceSlopeYAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/
    37         iomodel->FetchData(1,MeshVertexonbedEnum);
     37        if(iomodel->meshtype==Mesh3DEnum) iomodel->FetchData(1,MeshVertexonbedEnum);
    3838        ::CreateNodes(nodes,iomodel,SmoothedSurfaceSlopeYAnalysisEnum,P1Enum);
    39         iomodel->DeleteData(1,MeshVertexonbedEnum);
     39        if(iomodel->meshtype==Mesh3DEnum) iomodel->DeleteData(1,MeshVertexonbedEnum);
    4040}/*}}}*/
    4141void SmoothedSurfaceSlopeYAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/

  • issm/trunk-jpl/src/m/classes/model.m

    r17563 r17564  
    473473                                md2.mesh.vertexconnectivity=NodeConnectivity(md2.mesh.elements2d,md2.mesh.numberofvertices2d);
    474474                                md2.mesh.elementconnectivity=ElementConnectivity(md2.mesh.elements2d,md2.mesh.vertexconnectivity);
    475                                 md2.mesh.segments=contourenvelope(md2);
    476475                                md2.mesh.vertexonboundary=zeros(numberofvertices2/md2.mesh.numberoflayers,1); md2.mesh.vertexonboundary(md2.mesh.segments(:,1:2))=1;
    477476                                md2.mesh.vertexonboundary=repmat(md2.mesh.vertexonboundary,md2.mesh.numberoflayers,1);

  • issm/trunk-jpl/src/m/classes/model.py

    r17563 r17564  
    374374                        [md2.mesh.vertexconnectivity]=NodeConnectivity(md2.mesh.elements2d,md2.mesh.numberofvertices2d)
    375375                        [md2.mesh.elementconnectivity]=ElementConnectivity(md2.mesh.elements2d,md2.mesh.vertexconnectivity)
    376                         md2.mesh.segments=contourenvelope(md2)
    377376                        md2.mesh.vertexonboundary=numpy.zeros(numberofvertices2/md2.mesh.numberoflayers,bool)
    378377                        md2.mesh.vertexonboundary[md2.mesh.segments[:,0:2]-1]=True
Note: See TracChangeset for help on using the changeset viewer.