Changeset 15986


Ignore:
Timestamp:
08/27/13 16:12:21 (12 years ago)
Author:
Mathieu Morlighem
Message:

DEL: getting rid of MaskVertexon* and MaskElementon* in the code'

Location:
issm/trunk-jpl/src
Files:
4 deleted
38 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

    r15982 r15986  
    53185318    /*update meltrate and watercolumn*/
    53195319    this->inputs->AddInput(new PentaInput(WatercolumnEnum, watercolumn, P1Enum));
    5320     this->inputs->AddInput(new PentaInput(BasalMeltrateEnum, meltrate, P1Enum));
     5320    this->inputs->AddInput(new PentaInput(BasalforcingsMeltingRateEnum, meltrate, P1Enum));
    53215321
    53225322        /*Clean up and return*/
    … …  
    1128711287        this->inputs->AddInput(new PentaInput(SurfaceEnum,&s[0],P1Enum));
    1128811288        this->inputs->AddInput(new PentaInput(BedEnum,&b[0],P1Enum));
    11289    this->inputs->AddInput(new BoolInput(MaskElementonfloatingiceEnum,floatingelement));
    1129011289
    1129111290        /*Extrude inputs*/
    1129211291        this->InputExtrude(SurfaceEnum,ElementEnum);
    1129311292        this->InputExtrude(BedEnum,ElementEnum);
    11294         this->InputExtrude(MaskElementonfloatingiceEnum,ElementEnum);
    1129511293}
    1129611294/*}}}*/

  • issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

    r15982 r15986  
    74027402
    74037403        /*Update inputs*/
    7404    this->inputs->AddInput(new BoolInput(MaskElementonfloatingiceEnum,floatingelement));
    74057404        this->inputs->AddInput(new TriaInput(SurfaceEnum,&s[0],P1Enum));
    74067405        this->inputs->AddInput(new TriaInput(BedEnum,&b[0],P1Enum));

  • issm/trunk-jpl/src/c/classes/Loads/Riftfront.cpp

    r15771 r15986  
    9696        riftfront_friction=*(iomodel->Data(RiftsRiftstructEnum)+RIFTINFOSIZE*i+8);
    9797        riftfront_fractionincrement=*(iomodel->Data(RiftsRiftstructEnum)+RIFTINFOSIZE*i+10);
    98         riftfront_shelf=reCast<bool,IssmDouble>(iomodel->Data(MaskVertexonfloatingiceEnum)[node1-1]);
     98        riftfront_shelf=reCast<bool,IssmDouble>(iomodel->Data(MaskGroundediceLevelsetEnum)[node1-1]<0.);
    9999
    100100        this->inputs->AddInput(new IntInput(RiftfrontTypeEnum,riftfront_type));

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateNodesBalancethickness.cpp

    r15749 r15986  
    1919
    2020        /*First fetch data: */
    21         iomodel->FetchData(5,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum);
     21        iomodel->FetchData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum);
    2222        if(stabilization!=3){
    2323                CreateNodes(pnodes,iomodel,BalancethicknessAnalysisEnum,P1Enum);
    … …  
    2626                CreateNodes(pnodes,iomodel,BalancethicknessAnalysisEnum,P1DGEnum);
    2727        }
    28         iomodel->DeleteData(5,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum);
     28        iomodel->DeleteData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum);
    2929}

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/UpdateElementsBalancethickness.cpp

    r15941 r15986  
    3636        iomodel->FetchDataToInput(elements,BedEnum);
    3737        iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum);
    38         iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum);
    3938        iomodel->FetchDataToInput(elements,VxEnum);
    4039        iomodel->FetchDataToInput(elements,VyEnum);

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/CreateNodesBedSlope.cpp

    r15749 r15986  
    1111void    CreateNodesBedSlope(Nodes** pnodes, IoModel* iomodel){
    1212
    13         iomodel->FetchData(5,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum);
     13        iomodel->FetchData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum);
    1414        CreateNodes(pnodes,iomodel,BedSlopeAnalysisEnum,P1Enum);
    15         iomodel->DeleteData(5,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum);
     15        iomodel->DeleteData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum);
    1616}

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/CreateNodesEnthalpy.cpp

    r15749 r15986  
    1111void    CreateNodesEnthalpy(Nodes** pnodes, IoModel* iomodel){
    1212
    13         iomodel->FetchData(5,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum);
     13        iomodel->FetchData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum);
    1414        CreateNodes(pnodes,iomodel,EnthalpyAnalysisEnum,P1Enum);
    15         iomodel->DeleteData(5,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum);
     15        iomodel->DeleteData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum);
    1616}

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/UpdateElementsEnthalpy.cpp

    r15979 r15986  
    3535        iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum);
    3636        iomodel->FetchDataToInput(elements,MaskGroundediceLevelsetEnum);
    37         iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum);
    3837        iomodel->FetchDataToInput(elements,MeshElementonbedEnum);
    3938        iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum);

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/FreeSurfaceBase/CreateNodesFreeSurfaceBase.cpp

    r15877 r15986  
    1212
    1313        /*Create Nodes either DG or CG depending on stabilization*/
    14         iomodel->FetchData(5,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum);
     14        iomodel->FetchData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum);
    1515        CreateNodes(pnodes,iomodel,FreeSurfaceBaseAnalysisEnum,P1Enum);
    16         iomodel->DeleteData(5,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum);
     16        iomodel->DeleteData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum);
    1717}

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/FreeSurfaceBase/UpdateElementsFreeSurfaceBase.cpp

    r15941 r15986  
    3232        iomodel->FetchDataToInput(elements,SurfaceEnum);
    3333        iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum);
    34         iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum);
    3534        iomodel->FetchDataToInput(elements,SurfaceforcingsMassBalanceEnum);
    3635        iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum);

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/FreeSurfaceTop/CreateNodesFreeSurfaceTop.cpp

    r15877 r15986  
    1212
    1313        /*Create Nodes either DG or CG depending on stabilization*/
    14         iomodel->FetchData(5,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum);
     14        iomodel->FetchData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum);
    1515        CreateNodes(pnodes,iomodel,FreeSurfaceTopAnalysisEnum,P1Enum);
    16         iomodel->DeleteData(5,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum);
     16        iomodel->DeleteData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum);
    1717}

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/FreeSurfaceTop/UpdateElementsFreeSurfaceTop.cpp

    r15941 r15986  
    3131        iomodel->FetchDataToInput(elements,SurfaceEnum);
    3232        iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum);
    33         iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum);
    3433        iomodel->FetchDataToInput(elements,SurfaceforcingsMassBalanceEnum);
    3534        iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum);

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateNodesHydrologyDCEfficient.cpp

    r15749 r15986  
    2121        if(!isefficientlayer) return;
    2222
    23         iomodel->FetchData(5,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum);
     23        iomodel->FetchData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum);
    2424        CreateNodes(pnodes,iomodel,HydrologyDCEfficientAnalysisEnum,P1Enum);
    25         iomodel->DeleteData(5,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum);
     25        iomodel->DeleteData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum);
    2626}

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/UpdateElementsHydrologyDCEfficient.cpp

    r15941 r15986  
    3636        iomodel->FetchDataToInput(elements,BedEnum);
    3737        iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum);
    38         iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum);
    3938        iomodel->FetchDataToInput(elements,MeshElementonbedEnum);
    4039        iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum);

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateNodesHydrologyDCInefficient.cpp

    r15749 r15986  
    1818        if(hydrology_model!=HydrologydcEnum) return;
    1919
    20         iomodel->FetchData(5,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum);
     20        iomodel->FetchData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum);
    2121        CreateNodes(pnodes,iomodel,HydrologyDCInefficientAnalysisEnum,P1Enum);
    22         iomodel->DeleteData(5,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum);
     22        iomodel->DeleteData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum);
    2323}

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/UpdateElementsHydrologyDCInefficient.cpp

    r15941 r15986  
    3737        iomodel->FetchDataToInput(elements,BedEnum);
    3838        iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum);
    39         iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum);
    4039        iomodel->FetchDataToInput(elements,MeshElementonbedEnum);
    4140        iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum);

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/CreateNodesHydrologyShreve.cpp

    r15749 r15986  
    1818        if(hydrology_model!=HydrologyshreveEnum) return;
    1919
    20         iomodel->FetchData(5,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum);
     20        iomodel->FetchData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum);
    2121        CreateNodes(pnodes,iomodel,HydrologyShreveAnalysisEnum,P1Enum);
    22         iomodel->DeleteData(5,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum);
     22        iomodel->DeleteData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum);
    2323}

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/UpdateElementsHydrologyShreve.cpp

    r15980 r15986  
    3636        iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum);
    3737        iomodel->FetchDataToInput(elements,MaskGroundediceLevelsetEnum);
    38         iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum);
    3938        iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum);
    4039        iomodel->FetchDataToInput(elements,WatercolumnEnum);

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Masstransport/CreateNodesMasstransport.cpp

    r15767 r15986  
    1919
    2020        /*Create Nodes either DG or CG depending on stabilization*/
    21         iomodel->FetchData(5,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum);
     21        iomodel->FetchData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum);
    2222        if(stabilization!=3){
    2323                CreateNodes(pnodes,iomodel,MasstransportAnalysisEnum,P1Enum);
    … …  
    2626                CreateNodes(pnodes,iomodel,MasstransportAnalysisEnum,P1DGEnum);
    2727        }
    28         iomodel->DeleteData(5,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum);
     28        iomodel->DeleteData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum);
    2929}

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Masstransport/UpdateElementsMasstransport.cpp

    r15952 r15986  
    4646        iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum);
    4747        iomodel->FetchDataToInput(elements,MaskGroundediceLevelsetEnum);
    48         iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum);
    4948        iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum);
    5049        iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateCorrectionEnum);

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/CreateNodesMelting.cpp

    r15749 r15986  
    1111void    CreateNodesMelting(Nodes** pnodes, IoModel* iomodel){
    1212
    13         iomodel->FetchData(5,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum);
     13        iomodel->FetchData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum);
    1414        CreateNodes(pnodes,iomodel,MeltingAnalysisEnum,P1Enum);
    15         iomodel->DeleteData(5,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum);
     15        iomodel->DeleteData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum);
    1616}

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/UpdateElementsMelting.cpp

    r15941 r15986  
    3232        iomodel->FetchDataToInput(elements,FrictionQEnum);
    3333        iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum);
    34         iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum);
    3534        iomodel->FetchDataToInput(elements,MeshElementonbedEnum);
    3635        iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum);

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Stressbalance/CreateConstraintsStressbalance.cpp

    r15925 r15986  
    2929        IssmDouble *nodeonFS   = NULL;
    3030        IssmDouble *nodeonbed      = NULL;
    31         IssmDouble *nodeonicesheet = NULL;
     31        IssmDouble *groundedice_ls = NULL;
    3232        IssmDouble *vertices_type  = NULL;
    3333        IssmDouble *surface        = NULL;
    … …  
    9696                        iomodel->FetchData(&nodeonFS,NULL,NULL,FlowequationBorderFSEnum);
    9797                        iomodel->FetchData(&nodeonbed,NULL,NULL,MeshVertexonbedEnum);
    98                         iomodel->FetchData(&nodeonicesheet,NULL,NULL,MaskVertexongroundediceEnum);
     98                        iomodel->FetchData(&groundedice_ls,NULL,NULL,MaskGroundediceLevelsetEnum);
    9999                        for(i=0;i<iomodel->numberofvertices;i++){
    100100                                if(iomodel->my_vertices[i]){
    101                                         if(reCast<int,IssmDouble>(nodeonbed[i]) && reCast<int,IssmDouble>(nodeonicesheet[i]) && reCast<int,IssmDouble>(nodeonFS[i])){
     101                                        if(nodeonbed[i]>0. && groundedice_ls[i]>0. && nodeonFS[i]>0.){
    102102                                                if(vertices_type[i] == FSApproximationEnum){
    103103                                                        for(j=0;j<Nz;j++) spcvz[i*Nz+j] = 0.;
    … …  
    114114                        iomodel->DeleteData(nodeonFS,FlowequationBorderFSEnum);
    115115                        iomodel->DeleteData(nodeonbed,MeshVertexonbedEnum);
    116                         iomodel->DeleteData(nodeonicesheet,MaskVertexongroundediceEnum);
     116                        iomodel->DeleteData(groundedice_ls,MaskGroundediceLevelsetEnum);
    117117
    118118                        /*Pressure spc*/
    … …  
    125125                                        for(i=0;i<iomodel->numberofvertices;i++){
    126126                                                if(iomodel->my_vertices[i]){
    127                                                         if (reCast<int,IssmDouble>(vertices_type[i])==NoneApproximationEnum){
     127                                                        if(reCast<int,IssmDouble>(vertices_type[i])==NoneApproximationEnum){
    128128                                                                constraints->AddObject(new SpcStatic(count+1,iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofelements+i+1,1,g*rho_ice*(surface[i]-z[i])/FSreconditioning,StressbalanceAnalysisEnum));
    129129                                                                count++;
    … …  
    135135                                        for(i=0;i<iomodel->numberofvertices;i++){
    136136                                                if(iomodel->my_vertices[i]){
    137                                                         if (reCast<int,IssmDouble>(vertices_type[i])==NoneApproximationEnum){
     137                                                        if(reCast<int,IssmDouble>(vertices_type[i])==NoneApproximationEnum){
    138138                                                                constraints->AddObject(new SpcStatic(count+1,iomodel->nodecounter+iomodel->numberofvertices+iomodel->numberofedges+i+1,1,g*rho_ice*(surface[i]-z[i])/FSreconditioning,StressbalanceAnalysisEnum));
    139139                                                                count++;
    … …  
    162162        if(iomodel->dim==3)iomodel->FetchData(&nodeonFS,NULL,NULL,FlowequationBorderFSEnum);
    163163        if(iomodel->dim==3)iomodel->FetchData(&nodeonbed,NULL,NULL,MeshVertexonbedEnum);
    164         if(iomodel->dim==3)iomodel->FetchData(&nodeonicesheet,NULL,NULL,MaskVertexongroundediceEnum);
     164        if(iomodel->dim==3)iomodel->FetchData(&groundedice_ls,NULL,NULL,MaskGroundediceLevelsetEnum);
    165165        iomodel->FetchData(&vertices_type,NULL,NULL,FlowequationVertexEquationEnum);
    166166        iomodel->FetchData(&surface,NULL,NULL,SurfaceEnum);
    … …  
    383383
    384384                        /*Constraint at the bedrock interface (v.n = vz = 0) (Coordinates will be updated according to the bed slope)*/
    385                         if (iomodel->dim==3) if(reCast<int,IssmDouble>(nodeonbed[i]) && reCast<int,IssmDouble>(nodeonicesheet[i]) && reCast<int,IssmDouble>(nodeonFS[i])){
     385                        if (iomodel->dim==3) if(nodeonbed[i]>0. && groundedice_ls[i]>=0. && nodeonFS[i]>0.){
    386386                                 switch(reCast<int,IssmDouble>(vertices_type[i])){
    387387                                        case SSAFSApproximationEnum:
    … …  
    411411        if(iomodel->dim==3)iomodel->DeleteData(nodeonFS,FlowequationBorderFSEnum);
    412412        if(iomodel->dim==3)iomodel->DeleteData(nodeonbed,MeshVertexonbedEnum);
    413         if(iomodel->dim==3)iomodel->DeleteData(nodeonicesheet,MaskVertexongroundediceEnum);
     413        if(iomodel->dim==3)iomodel->DeleteData(groundedice_ls,MaskGroundediceLevelsetEnum);
    414414        iomodel->DeleteData(vertices_type,FlowequationVertexEquationEnum);
    415415        iomodel->DeleteData(surface,SurfaceEnum);

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Stressbalance/CreateLoadsStressbalance.cpp

    r15843 r15986  
    7474        if(numrifts){
    7575                iomodel->FetchData(&riftinfo,&numriftsegments,NULL,RiftsRiftstructEnum);
    76                 iomodel->FetchData(5,RiftsRiftstructEnum,ThicknessEnum,BedEnum,SurfaceEnum,MaskVertexonfloatingiceEnum);
     76                iomodel->FetchData(5,RiftsRiftstructEnum,ThicknessEnum,BedEnum,SurfaceEnum,MaskGroundediceLevelsetEnum);
    7777                for(i=0;i<numriftsegments;i++){
    7878                        if(iomodel->my_elements[reCast<int,IssmDouble>(*(riftinfo+RIFTINFOSIZE*i+2))-1]){
    … …  
    8181                        }
    8282                }
    83                 iomodel->DeleteData(5,RiftsRiftstructEnum,ThicknessEnum,BedEnum,SurfaceEnum,MaskVertexonfloatingiceEnum);
     83                iomodel->DeleteData(5,RiftsRiftstructEnum,ThicknessEnum,BedEnum,SurfaceEnum,MaskGroundediceLevelsetEnum);
    8484                xDelete<IssmDouble>(riftinfo);
    8585        }

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Stressbalance/CreateNodesStressbalance.cpp

    r15923 r15986  
    5050                        iomodel->Constant(&finiteelement,FlowequationFeFSEnum);
    5151                }
    52                 iomodel->FetchData(8,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationBorderSSAEnum,FlowequationBorderFSEnum,
    53                                         MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,StressbalanceReferentialEnum);
     52                iomodel->FetchData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationBorderSSAEnum,FlowequationBorderFSEnum,
     53                                        FlowequationVertexEquationEnum,StressbalanceReferentialEnum);
    5454                CreateNodes(pnodes,iomodel,StressbalanceAnalysisEnum,finiteelement,approximation);
    55                 iomodel->DeleteData(8,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationBorderSSAEnum,FlowequationBorderFSEnum,
    56                                         MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,StressbalanceReferentialEnum);
     55                iomodel->DeleteData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationBorderSSAEnum,FlowequationBorderFSEnum,
     56                                        FlowequationVertexEquationEnum,StressbalanceReferentialEnum);
    5757        }
    5858        else{
    … …  
    6464                if(!nodes) nodes = new Nodes();
    6565
    66                 iomodel->FetchData(8,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationBorderSSAEnum,FlowequationBorderFSEnum,
    67                                         MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,StressbalanceReferentialEnum);
     66                iomodel->FetchData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationBorderSSAEnum,FlowequationBorderFSEnum,
     67                                        FlowequationVertexEquationEnum,StressbalanceReferentialEnum);
    6868                if(isFS){
    6969                        /*P1+ velocity*/
    … …  
    101101                        }
    102102                }
    103                 iomodel->DeleteData(8,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationBorderSSAEnum,FlowequationBorderFSEnum,
    104                                         MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,StressbalanceReferentialEnum);
     103                iomodel->DeleteData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationBorderSSAEnum,FlowequationBorderFSEnum,
     104                                        FlowequationVertexEquationEnum,StressbalanceReferentialEnum);
    105105
    106106                /*Assign output pointer: */

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Stressbalance/UpdateElementsStressbalance.cpp

    r15952 r15986  
    9494        iomodel->FetchDataToInput(elements,FrictionPEnum);
    9595        iomodel->FetchDataToInput(elements,FrictionQEnum);
    96         iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum);
    9796        iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum);
    9897        iomodel->FetchDataToInput(elements,MaskGroundediceLevelsetEnum);

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/StressbalanceSIA/CreateNodesStressbalanceSIA.cpp

    r15771 r15986  
    2525        if(!nodes) nodes = new Nodes();
    2626
    27         iomodel->FetchData(8,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationBorderSSAEnum,FlowequationBorderFSEnum,
    28                                 MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,StressbalanceReferentialEnum);
     27        iomodel->FetchData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationBorderSSAEnum,FlowequationBorderFSEnum,
     28                                FlowequationVertexEquationEnum,StressbalanceReferentialEnum);
    2929
    3030        for(int i=0;i<iomodel->numberofvertices;i++){
    … …  
    4444        }
    4545
    46         iomodel->DeleteData(8,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationBorderSSAEnum,FlowequationBorderFSEnum,
    47                                 MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,StressbalanceReferentialEnum);
     46        iomodel->DeleteData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationBorderSSAEnum,FlowequationBorderFSEnum,
     47                                FlowequationVertexEquationEnum,StressbalanceReferentialEnum);
    4848
    4949        /*Assign output pointer: */

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/StressbalanceVertical/CreateNodesStressbalanceVertical.cpp

    r15771 r15986  
    1414        if(iomodel->dim==2) return;
    1515
    16         iomodel->FetchData(5,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum);
     16        iomodel->FetchData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum);
    1717        CreateNodes(pnodes,iomodel,StressbalanceVerticalAnalysisEnum,P1Enum);
    18         iomodel->DeleteData(5,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum);
     18        iomodel->DeleteData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum);
    1919}

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/StressbalanceVertical/UpdateElementsStressbalanceVertical.cpp

    r15941 r15986  
    2929        iomodel->FetchDataToInput(elements,BedEnum);
    3030        iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum);
    31         iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum);
    3231        iomodel->FetchDataToInput(elements,MeshElementonbedEnum);
    3332        iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum);

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/CreateNodesSurfaceSlope.cpp

    r15749 r15986  
    1111void    CreateNodesSurfaceSlope(Nodes** pnodes, IoModel* iomodel){
    1212
    13         iomodel->FetchData(5,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum);
     13        iomodel->FetchData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum);
    1414        CreateNodes(pnodes,iomodel,SurfaceSlopeAnalysisEnum,P1Enum);
    15         iomodel->DeleteData(5,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum);
     15        iomodel->DeleteData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum);
    1616}

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateNodesThermal.cpp

    r15749 r15986  
    1111void    CreateNodesThermal(Nodes** pnodes, IoModel* iomodel){
    1212
    13         iomodel->FetchData(5,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum);
     13        iomodel->FetchData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum);
    1414        CreateNodes(pnodes,iomodel,ThermalAnalysisEnum,P1Enum);
    15         iomodel->DeleteData(5,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum);
     15        iomodel->DeleteData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum);
    1616}

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp

    r15979 r15986  
    3232        iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum);
    3333        iomodel->FetchDataToInput(elements,MaskGroundediceLevelsetEnum);
    34         iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum);
    3534        iomodel->FetchDataToInput(elements,MeshElementonbedEnum);
    3635        iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum);

  • issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

    r15941 r15986  
    142142        InversionVyObsEnum,
    143143        InversionVzObsEnum,
    144         MaskElementonfloatingiceEnum,
    145         MaskElementongroundediceEnum,
    146         MaskVertexonfloatingiceEnum,
    147         MaskVertexongroundediceEnum,
    148144        MaskIceLevelsetEnum,
    149145        MaterialsBetaEnum,
    … …  
    484480        WatercolumnEnum,
    485481        BasalFrictionEnum,
    486     BasalMeltrateEnum,
    487482        ViscousHeatingEnum,
    488483        QmuTemperatureEnum,

  • issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

    r15941 r15986  
    150150                case InversionVyObsEnum : return "InversionVyObs";
    151151                case InversionVzObsEnum : return "InversionVzObs";
    152                 case MaskElementonfloatingiceEnum : return "MaskElementonfloatingice";
    153                 case MaskElementongroundediceEnum : return "MaskElementongroundedice";
    154                 case MaskVertexonfloatingiceEnum : return "MaskVertexonfloatingice";
    155                 case MaskVertexongroundediceEnum : return "MaskVertexongroundedice";
    156152                case MaskIceLevelsetEnum : return "MaskIceLevelset";
    157153                case MaterialsBetaEnum : return "MaterialsBeta";
    … …  
    478474                case WatercolumnEnum : return "Watercolumn";
    479475                case BasalFrictionEnum : return "BasalFriction";
    480                 case BasalMeltrateEnum : return "BasalMeltrate";
    481476                case ViscousHeatingEnum : return "ViscousHeating";
    482477                case QmuTemperatureEnum : return "QmuTemperature";

  • issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

    r15941 r15986  
    153153              else if (strcmp(name,"InversionVyObs")==0) return InversionVyObsEnum;
    154154              else if (strcmp(name,"InversionVzObs")==0) return InversionVzObsEnum;
    155               else if (strcmp(name,"MaskElementonfloatingice")==0) return MaskElementonfloatingiceEnum;
    156               else if (strcmp(name,"MaskElementongroundedice")==0) return MaskElementongroundediceEnum;
    157               else if (strcmp(name,"MaskVertexonfloatingice")==0) return MaskVertexonfloatingiceEnum;
    158               else if (strcmp(name,"MaskVertexongroundedice")==0) return MaskVertexongroundediceEnum;
    159155              else if (strcmp(name,"MaskIceLevelset")==0) return MaskIceLevelsetEnum;
    160156              else if (strcmp(name,"MaterialsBeta")==0) return MaterialsBetaEnum;
    … …  
    260256              else if (strcmp(name,"GiaMantleViscosity")==0) return GiaMantleViscosityEnum;
    261257              else if (strcmp(name,"GiaLithosphereThickness")==0) return GiaLithosphereThicknessEnum;
     258              else if (strcmp(name,"Thickness")==0) return ThicknessEnum;
     259              else if (strcmp(name,"TimesteppingStartTime")==0) return TimesteppingStartTimeEnum;
     260              else if (strcmp(name,"TimesteppingFinalTime")==0) return TimesteppingFinalTimeEnum;
     261              else if (strcmp(name,"TimesteppingCflCoefficient")==0) return TimesteppingCflCoefficientEnum;
    262262         else stage=3;
    263263   }
    264264   if(stage==3){
    265               if (strcmp(name,"Thickness")==0) return ThicknessEnum;
    266               else if (strcmp(name,"TimesteppingStartTime")==0) return TimesteppingStartTimeEnum;
    267               else if (strcmp(name,"TimesteppingFinalTime")==0) return TimesteppingFinalTimeEnum;
    268               else if (strcmp(name,"TimesteppingCflCoefficient")==0) return TimesteppingCflCoefficientEnum;
    269               else if (strcmp(name,"TimesteppingTimeAdapt")==0) return TimesteppingTimeAdaptEnum;
     265              if (strcmp(name,"TimesteppingTimeAdapt")==0) return TimesteppingTimeAdaptEnum;
    270266              else if (strcmp(name,"TimesteppingTimeStep")==0) return TimesteppingTimeStepEnum;
    271267              else if (strcmp(name,"TransientIsstressbalance")==0) return TransientIsstressbalanceEnum;
    … …  
    383379              else if (strcmp(name,"Profiler")==0) return ProfilerEnum;
    384380              else if (strcmp(name,"MatrixParam")==0) return MatrixParamEnum;
     381              else if (strcmp(name,"NodeSId")==0) return NodeSIdEnum;
     382              else if (strcmp(name,"VectorParam")==0) return VectorParamEnum;
     383              else if (strcmp(name,"Riftfront")==0) return RiftfrontEnum;
     384              else if (strcmp(name,"RiftfrontType")==0) return RiftfrontTypeEnum;
    385385         else stage=4;
    386386   }
    387387   if(stage==4){
    388               if (strcmp(name,"NodeSId")==0) return NodeSIdEnum;
    389               else if (strcmp(name,"VectorParam")==0) return VectorParamEnum;
    390               else if (strcmp(name,"Riftfront")==0) return RiftfrontEnum;
    391               else if (strcmp(name,"RiftfrontType")==0) return RiftfrontTypeEnum;
    392               else if (strcmp(name,"Segment")==0) return SegmentEnum;
     388              if (strcmp(name,"Segment")==0) return SegmentEnum;
    393389              else if (strcmp(name,"SegmentRiftfront")==0) return SegmentRiftfrontEnum;
    394390              else if (strcmp(name,"SpcDynamic")==0) return SpcDynamicEnum;
    … …  
    487483              else if (strcmp(name,"Watercolumn")==0) return WatercolumnEnum;
    488484              else if (strcmp(name,"BasalFriction")==0) return BasalFrictionEnum;
    489               else if (strcmp(name,"BasalMeltrate")==0) return BasalMeltrateEnum;
    490485              else if (strcmp(name,"ViscousHeating")==0) return ViscousHeatingEnum;
    491486              else if (strcmp(name,"QmuTemperature")==0) return QmuTemperatureEnum;
    … …  
    506501              else if (strcmp(name,"P1DG")==0) return P1DGEnum;
    507502              else if (strcmp(name,"P1bubble")==0) return P1bubbleEnum;
    508          else stage=5;
    509    }
    510    if(stage==5){
    511               if (strcmp(name,"P1bubblecondensed")==0) return P1bubblecondensedEnum;
     503              else if (strcmp(name,"P1bubblecondensed")==0) return P1bubblecondensedEnum;
    512504              else if (strcmp(name,"P2")==0) return P2Enum;
    513505              else if (strcmp(name,"P2xP1")==0) return P2xP1Enum;
    514506              else if (strcmp(name,"P1xP2")==0) return P1xP2Enum;
    515507              else if (strcmp(name,"P1P1")==0) return P1P1Enum;
    516               else if (strcmp(name,"P1P1GLS")==0) return P1P1GLSEnum;
     508         else stage=5;
     509   }
     510   if(stage==5){
     511              if (strcmp(name,"P1P1GLS")==0) return P1P1GLSEnum;
    517512              else if (strcmp(name,"MINI")==0) return MINIEnum;
    518513              else if (strcmp(name,"MINIcondensed")==0) return MINIcondensedEnum;

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

    r15951 r15986  
    5252                end % }}}
    5353                function marshall(obj,md,fid) % {{{
    54                         WriteData(fid,'object',obj,'fieldname','elementonfloatingice','format','BooleanMat','mattype',2);
    55                         WriteData(fid,'object',obj,'fieldname','elementongroundedice','format','BooleanMat','mattype',2);
    56                         WriteData(fid,'object',obj,'fieldname','vertexonfloatingice','format','DoubleMat','mattype',1);
    57                         WriteData(fid,'object',obj,'fieldname','vertexongroundedice','format','DoubleMat','mattype',1);
    5854                        WriteData(fid,'object',obj,'fieldname','groundedice_levelset','format','DoubleMat','mattype',1);
    5955                        WriteData(fid,'object',obj,'fieldname','ice_levelset','format','DoubleMat','mattype',1);

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

    r15961 r15986  
    5454        # }}}
    5555        def marshall(self,md,fid):    # {{{
    56                 WriteData(fid,'object',self,'fieldname','elementonfloatingice','format','BooleanMat','mattype',2)
    57                 WriteData(fid,'object',self,'fieldname','elementongroundedice','format','BooleanMat','mattype',2)
    58                 WriteData(fid,'object',self,'fieldname','vertexonfloatingice','format','DoubleMat','mattype',1)
    59                 WriteData(fid,'object',self,'fieldname','vertexongroundedice','format','DoubleMat','mattype',1)
    6056                WriteData(fid,'object',self,'fieldname','groundedice_levelset','format','DoubleMat','mattype',1)
    6157                WriteData(fid,'object',self,'fieldname','ice_levelset','format','DoubleMat','mattype',1)

  • issm/trunk-jpl/src/m/enum/EnumDefinitions.py

    r15941 r15986  
    142142def InversionVyObsEnum(): return StringToEnum("InversionVyObs")[0]
    143143def InversionVzObsEnum(): return StringToEnum("InversionVzObs")[0]
    144 def MaskElementonfloatingiceEnum(): return StringToEnum("MaskElementonfloatingice")[0]
    145 def MaskElementongroundediceEnum(): return StringToEnum("MaskElementongroundedice")[0]
    146 def MaskVertexonfloatingiceEnum(): return StringToEnum("MaskVertexonfloatingice")[0]
    147 def MaskVertexongroundediceEnum(): return StringToEnum("MaskVertexongroundedice")[0]
    148144def MaskIceLevelsetEnum(): return StringToEnum("MaskIceLevelset")[0]
    149145def MaterialsBetaEnum(): return StringToEnum("MaterialsBeta")[0]
    … …  
    470466def WatercolumnEnum(): return StringToEnum("Watercolumn")[0]
    471467def BasalFrictionEnum(): return StringToEnum("BasalFriction")[0]
    472 def BasalMeltrateEnum(): return StringToEnum("BasalMeltrate")[0]
    473468def ViscousHeatingEnum(): return StringToEnum("ViscousHeating")[0]
    474469def QmuTemperatureEnum(): return StringToEnum("QmuTemperature")[0]
Note: See TracChangeset for help on using the changeset viewer.