Changeset 9641


Ignore:
Timestamp:
09/07/11 08:46:46 (14 years ago)
Author:
Mathieu Morlighem
Message:

Added mask object

Location:
issm/trunk
Files:
6 deleted
350 edited
2 moved

Legend:

Unmodified
Added
Removed

  • issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h

    r9636 r9641  
    1111
    1212enum definitions{
    13         /*model fields {{{1*/
     13        /*Model fields {{{1*/
    1414        ConstantsGEnum,
    1515        ConstantsReferencetemperatureEnum,
    … …  
    5959        MaterialsThermalExchangeVelocityEnum,
    6060        MaterialsMeltingpointEnum,
     61        MaskElementongroundediceEnum,
     62        MaskElementonfloatingiceEnum,
     63        MaskElementonwaterEnum,
     64        MaskVertexongroundediceEnum,
     65        MaskVertexonfloatingiceEnum,
     66        MaskVertexonwaterEnum,
    6167        /*}}}*/
    6268        /*Datasets {{{1*/
    … …  
    215221        ControlTypeEnum,
    216222        ConvergedEnum,
    217         ElementOnBedEnum,
    218         ElementOnIceSheetEnum,
    219         ElementOnIceShelfEnum,
    220         ElementOnSurfaceEnum,
    221         ElementOnWaterEnum,
     223        ElementonbedEnum,
     224        ElementonsurfaceEnum,
    222225        FillEnum,
    223226        FractionIncrementEnum,
    … …  
    238241        GroundinglineMeltingRateEnum,
    239242        MisfitEnum,
    240         NodeOnBedEnum,
    241         NodeOnIceSheetEnum,
    242         NodeOnIceShelfEnum,
    243         NodeOnSurfaceEnum,
     243        NodeonbedEnum,
     244        NodeonsurfaceEnum,
    244245        NumberNodeToElementConnectivityEnum,
    245246        PenaltyOffsetEnum,
    … …  
    419420        NumControlTypeEnum,
    420421        SpcvyEnum,
    421         NodeOnWaterEnum,
    422422        YEnum,
    423423        ElementsTypeEnum,
    … …  
    428428        SpcvzEnum,
    429429        NumberOfNodes2DEnum,
    430         NodeOnStokesEnum,
    431         NodeOnHutterEnum,
     430        NodeonstokesEnum,
     431        NodeonhutterEnum,
     432        NodeonpattynEnum,
     433        NodeonmacayealEnum,
    432434        ZEnum,
    433435        SpcthicknessEnum,
    … …  
    435437        SpcvxEnum,
    436438        UpperelementsEnum,
    437         NodeOnPattynEnum,
    438439        EdgesEnum,
    439440        Elements2DEnum,
    440441        XEnum,
    441442        NumCmResponsesEnum,
    442         NodeOnMacayealEnum,
    443443        ElementconnectivityEnum,
    444444        ArtificialDiffusivityEnum,

  • issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp

    r9636 r9641  
    6363                case MaterialsThermalExchangeVelocityEnum : return "MaterialsThermalExchangeVelocity";
    6464                case MaterialsMeltingpointEnum : return "MaterialsMeltingpoint";
     65                case MaskElementongroundediceEnum : return "MaskElementongroundedice";
     66                case MaskElementonfloatingiceEnum : return "MaskElementonfloatingice";
     67                case MaskElementonwaterEnum : return "MaskElementonwater";
     68                case MaskVertexongroundediceEnum : return "MaskVertexongroundedice";
     69                case MaskVertexonfloatingiceEnum : return "MaskVertexonfloatingice";
     70                case MaskVertexonwaterEnum : return "MaskVertexonwater";
    6571                case ConstraintsEnum : return "Constraints";
    6672                case ElementsEnum : return "Elements";
    … …  
    182188                case ControlTypeEnum : return "ControlType";
    183189                case ConvergedEnum : return "Converged";
    184                 case ElementOnBedEnum : return "ElementOnBed";
    185                 case ElementOnIceSheetEnum : return "ElementOnIceSheet";
    186                 case ElementOnIceShelfEnum : return "ElementOnIceShelf";
    187                 case ElementOnSurfaceEnum : return "ElementOnSurface";
    188                 case ElementOnWaterEnum : return "ElementOnWater";
     190                case ElementonbedEnum : return "Elementonbed";
     191                case ElementonsurfaceEnum : return "Elementonsurface";
    189192                case FillEnum : return "Fill";
    190193                case FractionIncrementEnum : return "FractionIncrement";
    … …  
    205208                case GroundinglineMeltingRateEnum : return "GroundinglineMeltingRate";
    206209                case MisfitEnum : return "Misfit";
    207                 case NodeOnBedEnum : return "NodeOnBed";
    208                 case NodeOnIceSheetEnum : return "NodeOnIceSheet";
    209                 case NodeOnIceShelfEnum : return "NodeOnIceShelf";
    210                 case NodeOnSurfaceEnum : return "NodeOnSurface";
     210                case NodeonbedEnum : return "Nodeonbed";
     211                case NodeonsurfaceEnum : return "Nodeonsurface";
    211212                case NumberNodeToElementConnectivityEnum : return "NumberNodeToElementConnectivity";
    212213                case PenaltyOffsetEnum : return "PenaltyOffset";
    … …  
    363364                case NumControlTypeEnum : return "NumControlType";
    364365                case SpcvyEnum : return "Spcvy";
    365                 case NodeOnWaterEnum : return "NodeOnWater";
    366366                case YEnum : return "Y";
    367367                case ElementsTypeEnum : return "ElementsType";
    … …  
    372372                case SpcvzEnum : return "Spcvz";
    373373                case NumberOfNodes2DEnum : return "NumberOfNodes2D";
    374                 case NodeOnStokesEnum : return "NodeOnStokes";
    375                 case NodeOnHutterEnum : return "NodeOnHutter";
     374                case NodeonstokesEnum : return "Nodeonstokes";
     375                case NodeonhutterEnum : return "Nodeonhutter";
     376                case NodeonpattynEnum : return "Nodeonpattyn";
     377                case NodeonmacayealEnum : return "Nodeonmacayeal";
    376378                case ZEnum : return "Z";
    377379                case SpcthicknessEnum : return "Spcthickness";
    … …  
    379381                case SpcvxEnum : return "Spcvx";
    380382                case UpperelementsEnum : return "Upperelements";
    381                 case NodeOnPattynEnum : return "NodeOnPattyn";
    382383                case EdgesEnum : return "Edges";
    383384                case Elements2DEnum : return "Elements2D";
    384385                case XEnum : return "X";
    385386                case NumCmResponsesEnum : return "NumCmResponses";
    386                 case NodeOnMacayealEnum : return "NodeOnMacayeal";
    387387                case ElementconnectivityEnum : return "Elementconnectivity";
    388388                case ArtificialDiffusivityEnum : return "ArtificialDiffusivity";

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

    r9405 r9641  
    4949
    5050        /*First fetch data: */
    51         iomodel->FetchData(7,ElementsEnum,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,VerticesTypeEnum,NodeOnWaterEnum);
     51        iomodel->FetchData(7,ElementsEnum,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,VerticesTypeEnum,MaskVertexonwaterEnum);
    5252
    5353        if(continuous_galerkin){
    … …  
    8888
    8989        /*Clean fetched data: */
    90         iomodel->DeleteData(7,ElementsEnum,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,VerticesTypeEnum,NodeOnWaterEnum);
     90        iomodel->DeleteData(7,ElementsEnum,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,VerticesTypeEnum,MaskVertexonwaterEnum);
    9191
    9292        /*Assign output pointer: */

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

    r9612 r9641  
    3737        iomodel->FetchDataToInput(elements,SurfaceEnum);
    3838        iomodel->FetchDataToInput(elements,BedEnum);
    39         iomodel->FetchDataToInput(elements,ElementOnIceShelfEnum);
    40         iomodel->FetchDataToInput(elements,ElementOnWaterEnum);
     39        iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum);
     40        iomodel->FetchDataToInput(elements,MaskElementonwaterEnum);
    4141        iomodel->FetchDataToInput(elements,VxEnum);
    4242        iomodel->FetchDataToInput(elements,VyEnum);
    … …  
    4848
    4949        if (dim==3){
    50                 iomodel->FetchDataToInput(elements,ElementOnBedEnum);
    51                 iomodel->FetchDataToInput(elements,ElementOnSurfaceEnum);
     50                iomodel->FetchDataToInput(elements,ElementonbedEnum);
     51                iomodel->FetchDataToInput(elements,ElementonsurfaceEnum);
    5252        }
    5353        /*Free data: */

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

    r9405 r9641  
    3636       
    3737        /*First fetch data: */
    38         iomodel->FetchData(6,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,VerticesTypeEnum,NodeOnWaterEnum);
     38        iomodel->FetchData(6,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,VerticesTypeEnum,MaskVertexonwaterEnum);
    3939
    4040        for (i=0;i<numberofvertices;i++){
    … …  
    4848
    4949        /*Clean fetched data: */
    50         iomodel->DeleteData(6,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,VerticesTypeEnum,NodeOnWaterEnum);
     50        iomodel->DeleteData(6,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,VerticesTypeEnum,MaskVertexonwaterEnum);
    5151       
    5252        /*Assign output pointer: */

  • issm/trunk/src/c/modules/ModelProcessorx/BedSlope/UpdateElementsBedSlope.cpp

    r9405 r9641  
    3636        iomodel->FetchDataToInput(elements,SurfaceEnum);
    3737        iomodel->FetchDataToInput(elements,BedEnum);
    38         iomodel->FetchDataToInput(elements,ElementOnWaterEnum);
     38        iomodel->FetchDataToInput(elements,MaskElementonwaterEnum);
    3939
    4040        if (dim==3){
    41                 iomodel->FetchDataToInput(elements,ElementOnBedEnum);
    42                 iomodel->FetchDataToInput(elements,ElementOnSurfaceEnum);
     41                iomodel->FetchDataToInput(elements,ElementonbedEnum);
     42                iomodel->FetchDataToInput(elements,ElementonsurfaceEnum);
    4343        }
    4444       

  • issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp

    r9636 r9641  
    6565        iomodel->FetchData(&spcvy,NULL,NULL,SpcvyEnum);
    6666        iomodel->FetchData(&spcvz,NULL,NULL,SpcvzEnum);
    67         iomodel->FetchData(&nodeonhutter,NULL,NULL,NodeOnHutterEnum);
    68         iomodel->FetchData(&nodeonmacayeal,NULL,NULL,NodeOnMacayealEnum);
    69         if(dim==3)iomodel->FetchData(&nodeonpattyn,NULL,NULL,NodeOnPattynEnum);
    70         if(dim==3)iomodel->FetchData(&nodeonstokes,NULL,NULL,NodeOnStokesEnum);
     67        iomodel->FetchData(&nodeonhutter,NULL,NULL,NodeonhutterEnum);
     68        iomodel->FetchData(&nodeonmacayeal,NULL,NULL,NodeonmacayealEnum);
     69        if(dim==3)iomodel->FetchData(&nodeonpattyn,NULL,NULL,NodeonpattynEnum);
     70        if(dim==3)iomodel->FetchData(&nodeonstokes,NULL,NULL,NodeonstokesEnum);
    7171        iomodel->FetchData(&vertices_type,NULL,NULL,VerticesTypeEnum);
    7272        iomodel->FetchData(&surface,NULL,NULL,SurfaceEnum);

  • issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp

    r9619 r9641  
    124124
    125125        /*create penalties for nodes on the base of icesheet. We must have wb=ub*db/dx+vb*db/dy */
    126         iomodel->FetchData(&nodeonbed,NULL,NULL,NodeOnBedEnum);
    127         iomodel->FetchData(&nodeonicesheet,NULL,NULL,NodeOnIceSheetEnum);
    128         iomodel->FetchData(&nodeonstokes,NULL,NULL,NodeOnStokesEnum);
     126        iomodel->FetchData(&nodeonbed,NULL,NULL,NodeonbedEnum);
     127        iomodel->FetchData(&nodeonicesheet,NULL,NULL,MaskVertexongroundediceEnum);
     128        iomodel->FetchData(&nodeonstokes,NULL,NULL,NodeonstokesEnum);
    129129        iomodel->FetchData(&vertices_type,NULL,NULL,VerticesTypeEnum);
    130130        iomodel->FetchData(1,ElementsEnum);
    … …  
    174174        if(numrifts){
    175175                iomodel->FetchData(&riftinfo,&numriftsegments,NULL,RiftsRiftstructEnum);
    176                 iomodel->FetchData(5,RiftsRiftstructEnum,ThicknessEnum,BedEnum,SurfaceEnum,NodeOnIceShelfEnum);
     176                iomodel->FetchData(5,RiftsRiftstructEnum,ThicknessEnum,BedEnum,SurfaceEnum,MaskVertexonfloatingiceEnum);
    177177                for(i=0;i<numriftsegments;i++){
    178178                        if(iomodel->my_elements[(int)*(riftinfo+RIFTINFOSIZE*i+2)-1]){
    … …  
    181181                        }
    182182                }
    183                 iomodel->DeleteData(5,RiftsRiftstructEnum,ThicknessEnum,BedEnum,SurfaceEnum,NodeOnIceShelfEnum);
     183                iomodel->DeleteData(5,RiftsRiftstructEnum,ThicknessEnum,BedEnum,SurfaceEnum,MaskVertexonfloatingiceEnum);
    184184                xfree((void**)&riftfront);
    185185        }

  • issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp

    r9405 r9641  
    4545
    4646        /*Create nodes: */
    47         iomodel->FetchData(10,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnHutterEnum,NodeOnMacayealEnum,NodeOnStokesEnum,
    48                                 NodeOnIceSheetEnum,NodeOnIceShelfEnum,NodeOnWaterEnum,VerticesTypeEnum,DiagnosticRefEnum);
     47        iomodel->FetchData(10,NodeonbedEnum,NodeonsurfaceEnum,NodeonhutterEnum,NodeonmacayealEnum,NodeonstokesEnum,
     48                                MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,MaskVertexonwaterEnum,VerticesTypeEnum,DiagnosticRefEnum);
    4949       
    5050        for (i=0;i<numberofvertices;i++){
    … …  
    5858
    5959        /*Clean fetched data: */
    60         iomodel->DeleteData(10,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnHutterEnum,NodeOnMacayealEnum,NodeOnStokesEnum,
    61                                 NodeOnIceSheetEnum,NodeOnIceShelfEnum,NodeOnWaterEnum,VerticesTypeEnum,DiagnosticRefEnum);
     60        iomodel->DeleteData(10,NodeonbedEnum,NodeonsurfaceEnum,NodeonhutterEnum,NodeonmacayealEnum,NodeonstokesEnum,
     61                                MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,MaskVertexonwaterEnum,VerticesTypeEnum,DiagnosticRefEnum);
    6262
    6363        /*Assign output pointer: */

  • issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp

    r9636 r9641  
    5555        iomodel->FetchDataToInput(elements,FrictionPEnum);
    5656        iomodel->FetchDataToInput(elements,FrictionQEnum);
    57         iomodel->FetchDataToInput(elements,ElementOnIceShelfEnum);
    58         iomodel->FetchDataToInput(elements,ElementOnWaterEnum);
     57        iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum);
     58        iomodel->FetchDataToInput(elements,MaskElementonwaterEnum);
    5959        iomodel->FetchDataToInput(elements,MaterialsRheologyBEnum);
    6060        iomodel->FetchDataToInput(elements,MaterialsRheologyNEnum);
    … …  
    6464
    6565        if (dim==3){
    66                 iomodel->FetchDataToInput(elements,ElementOnBedEnum);
    67                 iomodel->FetchDataToInput(elements,ElementOnSurfaceEnum);
     66                iomodel->FetchDataToInput(elements,ElementonbedEnum);
     67                iomodel->FetchDataToInput(elements,ElementonsurfaceEnum);
    6868                iomodel->FetchDataToInput(elements,VzEnum);
    6969                iomodel->FetchDataToInput(elements,SurfaceforcingsAccumulationRateEnum);
    … …  
    7171                iomodel->FetchDataToInput(elements,SurfaceforcingsMassBalanceEnum);
    7272                iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum);
    73                 iomodel->FetchDataToInput(elements,NodeOnStokesEnum);
     73                iomodel->FetchDataToInput(elements,NodeonstokesEnum);
    7474        }
    7575

  • issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp

    r9597 r9641  
    4242
    4343        /*Fetch data: */
    44         iomodel->FetchData(3,SpcvxEnum,SpcvyEnum,NodeOnHutterEnum);
     44        iomodel->FetchData(3,SpcvxEnum,SpcvyEnum,NodeonhutterEnum);
    4545
    4646        /*Initialize conunter*/
    … …  
    5151                /*keep only this partition's nodes:*/
    5252                if((iomodel->my_vertices[i])){
    53                         if (!(int)iomodel->Data(NodeOnHutterEnum)[i]){
     53                        if (!(int)iomodel->Data(NodeonhutterEnum)[i]){
    5454
    5555                                constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,0,DiagnosticHutterAnalysisEnum));
    … …  
    7474
    7575        /*Free data: */
    76         iomodel->DeleteData(3,SpcvxEnum,SpcvyEnum,NodeOnHutterEnum);
     76        iomodel->DeleteData(3,SpcvxEnum,SpcvyEnum,NodeonhutterEnum);
    7777       
    7878        /*Assign output pointer: */

  • issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp

    r9405 r9641  
    4444
    4545        /*First fetch data: */
    46         iomodel->FetchData(8,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnHutterEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,ElementsEnum,VerticesTypeEnum,NodeOnWaterEnum);
     46        iomodel->FetchData(8,NodeonbedEnum,NodeonsurfaceEnum,NodeonhutterEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,ElementsEnum,VerticesTypeEnum,MaskVertexonwaterEnum);
    4747        CreateNumberNodeToElementConnectivity(iomodel);
    4848
    … …  
    5757
    5858        /*Clean fetched data: */
    59         iomodel->DeleteData(8,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnHutterEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,ElementsEnum,VerticesTypeEnum,NodeOnWaterEnum);
     59        iomodel->DeleteData(8,NodeonbedEnum,NodeonsurfaceEnum,NodeonhutterEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,ElementsEnum,VerticesTypeEnum,MaskVertexonwaterEnum);
    6060
    6161        /*Assign output pointer: */

  • issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/UpdateElementsDiagnosticHutter.cpp

    r9405 r9641  
    3939        }
    4040       
    41         iomodel->FetchDataToInput(elements,NodeOnHutterEnum);
     41        iomodel->FetchDataToInput(elements,NodeonhutterEnum);
    4242        iomodel->FetchDataToInput(elements,ThicknessEnum);
    4343        iomodel->FetchDataToInput(elements,ThicknessCoeffEnum);

  • issm/trunk/src/c/modules/ModelProcessorx/DiagnosticVert/CreateConstraintsDiagnosticVert.cpp

    r9597 r9641  
    4141
    4242        /*Fetch data: */
    43         iomodel->FetchData(2,SpcvzEnum,NodeOnStokesEnum);
     43        iomodel->FetchData(2,SpcvzEnum,NodeonstokesEnum);
    4444
    4545        /*Initialize counter*/
    … …  
    5252                if(iomodel->my_vertices[i]){
    5353
    54                         if ((int)iomodel->Data(NodeOnStokesEnum)[i]){
     54                        if ((int)iomodel->Data(NodeonstokesEnum)[i]){
    5555                                constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,0,DiagnosticVertAnalysisEnum)); //spc to zero as vertical velocity is done in Horiz for Stokes
    5656                                count++;
    … …  
    6666
    6767        /*Free data: */
    68         iomodel->DeleteData(2,SpcvzEnum,NodeOnStokesEnum);
     68        iomodel->DeleteData(2,SpcvzEnum,NodeonstokesEnum);
    6969
    7070        cleanup_and_return:

  • issm/trunk/src/c/modules/ModelProcessorx/DiagnosticVert/CreateNodesDiagnosticVert.cpp

    r9405 r9641  
    4444       
    4545        /*First fetch data: */
    46         iomodel->FetchData(6,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,VerticesTypeEnum,NodeOnWaterEnum);
     46        iomodel->FetchData(6,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,VerticesTypeEnum,MaskVertexonwaterEnum);
    4747
    4848        for (i=0;i<numberofvertices;i++){
    … …  
    5656
    5757        /*Clean fetched data: */
    58         iomodel->DeleteData(6,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,VerticesTypeEnum,NodeOnWaterEnum);
     58        iomodel->DeleteData(6,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,VerticesTypeEnum,MaskVertexonwaterEnum);
    5959       
    6060        /*Assign output pointer: */

  • issm/trunk/src/c/modules/ModelProcessorx/DiagnosticVert/UpdateElementsDiagnosticVert.cpp

    r9612 r9641  
    4343        iomodel->FetchDataToInput(elements,SurfaceEnum);
    4444        iomodel->FetchDataToInput(elements,BedEnum);
    45         iomodel->FetchDataToInput(elements,ElementOnIceShelfEnum);
    46         iomodel->FetchDataToInput(elements,ElementOnBedEnum);
    47         iomodel->FetchDataToInput(elements,ElementOnSurfaceEnum);
    48         iomodel->FetchDataToInput(elements,ElementOnWaterEnum);
     45        iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum);
     46        iomodel->FetchDataToInput(elements,ElementonbedEnum);
     47        iomodel->FetchDataToInput(elements,ElementonsurfaceEnum);
     48        iomodel->FetchDataToInput(elements,MaskElementonwaterEnum);
    4949        iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum);
    5050        iomodel->FetchDataToInput(elements,SurfaceforcingsAccumulationRateEnum);

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

    r9405 r9641  
    3636
    3737        /*Create nodes and vertices: */
    38         iomodel->FetchData(6,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,VerticesTypeEnum,NodeOnWaterEnum);
     38        iomodel->FetchData(6,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,VerticesTypeEnum,MaskVertexonwaterEnum);
    3939
    4040        for (i=0;i<numberofvertices;i++){
    … …  
    4848
    4949        /*Clean fetched data: */
    50         iomodel->DeleteData(6,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,VerticesTypeEnum,NodeOnWaterEnum);
     50        iomodel->DeleteData(6,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,VerticesTypeEnum,MaskVertexonwaterEnum);
    5151       
    5252        /*Assign output pointer: */

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

    r9636 r9641  
    4545        iomodel->FetchDataToInput(elements,FrictionPEnum);
    4646        iomodel->FetchDataToInput(elements,FrictionQEnum);
    47         iomodel->FetchDataToInput(elements,ElementOnIceShelfEnum);
    48         iomodel->FetchDataToInput(elements,ElementOnBedEnum);
    49         iomodel->FetchDataToInput(elements,ElementOnSurfaceEnum);
    50         iomodel->FetchDataToInput(elements,ElementOnWaterEnum);
     47        iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum);
     48        iomodel->FetchDataToInput(elements,ElementonbedEnum);
     49        iomodel->FetchDataToInput(elements,ElementonsurfaceEnum);
     50        iomodel->FetchDataToInput(elements,MaskElementonwaterEnum);
    5151        iomodel->FetchDataToInput(elements,ElementsTypeEnum);
    5252        iomodel->FetchDataToInput(elements,MaterialsRheologyBEnum);

  • issm/trunk/src/c/modules/ModelProcessorx/Hydrology/CreateNodesHydrology.cpp

    r9405 r9641  
    3636
    3737        /*Create nodes and vertices: */
    38         iomodel->FetchData(6,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,VerticesTypeEnum,NodeOnWaterEnum);
     38        iomodel->FetchData(6,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,VerticesTypeEnum,MaskVertexonwaterEnum);
    3939        for (i=0;i<numberofvertices;i++){
    4040
    … …  
    4545                }
    4646        }
    47         iomodel->DeleteData(6,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,VerticesTypeEnum,NodeOnWaterEnum);
     47        iomodel->DeleteData(6,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,VerticesTypeEnum,MaskVertexonwaterEnum);
    4848       
    4949        /*Assign output pointer: */

  • issm/trunk/src/c/modules/ModelProcessorx/Hydrology/UpdateElementsHydrology.cpp

    r9636 r9641  
    3838        iomodel->FetchDataToInput(elements,FrictionPEnum);
    3939        iomodel->FetchDataToInput(elements,FrictionQEnum);
    40         iomodel->FetchDataToInput(elements,ElementOnIceShelfEnum);
    41         iomodel->FetchDataToInput(elements,ElementOnBedEnum);
    42         iomodel->FetchDataToInput(elements,ElementOnSurfaceEnum);
    43         iomodel->FetchDataToInput(elements,ElementOnWaterEnum);
     40        iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum);
     41        iomodel->FetchDataToInput(elements,ElementonbedEnum);
     42        iomodel->FetchDataToInput(elements,ElementonsurfaceEnum);
     43        iomodel->FetchDataToInput(elements,MaskElementonwaterEnum);
    4444        iomodel->FetchDataToInput(elements,ElementsTypeEnum);
    4545        iomodel->FetchDataToInput(elements,MaterialsRheologyBEnum);

  • issm/trunk/src/c/modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp

    r9405 r9641  
    3535
    3636        //create penalties for nodes: no node can have a temperature over the melting point
    37         iomodel->FetchData(2,NodeOnBedEnum,ElementsEnum);
     37        iomodel->FetchData(2,NodeonbedEnum,ElementsEnum);
    3838        CreateSingleNodeToElementConnectivity(iomodel);
    3939
    4040        for (i=0;i<numberofvertices;i++){
    4141                if((iomodel->my_vertices[i]==1)){
    42                         if (iomodel->Data(NodeOnBedEnum)[i]){
     42                        if (iomodel->Data(NodeonbedEnum)[i]){
    4343                                loads->AddObject(new Pengrid(iomodel->loadcounter+i+1,i,iomodel,MeltingAnalysisEnum));
    4444                        }
    4545                }
    4646        }
    47         iomodel->DeleteData(2,NodeOnBedEnum,ElementsEnum);
     47        iomodel->DeleteData(2,NodeonbedEnum,ElementsEnum);
    4848
    4949        /*Assign output pointer: */

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

    r9405 r9641  
    3636
    3737        /*First fetch data: */
    38         iomodel->FetchData(6,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,VerticesTypeEnum,NodeOnWaterEnum);
     38        iomodel->FetchData(6,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,VerticesTypeEnum,MaskVertexonwaterEnum);
    3939        for (i=0;i<numberofvertices;i++){
    4040
    … …  
    4646                }
    4747        }
    48         iomodel->DeleteData(6,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,VerticesTypeEnum,NodeOnWaterEnum);
     48        iomodel->DeleteData(6,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,VerticesTypeEnum,MaskVertexonwaterEnum);
    4949
    5050        /*Assign output pointer: */

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

    r9636 r9641  
    4646        iomodel->FetchDataToInput(elements,FrictionPEnum);
    4747        iomodel->FetchDataToInput(elements,FrictionQEnum);
    48         iomodel->FetchDataToInput(elements,ElementOnIceShelfEnum);
    49         iomodel->FetchDataToInput(elements,ElementOnBedEnum);
    50         iomodel->FetchDataToInput(elements,ElementOnSurfaceEnum);
    51         iomodel->FetchDataToInput(elements,ElementOnWaterEnum);
     48        iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum);
     49        iomodel->FetchDataToInput(elements,ElementonbedEnum);
     50        iomodel->FetchDataToInput(elements,ElementonsurfaceEnum);
     51        iomodel->FetchDataToInput(elements,MaskElementonwaterEnum);
    5252        iomodel->FetchDataToInput(elements,ElementsTypeEnum);
    5353        iomodel->FetchDataToInput(elements,MaterialsRheologyBEnum);

  • issm/trunk/src/c/modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp

    r9405 r9641  
    6464        double *nodeonbed=NULL;
    6565        iomodel->FetchData(&penalties,&numpenalties,NULL,PenaltiesEnum);
    66         iomodel->FetchData(&nodeonbed,NULL,NULL,NodeOnBedEnum);
     66        iomodel->FetchData(&nodeonbed,NULL,NULL,NodeonbedEnum);
    6767
    6868        for(i=0;i<numpenalties;i++){

  • issm/trunk/src/c/modules/ModelProcessorx/Prognostic/CreateNodesPrognostic.cpp

    r9405 r9641  
    4949
    5050        /*First fetch data: */
    51         iomodel->FetchData(7,ElementsEnum,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,VerticesTypeEnum,NodeOnWaterEnum);
     51        iomodel->FetchData(7,ElementsEnum,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,VerticesTypeEnum,MaskVertexonwaterEnum);
    5252        if(continuous_galerkin){
    5353
    … …  
    8888
    8989        /*Clean fetched data: */
    90         iomodel->DeleteData(7,ElementsEnum,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,VerticesTypeEnum,NodeOnWaterEnum);
     90        iomodel->DeleteData(7,ElementsEnum,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,VerticesTypeEnum,MaskVertexonwaterEnum);
    9191
    9292        /*Assign output pointer: */

  • issm/trunk/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp

    r9612 r9641  
    3939        iomodel->FetchDataToInput(elements,SurfaceEnum);
    4040        iomodel->FetchDataToInput(elements,BedEnum);
    41         iomodel->FetchDataToInput(elements,ElementOnIceShelfEnum);
    42         iomodel->FetchDataToInput(elements,ElementOnWaterEnum);
     41        iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum);
     42        iomodel->FetchDataToInput(elements,MaskElementonwaterEnum);
    4343        iomodel->FetchDataToInput(elements,SurfaceforcingsAccumulationRateEnum);
    4444        iomodel->FetchDataToInput(elements,SurfaceforcingsAblationRateEnum);
    … …  
    5454       
    5555        if (dim==3){
    56                 iomodel->FetchDataToInput(elements,ElementOnBedEnum);
    57                 iomodel->FetchDataToInput(elements,ElementOnSurfaceEnum);
     56                iomodel->FetchDataToInput(elements,ElementonbedEnum);
     57                iomodel->FetchDataToInput(elements,ElementonsurfaceEnum);
    5858                iomodel->FetchDataToInput(elements,PressureEnum);
    5959                iomodel->FetchDataToInput(elements,TemperatureEnum);

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

    r9405 r9641  
    3636       
    3737        /*First fetch data: */
    38         iomodel->FetchData(6,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,VerticesTypeEnum,NodeOnWaterEnum);
     38        iomodel->FetchData(6,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,VerticesTypeEnum,MaskVertexonwaterEnum);
    3939
    4040        for (i=0;i<numberofvertices;i++){
    … …  
    4949
    5050        /*Clean fetched data: */
    51         iomodel->DeleteData(6,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,VerticesTypeEnum,NodeOnWaterEnum);
     51        iomodel->DeleteData(6,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,VerticesTypeEnum,MaskVertexonwaterEnum);
    5252       
    5353        /*Assign output pointer: */

  • issm/trunk/src/c/modules/ModelProcessorx/SurfaceSlope/UpdateElementsSurfaceSlope.cpp

    r9405 r9641  
    3636        iomodel->FetchDataToInput(elements,SurfaceEnum);
    3737        iomodel->FetchDataToInput(elements,BedEnum);
    38         iomodel->FetchDataToInput(elements,ElementOnWaterEnum);
     38        iomodel->FetchDataToInput(elements,MaskElementonwaterEnum);
    3939       
    4040        if (dim==3){
    41                 iomodel->FetchDataToInput(elements,ElementOnBedEnum);
    42                 iomodel->FetchDataToInput(elements,ElementOnSurfaceEnum);
     41                iomodel->FetchDataToInput(elements,ElementonbedEnum);
     42                iomodel->FetchDataToInput(elements,ElementonsurfaceEnum);
    4343        }
    4444       

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

    r9405 r9641  
    3636
    3737        /*Create nodes and vertices: */
    38         iomodel->FetchData(6,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,VerticesTypeEnum,NodeOnWaterEnum);
     38        iomodel->FetchData(6,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,VerticesTypeEnum,MaskVertexonwaterEnum);
    3939
    4040        for (i=0;i<numberofvertices;i++){
    … …  
    4848
    4949        /*Clean fetched data: */
    50         iomodel->DeleteData(6,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,VerticesTypeEnum,NodeOnWaterEnum);
     50        iomodel->DeleteData(6,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,VerticesTypeEnum,MaskVertexonwaterEnum);
    5151       
    5252        /*Assign output pointer: */

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

    r9636 r9641  
    4747        iomodel->FetchDataToInput(elements,FrictionPEnum);
    4848        iomodel->FetchDataToInput(elements,FrictionQEnum);
    49         iomodel->FetchDataToInput(elements,ElementOnIceShelfEnum);
    50         iomodel->FetchDataToInput(elements,ElementOnBedEnum);
    51         iomodel->FetchDataToInput(elements,ElementOnSurfaceEnum);
    52         iomodel->FetchDataToInput(elements,ElementOnWaterEnum);
     49        iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum);
     50        iomodel->FetchDataToInput(elements,ElementonbedEnum);
     51        iomodel->FetchDataToInput(elements,ElementonsurfaceEnum);
     52        iomodel->FetchDataToInput(elements,MaskElementonwaterEnum);
    5353        iomodel->FetchDataToInput(elements,ElementsTypeEnum);
    5454        iomodel->FetchDataToInput(elements,MaterialsRheologyBEnum);

  • issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp

    r9636 r9641  
    6161        else if (strcmp(name,"MaterialsThermalExchangeVelocity")==0) return MaterialsThermalExchangeVelocityEnum;
    6262        else if (strcmp(name,"MaterialsMeltingpoint")==0) return MaterialsMeltingpointEnum;
     63        else if (strcmp(name,"MaskElementongroundedice")==0) return MaskElementongroundediceEnum;
     64        else if (strcmp(name,"MaskElementonfloatingice")==0) return MaskElementonfloatingiceEnum;
     65        else if (strcmp(name,"MaskElementonwater")==0) return MaskElementonwaterEnum;
     66        else if (strcmp(name,"MaskVertexongroundedice")==0) return MaskVertexongroundediceEnum;
     67        else if (strcmp(name,"MaskVertexonfloatingice")==0) return MaskVertexonfloatingiceEnum;
     68        else if (strcmp(name,"MaskVertexonwater")==0) return MaskVertexonwaterEnum;
    6369        else if (strcmp(name,"Constraints")==0) return ConstraintsEnum;
    6470        else if (strcmp(name,"Elements")==0) return ElementsEnum;
    … …  
    180186        else if (strcmp(name,"ControlType")==0) return ControlTypeEnum;
    181187        else if (strcmp(name,"Converged")==0) return ConvergedEnum;
    182         else if (strcmp(name,"ElementOnBed")==0) return ElementOnBedEnum;
    183         else if (strcmp(name,"ElementOnIceSheet")==0) return ElementOnIceSheetEnum;
    184         else if (strcmp(name,"ElementOnIceShelf")==0) return ElementOnIceShelfEnum;
    185         else if (strcmp(name,"ElementOnSurface")==0) return ElementOnSurfaceEnum;
    186         else if (strcmp(name,"ElementOnWater")==0) return ElementOnWaterEnum;
     188        else if (strcmp(name,"Elementonbed")==0) return ElementonbedEnum;
     189        else if (strcmp(name,"Elementonsurface")==0) return ElementonsurfaceEnum;
    187190        else if (strcmp(name,"Fill")==0) return FillEnum;
    188191        else if (strcmp(name,"FractionIncrement")==0) return FractionIncrementEnum;
    … …  
    203206        else if (strcmp(name,"GroundinglineMeltingRate")==0) return GroundinglineMeltingRateEnum;
    204207        else if (strcmp(name,"Misfit")==0) return MisfitEnum;
    205         else if (strcmp(name,"NodeOnBed")==0) return NodeOnBedEnum;
    206         else if (strcmp(name,"NodeOnIceSheet")==0) return NodeOnIceSheetEnum;
    207         else if (strcmp(name,"NodeOnIceShelf")==0) return NodeOnIceShelfEnum;
    208         else if (strcmp(name,"NodeOnSurface")==0) return NodeOnSurfaceEnum;
     208        else if (strcmp(name,"Nodeonbed")==0) return NodeonbedEnum;
     209        else if (strcmp(name,"Nodeonsurface")==0) return NodeonsurfaceEnum;
    209210        else if (strcmp(name,"NumberNodeToElementConnectivity")==0) return NumberNodeToElementConnectivityEnum;
    210211        else if (strcmp(name,"PenaltyOffset")==0) return PenaltyOffsetEnum;
    … …  
    361362        else if (strcmp(name,"NumControlType")==0) return NumControlTypeEnum;
    362363        else if (strcmp(name,"Spcvy")==0) return SpcvyEnum;
    363         else if (strcmp(name,"NodeOnWater")==0) return NodeOnWaterEnum;
    364364        else if (strcmp(name,"Y")==0) return YEnum;
    365365        else if (strcmp(name,"ElementsType")==0) return ElementsTypeEnum;
    … …  
    370370        else if (strcmp(name,"Spcvz")==0) return SpcvzEnum;
    371371        else if (strcmp(name,"NumberOfNodes2D")==0) return NumberOfNodes2DEnum;
    372         else if (strcmp(name,"NodeOnStokes")==0) return NodeOnStokesEnum;
    373         else if (strcmp(name,"NodeOnHutter")==0) return NodeOnHutterEnum;
     372        else if (strcmp(name,"Nodeonstokes")==0) return NodeonstokesEnum;
     373        else if (strcmp(name,"Nodeonhutter")==0) return NodeonhutterEnum;
     374        else if (strcmp(name,"Nodeonpattyn")==0) return NodeonpattynEnum;
     375        else if (strcmp(name,"Nodeonmacayeal")==0) return NodeonmacayealEnum;
    374376        else if (strcmp(name,"Z")==0) return ZEnum;
    375377        else if (strcmp(name,"Spcthickness")==0) return SpcthicknessEnum;
    … …  
    377379        else if (strcmp(name,"Spcvx")==0) return SpcvxEnum;
    378380        else if (strcmp(name,"Upperelements")==0) return UpperelementsEnum;
    379         else if (strcmp(name,"NodeOnPattyn")==0) return NodeOnPattynEnum;
    380381        else if (strcmp(name,"Edges")==0) return EdgesEnum;
    381382        else if (strcmp(name,"Elements2D")==0) return Elements2DEnum;
    382383        else if (strcmp(name,"X")==0) return XEnum;
    383384        else if (strcmp(name,"NumCmResponses")==0) return NumCmResponsesEnum;
    384         else if (strcmp(name,"NodeOnMacayeal")==0) return NodeOnMacayealEnum;
    385385        else if (strcmp(name,"Elementconnectivity")==0) return ElementconnectivityEnum;
    386386        else if (strcmp(name,"ArtificialDiffusivity")==0) return ArtificialDiffusivityEnum;

  • issm/trunk/src/c/objects/Elements/Penta.cpp

    r9636 r9641  
    65756575
    65766576        bool onbed;
    6577         inputs->GetParameterValue(&onbed,ElementOnBedEnum);
     6577        inputs->GetParameterValue(&onbed,ElementonbedEnum);
    65786578        return onbed;
    65796579}
    … …  
    66136613
    66146614        bool onshelf;
    6615         inputs->GetParameterValue(&onshelf,ElementOnIceShelfEnum);
     6615        inputs->GetParameterValue(&onshelf,MaskElementonfloatingiceEnum);
    66166616        return onshelf;
    66176617}
    … …  
    66516651
    66526652        bool onsurface;
    6653         inputs->GetParameterValue(&onsurface,ElementOnSurfaceEnum);
     6653        inputs->GetParameterValue(&onsurface,ElementonsurfaceEnum);
    66546654        return onsurface;
    66556655}
    … …  
    66596659
    66606660        bool onwater;
    6661         inputs->GetParameterValue(&onwater,ElementOnWaterEnum);
     6661        inputs->GetParameterValue(&onwater,MaskElementonwaterEnum);
    66626662        return onwater;
    66636663}
    … …  
    75857585                        if(*(iomodel->Data(ElementsTypeEnum)+index)==PattynStokesApproximationEnum){
    75867586                                /*Create VzPattyn and VzStokes Enums*/
    7587                                 if(iomodel->Data(VzEnum) && iomodel->Data(NodeOnStokesEnum)){
    7588                                         for(i=0;i<6;i++) nodeinputs[i]=iomodel->Data(VzEnum)[penta_vertex_ids[i]-1]/yts*iomodel->Data(NodeOnStokesEnum)[penta_vertex_ids[i]-1];
     7587                                if(iomodel->Data(VzEnum) && iomodel->Data(NodeonstokesEnum)){
     7588                                        for(i=0;i<6;i++) nodeinputs[i]=iomodel->Data(VzEnum)[penta_vertex_ids[i]-1]/yts*iomodel->Data(NodeonstokesEnum)[penta_vertex_ids[i]-1];
    75897589                                        this->inputs->AddInput(new PentaVertexInput(VzStokesEnum,nodeinputs));
    7590                                         for(i=0;i<6;i++) nodeinputs[i]=iomodel->Data(VzEnum)[penta_vertex_ids[i]-1]/yts*(1-iomodel->Data(NodeOnStokesEnum)[penta_vertex_ids[i]-1]);
     7590                                        for(i=0;i<6;i++) nodeinputs[i]=iomodel->Data(VzEnum)[penta_vertex_ids[i]-1]/yts*(1-iomodel->Data(NodeonstokesEnum)[penta_vertex_ids[i]-1]);
    75917591                                        this->inputs->AddInput(new PentaVertexInput(VzPattynEnum,nodeinputs));
    75927592                                }
    … …  
    75997599                        if(*(iomodel->Data(ElementsTypeEnum)+index)==MacAyealStokesApproximationEnum){
    76007600                                /*Create VzMacAyeal and VzStokes Enums*/
    7601                                 if(iomodel->Data(VzEnum) && iomodel->Data(NodeOnStokesEnum)){
    7602                                         for(i=0;i<6;i++) nodeinputs[i]=iomodel->Data(VzEnum)[penta_vertex_ids[i]-1]/yts*iomodel->Data(NodeOnStokesEnum)[penta_vertex_ids[i]-1];
     7601                                if(iomodel->Data(VzEnum) && iomodel->Data(NodeonstokesEnum)){
     7602                                        for(i=0;i<6;i++) nodeinputs[i]=iomodel->Data(VzEnum)[penta_vertex_ids[i]-1]/yts*iomodel->Data(NodeonstokesEnum)[penta_vertex_ids[i]-1];
    76037603                                        this->inputs->AddInput(new PentaVertexInput(VzStokesEnum,nodeinputs));
    7604                                         for(i=0;i<6;i++) nodeinputs[i]=iomodel->Data(VzEnum)[penta_vertex_ids[i]-1]/yts*(1-iomodel->Data(NodeOnStokesEnum)[penta_vertex_ids[i]-1]);
     7604                                        for(i=0;i<6;i++) nodeinputs[i]=iomodel->Data(VzEnum)[penta_vertex_ids[i]-1]/yts*(1-iomodel->Data(NodeonstokesEnum)[penta_vertex_ids[i]-1]);
    76057605                                        this->inputs->AddInput(new PentaVertexInput(VzMacAyealEnum,nodeinputs));
    76067606                                }

  • issm/trunk/src/c/objects/Elements/Tria.cpp

    r9639 r9641  
    40014001       
    40024002        bool onbed;
    4003         inputs->GetParameterValue(&onbed,ElementOnBedEnum);
     4003        inputs->GetParameterValue(&onbed,ElementonbedEnum);
    40044004        return onbed;
    40054005}
    … …  
    40094009
    40104010        bool shelf;
    4011         inputs->GetParameterValue(&shelf,ElementOnIceShelfEnum);
     4011        inputs->GetParameterValue(&shelf,MaskElementonfloatingiceEnum);
    40124012        return shelf;
    40134013}
    … …  
    40474047
    40484048        bool water;
    4049         inputs->GetParameterValue(&water,ElementOnWaterEnum);
     4049        inputs->GetParameterValue(&water,MaskElementonwaterEnum);
    40504050        return water;
    40514051}
    … …  
    46034603                if(b[i]==ba[i]){
    46044604                               
    4605                         nodes[i]->inputs->AddInput(new BoolInput(NodeOnIceShelfEnum,false));
    4606                         nodes[i]->inputs->AddInput(new BoolInput(NodeOnIceSheetEnum,true));
     4605                        nodes[i]->inputs->AddInput(new BoolInput(MaskVertexonfloatingiceEnum,false));
     4606                        nodes[i]->inputs->AddInput(new BoolInput(MaskVertexongroundediceEnum,true));
    46074607                }
    46084608                else{
    4609                         nodes[i]->inputs->AddInput(new BoolInput(NodeOnIceShelfEnum,true));
    4610                         nodes[i]->inputs->AddInput(new BoolInput(NodeOnIceSheetEnum,false));
     4609                        nodes[i]->inputs->AddInput(new BoolInput(MaskVertexonfloatingiceEnum,true));
     4610                        nodes[i]->inputs->AddInput(new BoolInput(MaskVertexongroundediceEnum,false));
    46114611
    46124612                }
    … …  
    46234623        }
    46244624        if(!this->IsOnShelf() && elementonshelf==true)swap=1;
    4625     this->inputs->AddInput(new BoolInput(ElementOnIceShelfEnum,elementonshelf));
     4625    this->inputs->AddInput(new BoolInput(MaskElementonfloatingiceEnum,elementonshelf));
    46264626       
    46274627    /*If this element just  became ungrounded, set its basal melting rate at 50 m/yr:*/
    … …  
    53485348        for(i=0;i<3;i++){
    53495349                if(b[i]<=ba[i]){ //the = will lead to oscillations.
    5350                         nodes[i]->inputs->AddInput(new BoolInput(NodeOnIceShelfEnum,false));
    5351                         nodes[i]->inputs->AddInput(new BoolInput(NodeOnIceSheetEnum,true));
     5350                        nodes[i]->inputs->AddInput(new BoolInput(MaskVertexonfloatingiceEnum,false));
     5351                        nodes[i]->inputs->AddInput(new BoolInput(MaskVertexongroundediceEnum,true));
    53525352                        if(shelfstatus[i]){
    53535353                                flipped++;
    … …  
    53575357                }
    53585358                else{
    5359                         nodes[i]->inputs->AddInput(new BoolInput(NodeOnIceShelfEnum,true));
    5360                         nodes[i]->inputs->AddInput(new BoolInput(NodeOnIceSheetEnum,false));
     5359                        nodes[i]->inputs->AddInput(new BoolInput(MaskVertexonfloatingiceEnum,true));
     5360                        nodes[i]->inputs->AddInput(new BoolInput(MaskVertexongroundediceEnum,false));
    53615361                        if(!shelfstatus[i]){
    53625362                                flipped++;
    … …  
    53755375                }
    53765376        }
    5377     this->inputs->AddInput(new BoolInput(ElementOnIceShelfEnum,elementonshelf));
     5377    this->inputs->AddInput(new BoolInput(MaskElementonfloatingiceEnum,elementonshelf));
    53785378
    53795379         return flipped;
    … …  
    53835383void Tria::UpdateShelfFlags(double* new_shelf_nodes){
    53845384
    5385         /*go through vertices, and update the status of NodeOnIceShelfEnum and NodeOnIceSheetEnum flags: */
     5385        /*go through vertices, and update the status of MaskVertexonfloatingiceEnum and MaskVertexongroundediceEnum flags: */
    53865386        bool flag;
    53875387        int  i;
    … …  
    53985398        for(i=0;i<3;i++){
    53995399                flag=(bool)new_shelf_nodes[nodes[i]->Sid()];
    5400                 nodes[i]->inputs->AddInput(new BoolInput(NodeOnIceShelfEnum,flag));
    5401                 nodes[i]->inputs->AddInput(new BoolInput(NodeOnIceSheetEnum,!flag));
     5400                nodes[i]->inputs->AddInput(new BoolInput(MaskVertexonfloatingiceEnum,flag));
     5401                nodes[i]->inputs->AddInput(new BoolInput(MaskVertexongroundediceEnum,!flag));
    54025402        }
    54035403}

  • issm/trunk/src/c/objects/Loads/Riftfront.cpp

    r9619 r9641  
    102102        riftfront_friction=*(iomodel->Data(RiftsRiftstructEnum)+RIFTINFOSIZE*i+8);
    103103        riftfront_fractionincrement=*(iomodel->Data(RiftsRiftstructEnum)+RIFTINFOSIZE*i+10);
    104         riftfront_shelf=(bool)iomodel->Data(NodeOnIceShelfEnum)[node1-1];
     104        riftfront_shelf=(bool)iomodel->Data(MaskVertexonfloatingiceEnum)[node1-1];
    105105
    106106        this->inputs->AddInput(new IntInput(TypeEnum,riftfront_type));

  • issm/trunk/src/c/objects/Node.cpp

    r9405 r9641  
    5454        //intialize inputs, and add as many inputs per element as requested:
    5555        this->inputs=new Inputs();
    56         if (iomodel->Data(NodeOnBedEnum))      this->inputs->AddInput(new BoolInput(NodeOnBedEnum,(IssmBool)iomodel->Data(NodeOnBedEnum)[io_index]));
    57         if (iomodel->Data(NodeOnSurfaceEnum))  this->inputs->AddInput(new BoolInput(NodeOnSurfaceEnum,(IssmBool)iomodel->Data(NodeOnSurfaceEnum)[io_index]));
    58         if (iomodel->Data(NodeOnIceShelfEnum)) this->inputs->AddInput(new BoolInput(NodeOnIceShelfEnum,(IssmBool)iomodel->Data(NodeOnIceShelfEnum)[io_index]));
    59         if (iomodel->Data(NodeOnIceSheetEnum)) this->inputs->AddInput(new BoolInput(NodeOnIceSheetEnum,(IssmBool)iomodel->Data(NodeOnIceSheetEnum)[io_index]));
     56        if (iomodel->Data(NodeonbedEnum))      this->inputs->AddInput(new BoolInput(NodeonbedEnum,(IssmBool)iomodel->Data(NodeonbedEnum)[io_index]));
     57        if (iomodel->Data(NodeonsurfaceEnum))  this->inputs->AddInput(new BoolInput(NodeonsurfaceEnum,(IssmBool)iomodel->Data(NodeonsurfaceEnum)[io_index]));
     58        if (iomodel->Data(MaskVertexonfloatingiceEnum)) this->inputs->AddInput(new BoolInput(MaskVertexonfloatingiceEnum,(IssmBool)iomodel->Data(MaskVertexonfloatingiceEnum)[io_index]));
     59        if (iomodel->Data(MaskVertexongroundediceEnum)) this->inputs->AddInput(new BoolInput(MaskVertexongroundediceEnum,(IssmBool)iomodel->Data(MaskVertexongroundediceEnum)[io_index]));
    6060        if (iomodel->numbernodetoelementconnectivity) this->inputs->AddInput(new IntInput(NumberNodeToElementConnectivityEnum,(IssmInt)iomodel->numbernodetoelementconnectivity[io_index]));
    6161        if (analysis_type==DiagnosticHorizAnalysisEnum) this->inputs->AddInput(new IntInput(ApproximationEnum,(IssmInt)iomodel->Data(VerticesTypeEnum)[io_index]));
    … …  
    6464
    6565        /*spc all nodes on water*/
    66         if (!iomodel->Data(NodeOnWaterEnum)) _error_("iomodel->nodeonwater is NULL");
    67         if (iomodel->Data(NodeOnWaterEnum)[io_index]){
     66        if (!iomodel->Data(MaskVertexonwaterEnum)) _error_("iomodel->nodeonwater is NULL");
     67        if (iomodel->Data(MaskVertexonwaterEnum)[io_index]){
    6868                for(k=1;k<=gsize;k++){
    6969                        this->FreezeDof(k);
    … …  
    7575                if (dim==3){
    7676                        /*We have a  3d mesh, we may have collapsed elements, hence dead nodes. Freeze them out: */
    77                         if (!iomodel->Data(NodeOnBedEnum)) _error_("iomodel->nodeonbed is NULL");
     77                        if (!iomodel->Data(NodeonbedEnum)) _error_("iomodel->nodeonbed is NULL");
    7878                        if (!iomodel->Data(VerticesTypeEnum)) _error_("iomodel->vertices_type is NULL");
    79                         if (iomodel->Data(VerticesTypeEnum)[io_index]==MacAyealApproximationEnum && !iomodel->Data(NodeOnBedEnum)[io_index]){
     79                        if (iomodel->Data(VerticesTypeEnum)[io_index]==MacAyealApproximationEnum && !iomodel->Data(NodeonbedEnum)[io_index]){
    8080                                for(k=1;k<=gsize;k++) this->FreezeDof(k);
    8181                        }
    82                         if (iomodel->Data(VerticesTypeEnum)[io_index]==MacAyealPattynApproximationEnum && iomodel->Data(NodeOnMacayealEnum)[io_index]){
    83                                 if(!iomodel->Data(NodeOnBedEnum)[io_index]){
     82                        if (iomodel->Data(VerticesTypeEnum)[io_index]==MacAyealPattynApproximationEnum && iomodel->Data(NodeonmacayealEnum)[io_index]){
     83                                if(!iomodel->Data(NodeonbedEnum)[io_index]){
    8484                                        for(k=1;k<=gsize;k++) this->FreezeDof(k);
    8585                                }
    8686                        }
    87                         if (iomodel->Data(VerticesTypeEnum)[io_index]==MacAyealStokesApproximationEnum && iomodel->Data(NodeOnMacayealEnum)[io_index]){
    88                                 if(!iomodel->Data(NodeOnBedEnum)[io_index]){
     87                        if (iomodel->Data(VerticesTypeEnum)[io_index]==MacAyealStokesApproximationEnum && iomodel->Data(NodeonmacayealEnum)[io_index]){
     88                                if(!iomodel->Data(NodeonbedEnum)[io_index]){
    8989                                        for(k=1;k<=2;k++) this->FreezeDof(k);
    9090                                }
    … …  
    9292                }
    9393                /*spc all nodes on hutter*/
    94                 if (!iomodel->Data(NodeOnHutterEnum)) _error_("iomodel->nodeonhutter is NULL");
    95                 if (iomodel->Data(NodeOnHutterEnum)[io_index]){
     94                if (!iomodel->Data(NodeonhutterEnum)) _error_("iomodel->nodeonhutter is NULL");
     95                if (iomodel->Data(NodeonhutterEnum)[io_index]){
    9696                        for(k=1;k<=gsize;k++){
    9797                                this->FreezeDof(k);
    … …  
    104104        if (analysis_type==DiagnosticHutterAnalysisEnum){
    105105                /*Constrain all nodes that are not Hutter*/
    106                 if (!iomodel->Data(NodeOnHutterEnum)) _error_("iomodel->nodeonhutter is NULL");
    107                 if (!iomodel->Data(NodeOnHutterEnum)[io_index]){
     106                if (!iomodel->Data(NodeonhutterEnum)) _error_("iomodel->nodeonhutter is NULL");
     107                if (!iomodel->Data(NodeonhutterEnum)[io_index]){
    108108                        for(k=1;k<=gsize;k++){
    109109                                this->FreezeDof(k);
    … …  
    122122                if (dim==3){
    123123                        /*On a 3d mesh, we may have collapsed elements, hence dead nodes. Freeze them out: */
    124                         _assert_(iomodel->Data(NodeOnBedEnum));
    125                         if (!iomodel->Data(NodeOnBedEnum)[io_index]){
     124                        _assert_(iomodel->Data(NodeonbedEnum));
     125                        if (!iomodel->Data(NodeonbedEnum)[io_index]){
    126126                                for(k=1;k<=gsize;k++){
    127127                                        this->FreezeDof(k);
    … …  
    739739
    740740        /*recover parameters: */
    741         inputs->GetParameterValue(&onbed,NodeOnBedEnum);
     741        inputs->GetParameterValue(&onbed,NodeonbedEnum);
    742742
    743743        return onbed;
    … …  
    750750
    751751        /*recover parameters: */
    752         inputs->GetParameterValue(&onsheet,NodeOnIceSheetEnum);
     752        inputs->GetParameterValue(&onsheet,MaskVertexongroundediceEnum);
    753753
    754754        return onsheet;
    … …  
    761761
    762762        /*recover parameters: */
    763         inputs->GetParameterValue(&onshelf,NodeOnIceShelfEnum);
     763        inputs->GetParameterValue(&onshelf,MaskVertexonfloatingiceEnum);
    764764
    765765        return onshelf;
    … …  
    772772
    773773        /*recover parameters: */
    774         inputs->GetParameterValue(&onsurface,NodeOnSurfaceEnum);
     774        inputs->GetParameterValue(&onsurface,NodeonsurfaceEnum);
    775775
    776776        return onsurface;

  • issm/trunk/src/c/solutions/groundinglinemigration2d_core.cpp

    r9401 r9641  
    2929        if(solution_type==GroundinglineMigration2DSolutionEnum){
    3030                _printf_(VerboseSolution(),"%s\n","   saving results\n");
    31                 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ElementOnIceShelfEnum);
     31                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,MaskElementonfloatingiceEnum);
    3232                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ThicknessEnum);
    3333                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SurfaceEnum);

  • issm/trunk/src/c/solutions/transient_core.cpp

    r9628 r9641  
    9696                        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BasalforcingsMeltingRateEnum,step,time);
    9797                        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SurfaceforcingsMassBalanceEnum,step,time);
    98                         InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ElementOnIceShelfEnum,step,time);
     98                        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,MaskElementonfloatingiceEnum,step,time);
    9999
    100100                        /*unload results*/

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

    r9636 r9641  
    2828                 groundingline = modelfield('default',0,'marshall',true);
    2929                 materials = modelfield('default',0,'marshall',true);
     30                 mask = modelfield('default',0,'marshall',true);
    3031
    3132                 %FIXME: all other fields should belong to other classes
    … …  
    108109
    109110                 %Geometrical parameters
    110                  elementoniceshelf = modelfield('default',NaN,'marshall',true,'format','BooleanMat','mattype',2);
    111                  elementonicesheet = modelfield('default',NaN,'marshall',true,'format','BooleanMat','mattype',2);
    112                  elementonwater    = modelfield('default',NaN,'marshall',true,'format','BooleanMat','mattype',2);
    113                  nodeoniceshelf    = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
    114                  nodeonicesheet    = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
    115                  nodeonwater       = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
    116111                 surface           = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
    117112                 thickness         = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1);
    … …  
    324319                         disp(sprintf('%s%s%s','      Materials: type ''',inputname(1),'.mat'' to display'));
    325320                         disp(sprintf('%s%s%s','      Parameters: type ''',inputname(1),'.par'' to display'));
    326                          disp(sprintf('%s%s%s','      ExpPar: type ''',inputname(1),'.exppar'' to display'));
    327321                         disp(sprintf('   Solution parameters: %s'));
    328322                         disp(sprintf('%s%s%s','      Qmu: type ''',inputname(1),'.qmu'' to display'));
    … …  
    407401                         if isfield(structmd,'rheology_B'), md.materials.rheology_B=structmd.B; end
    408402                         if isfield(structmd,'rheology_n'), md.materials.rheology_n=structmd.n; end
     403                         if isfield(structmd,'elementoniceshelf'), md.mask.elementonfloatingice=structmd.elementoniceshelf; end
     404                         if isfield(structmd,'elementonicesheet'), md.mask.elementongroundedice=structmd.elementonicesheet; end
     405                         if isfield(structmd,'elementonwater'), md.mask.elementonwater=structmd.elementonwater; end
     406                         if isfield(structmd,'nodeoniceshelf'), md.mask.vertexonfloatingice=structmd.nodeoniceshelf; end
     407                         if isfield(structmd,'nodeonicesheet'), md.mask.vertexongroundedice=structmd.nodeonicesheet; end
     408                         if isfield(structmd,'nodeonwater'), md.mask.vertexonwater=structmd.nodeonwater; end
    409409
    410410                         %Field changes
    … …  
    526526                         md.groundingline=groundingline;
    527527                         md.materials=materials;
     528                         md.mask=mask;
    528529
    529530
    … …  
    663664                                 if(strcmp(index1.subs,'mat')), displaymaterials(md);return; end
    664665                                 if(strcmp(index1.subs,'par')), displayparameters(md);return; end
    665                                  if(strcmp(index1.subs,'exppar')), displayexppar(md);return; end
    666666                                 if(strcmp(index1.subs,'res')), displayresults(md);return; end
    667667                                 if(strcmp(index1.subs,'obs')), displayobservations(md);return; end

  • issm/trunk/src/m/model/BasinConstrain.m

    r8823 r9641  
    1818        if isempty(domain),
    1919                elementondomain=zeros(md.numberofelements,1);
    20                 nodeondomain=zeros(md.numberofnodes,1);
     20                vertexondomain=zeros(md.numberofnodes,1);
    2121                invert=0;
    2222        elseif strcmpi(domain,'all')
    2323                elementondomain=ones(md.numberofelements,1);
    24                 nodeondomain=ones(md.numberofnodes,1);
     24                vertexondomain=ones(md.numberofnodes,1);
    2525                invert=0;
    2626        else
    … …  
    3333                end
    3434                %ok, flag elements and nodes
    35                 [nodeondomain elementondomain]=ContourToMesh(md.elements(:,1:3),md.x,md.y,domain,'element and node',2);
     35                [vertexondomain elementondomain]=ContourToMesh(md.elements(:,1:3),md.x,md.y,domain,'element and node',2);
    3636        end
    3737        if invert,
    38                 nodeondomain=~nodeondomain;
     38                vertexondomain=~vertexondomain;
    3939                elementondomain=~elementondomain;
    4040        end
    … …  
    4444
    4545%list of elements and nodes not on domain
    46 nodenotondomain=find(~nodeondomain);
     46vertexnotondomain=find(~vertexondomain);
    4747elementnotondomain=find(~elementondomain);
    4848
    4949%all elements outside the constraint domain are equivalent to water. all nodes outside are spc'd.
    50 md.spcvx(nodenotondomain)=md.vx_obs(nodenotondomain);
    51 md.spcvy(nodenotondomain)=md.vy_obs(nodenotondomain);
    52 md.elementonwater(elementnotondomain)=1;
     50md.spcvx(vertexnotondomain)=md.vx_obs(vertexnotondomain);
     51md.spcvy(vertexnotondomain)=md.vy_obs(vertexnotondomain);
     52md.mask.elementonwater(elementnotondomain)=1;
    5353
    5454%now, make sure all elements on water have nodes that are spc'd, otherwise, we'll get a singular problem.
    55 pos=find(~md.elementonwater);
     55pos=find(~md.mask.elementonwater);
    5656numpos=unique(md.elements(pos,:));
    5757nodes=setdiff(1:1:md.numberofnodes,numpos);

  • issm/trunk/src/m/model/BasinConstrainShelf.m

    r8823 r9641  
    1818        if isempty(domain),
    1919                elementondomain=zeros(md.numberofelements,1);
    20                 nodeondomain=zeros(md.numberofnodes,1);
     20                vertexondomain=zeros(md.numberofnodes,1);
    2121                invert=0;
    2222        elseif strcmpi(domain,'all')
    2323                elementondomain=ones(md.numberofelements,1);
    24                 nodeondomain=ones(md.numberofnodes,1);
     24                vertexondomain=ones(md.numberofnodes,1);
    2525                invert=0;
    2626        else
    … …  
    3333                end
    3434                %ok, flag elements and nodes
    35                 [nodeondomain elementondomain]=ContourToMesh(md.elements(:,1:3),md.x,md.y,domain,'element and node',2);
     35                [vertexondomain elementondomain]=ContourToMesh(md.elements(:,1:3),md.x,md.y,domain,'element and node',2);
    3636        end
    3737        if invert,
    38                 nodeondomain=~nodeondomain;
     38                vertexondomain=~vertexondomain;
    3939                elementondomain=~elementondomain;
    4040        end
    … …  
    4444
    4545%list of elements and nodes not on domain
    46 nodenotondomain=find(~nodeondomain);
     46vertexnotondomain=find(~vertexondomain);
    4747elementnotondomain=find(~elementondomain);
    4848
    4949%all elements outside the constraint domain are equivalent to water. all nodes outside are spc'd.
    50 md.spcvx(nodenotondomain)=md.vx_obs(nodenotondomain);
    51 md.spcvy(nodenotondomain)=md.vy_obs(nodenotondomain);
    52 md.elementonwater(elementnotondomain)=1;
     50md.spcvx(vertexnotondomain)=md.vx_obs(vertexnotondomain);
     51md.spcvy(vertexnotondomain)=md.vy_obs(vertexnotondomain);
     52md.mask.elementonwater(elementnotondomain)=1;
    5353
    5454%now, make sure all elements on water have nodes that are spc'd, otherwise, we'll get a singular problem.
    55 pos=find(~md.elementonwater);
     55pos=find(~md.mask.elementonwater);
    5656numpos=unique(md.elements(pos,:));
    5757nodes=setdiff(1:1:md.numberofnodes,numpos);
    … …  
    6666md.spcvy(pos)=md.vy_obs(pos);
    6767
    68 %iceshelves: any node on icesheet is spc'd
    69 pos=find(md.nodeonicesheet);
     68%iceshelves: any vertex on floating ice is spc'd
     69pos=find(md.mask.vertexongroundedice);
    7070md.spcvx(pos)=md.vx_obs(pos);
    7171md.spcvy(pos)=md.vy_obs(pos);

  • issm/trunk/src/m/model/MeltingGroundingLines.m

    r8298 r9641  
    77
    88%get nodes on ice sheet and on ice shelf
    9 pos_shelf=find(~md.nodeonicesheet);
    10 pos_GL=intersect(unique(md.elements(find(md.elementonicesheet),:)),unique(md.elements(find(md.elementoniceshelf),:)));
     9pos_shelf=find(~md.mask.vertexongroundedice);
     10pos_GL=intersect(unique(md.elements(find(md.mask.elementongroundedice),:)),unique(md.elements(find(md.mask.elementonfloatingice),:)));
    1111
    1212for i=1:length(pos_shelf)

  • issm/trunk/src/m/model/ThicknessCorrection.m

    r9636 r9641  
    2323
    2424%get nodes on ice sheet and on ice shelf
    25 pos_shelf=find(~md.nodeonicesheet);
    26 pos_GL=intersect(unique(md.elements(find(md.elementonicesheet),:)),unique(md.elements(find(md.elementoniceshelf),:)));
     25pos_shelf=find(~md.mask.vertexongroundedice);
     26pos_GL=intersect(unique(md.elements(find(md.mask.elementongroundedice),:)),unique(md.elements(find(md.mask.elementonfloatingice),:)));
    2727debug=(length(pos_shelf)>50000);
    2828
    2929%check that there is a GL
    3030if isempty(pos_GL)
    31         error('ThicknessCorrection error message: no grounding line has been detected. Check the model geography');
     31        error('ThicknessCorrection error message: no grounding line has been detected. Check the model mask');
    3232end
    3333

  • issm/trunk/src/m/model/collapse.m

    r9636 r9641  
    8888md.bed=project2d(md,md.bed,1);
    8989md.nodeonboundary=project2d(md,md.nodeonboundary,1);
    90 md.elementoniceshelf=project2d(md,md.elementoniceshelf,1);
    91 md.nodeoniceshelf=project2d(md,md.nodeoniceshelf,1);
    92 md.elementonicesheet=project2d(md,md.elementonicesheet,1);
    93 md.nodeonicesheet=project2d(md,md.nodeonicesheet,1);
     90md.mask.elementonfloatingice=project2d(md,md.mask.elementonfloatingice,1);
     91md.mask.vertexonfloatingice=project2d(md,md.mask.vertexonfloatingice,1);
     92md.mask.elementongroundedice=project2d(md,md.mask.elementongroundedice,1);
     93md.mask.vertexongroundedice=project2d(md,md.mask.vertexongroundedice,1);
    9494
    9595%Initialize with the 2d mesh

  • issm/trunk/src/m/model/contourenvelope.m

    r8730 r9641  
    77%   Example:
    88%      segments=contourenvelope(md,'Stream.exp');
    9 %      segments=contourenvelope(md,md.elementoniceshelf)
     9%      segments=contourenvelope(md,md.mask.elementonfloatingice)
    1010%      segments=contourenvelope(md);
    1111

  • issm/trunk/src/m/model/display/displaybc.m

    r9612 r9641  
    1111disp(sprintf('   Boundary conditions:'));
    1212
    13 disp(sprintf('\n      geography:'));
    14 fielddisplay(md,'nodeonboundary','node on boundary flags list');
    15 fielddisplay(md,'elementoniceshelf','element on ice shelf flags list');
    16 fielddisplay(md,'nodeoniceshelf','node on ice shelf flags list');
    17 fielddisplay(md,'elementonicesheet','element on ice sheet flags list');
    18 fielddisplay(md,'nodeonicesheet','node on ice sheet flags list');
    19 
    2013disp(sprintf('\n      diagnostic:'));
    2114fielddisplay(md,'spcvx','x-axis velocity constraint (NaN means no constraint)');

  • issm/trunk/src/m/model/extrude.m

    r9636 r9641  
    207207md.bathymetry=project3d(md,'vector',md.bathymetry,'type','node');
    208208md.nodeonboundary=project3d(md,'vector',md.nodeonboundary,'type','node');
    209 md.elementoniceshelf=project3d(md,'vector',md.elementoniceshelf,'type','element');
    210 md.nodeoniceshelf=project3d(md,'vector',md.nodeoniceshelf,'type','node');
    211 md.elementonicesheet=project3d(md,'vector',md.elementonicesheet,'type','element');
    212 md.nodeonicesheet=project3d(md,'vector',md.nodeonicesheet,'type','node');
    213 md.elementonwater=project3d(md,'vector',md.elementonwater,'type','element');
    214 md.nodeonwater=project3d(md,'vector',md.nodeonwater,'type','node');
     209md.mask.elementonfloatingice=project3d(md,'vector',md.mask.elementonfloatingice,'type','element');
     210md.mask.vertexonfloatingice=project3d(md,'vector',md.mask.vertexonfloatingice,'type','node');
     211md.mask.elementongroundedice=project3d(md,'vector',md.mask.elementongroundedice,'type','element');
     212md.mask.vertexongroundedice=project3d(md,'vector',md.mask.vertexongroundedice,'type','node');
     213md.mask.elementonwater=project3d(md,'vector',md.mask.elementonwater,'type','element');
     214md.mask.vertexonwater=project3d(md,'vector',md.mask.vertexonwater,'type','node');
    215215if ~isnan(md.weights),md.weights=project3d(md,'vector',md.weights,'type','node');end;
    216216

  • issm/trunk/src/m/model/ismodelselfconsistent.m

    r9639 r9641  
    8383%NO NAN {{{1
    8484fields={'numberofelements','numberofnodes','x','y','z','friction.coefficient','friction.p','friction.q',...
    85         'materials.rho_ice','materials.rho_water','materials.rheology_B','elementoniceshelf','surface','thickness','bed','constants.g','settings.lowmem','nsteps','maxiter',...
     85        'materials.rho_ice','materials.rho_water','materials.rheology_B','mask.elementonfloatingice','surface','thickness','bed','constants.g','settings.lowmem','nsteps','maxiter',...
    8686        'eps_res','max_nonlinear_iterations','materials.rheology_n','nodeonbed','nodeonsurface','elementonbed','elementonsurface','elementconnectivity'};
    8787checknan(md,fields);
    … …  
    8989%FIELDS >= 0 {{{1
    9090fields={'numberofelements','numberofnodes','elements','friction.coefficient','friction.p','friction.q',...
    91         'materials.rho_ice','materials.rho_water','materials.rheology_B','elementoniceshelf','thickness','constants.g','eps_res','max_nonlinear_iterations','eps_rel','eps_abs','nsteps','maxiter',...
     91        'materials.rho_ice','materials.rho_water','materials.rheology_B','mask.elementonfloatingice','thickness','constants.g','eps_res','max_nonlinear_iterations','eps_rel','eps_abs','nsteps','maxiter',...
    9292        'settings.lowmem','materials.rheology_n','nodeonbed','nodeonsurface','elementonbed','elementonsurface'};
    9393checkgreater(md,fields,0);
    … …  
    9999%}}}
    100100%SIZE NUMBEROFELEMENTS {{{1
    101 fields={'friction.p','friction.q','elementoniceshelf','materials.rheology_n','elementonbed'};
     101fields={'friction.p','friction.q','mask.elementonfloatingice','materials.rheology_n','elementonbed'};
    102102checksize(md,fields,[md.numberofelements 1]);
    103103%}}}
    … …  
    130130                message(['model not consistent: model ' md.miscellaneous.name ' requesting grounding line migration, but bathymetry is absent!']);
    131131        end
    132         pos=find(md.nodeonicesheet);
     132        pos=find(md.mask.vertexongroundedice);
    133133        if any(md.bed(pos)-md.bathymetry(pos)),
    134                 message(['model not consistent: model ' md.miscellaneous.name ' bathymetry not equal to bed on icesheet!']);
    135         end
    136         pos=find(md.nodeoniceshelf);
     134                message(['model not consistent: model ' md.miscellaneous.name ' bathymetry not equal to bed on grounded ice !']);
     135        end
     136        pos=find(md.mask.vertexonfloatingice);
    137137        if any(md.bathymetry(pos)-md.bed(pos)>tolerance),
    138                 message(['model not consistent: model ' md.miscellaneous.name ' bathymetry superior to bed on iceshelf!']);
     138                message(['model not consistent: model ' md.miscellaneous.name ' bathymetry superior to bed on floating ice !']);
    139139        end
    140140
    … …  
    209209                message(['model not consistent: model ' md.miscellaneous.name ' control_type field should be a cell of strings']);
    210210        end
    211         if ~ismember(md.control_type,{'Dhdt' 'FrictionCoefficient' 'RheologyBbar' 'Vx' 'Vy'});
    212                 message(['model not consistent: model ' md.miscellaneous.name ' control_type field should be ''Dhdt'' ''FrictionCoefficient'' ''RheologyBbar'' ''Vx'' ''Vy''']);
     211        if ~ismember(md.control_type,{'Dhdt' 'FrictionCoefficient' 'MaterialsRheologyBbar' 'Vx' 'Vy'});
     212                message(['model not consistent: model ' md.miscellaneous.name ' control_type field should be ''Dhdt'' ''FrictionCoefficient'' ''MaterialsRheologyBbar'' ''Vx'' ''Vy''']);
    213213        end
    214214
    … …  
    435435                        % {{{2
    436436                        %HUTTER ON ICESHELF WARNING
    437                         if any(md.elements_type==1 & md.elementoniceshelf),
     437                        if any(md.elements_type==1 & md.mask.elementonfloatingice),
    438438                                disp(sprintf('\n !!! Warning: Hutter''s model is not consistent on ice shelves !!!\n'));
    439439                        end

  • issm/trunk/src/m/model/marshall.m

    r9625 r9641  
    270270if strcmp(string,'Numberofnodes'),
    271271        string='Numberofvertices';
    272 end
    273 
    274 if findstr(string,'icesheet'),
    275         indices=findstr(string,'icesheet');
    276         for i=1:length(indices),
    277                 string(indices(i):(indices(i)+7))='IceSheet';
    278         end
    279 end
    280 
    281 if findstr(string,'iceshelf'),
    282         indices=findstr(string,'iceshelf');
    283         for i=1:length(indices),
    284                 string(indices(i):(indices(i)+7))='IceShelf';
    285         end
    286 end
    287 
    288 if strncmpi(string,'elementon',9),
    289         string(1:9)='ElementOn';
    290         string(10)=upper(string(10));
    291 end
    292 
    293 if strncmpi(string,'nodeon',6),
    294         string(1:6)='NodeOn';
    295         string(7)=upper(string(7));
    296272end
    297273

  • issm/trunk/src/m/model/modelextract.m

    r9632 r9641  
    1616%   Examples:
    1717%      md2=modelextract(md,'Domain.exp');
    18 %      md2=modelextract(md,md.elementoniceshelf);
     18%      md2=modelextract(md,md.mask.elementonfloatingice);
    1919%
    2020%   See also: EXTRUDE, COLLAPSE
    … …  
    8484        model_fields=fields(md1);
    8585        for i=1:length(model_fields),
    86 
    8786                %get field
    8887                field=md1.(model_fields{i});
    8988                fieldsize=size(field);
    90 
    91                 %size = number of nodes * n
    92                 if fieldsize(1)==numberofnodes1
    93                         md2.(model_fields{i})=field(pos_node,:);
    94                 elseif (fieldsize(1)==numberofnodes1+1)
    95                         md2.(model_fields(i))=[field(pos_node,:); field(end,:)];
    96                 %size = number of elements * n
    97                 elseif fieldsize(1)==numberofelements1
    98                         md2.(model_fields{i})=field(pos_elem,:);
     89                if isobject(field), %recursive call
     90                        object_fields=fields(md1.(model_fields{i}));
     91                        for j=1:length(object_fields),
     92                                %get field
     93                                field=md1.(model_fields{i}).(object_fields{j});
     94                                fieldsize=size(field);
     95                                %size = number of nodes * n
     96                                if fieldsize(1)==numberofnodes1
     97                                        md2.(model_fields{i}).(object_fields{j})=field(pos_node,:);
     98                                elseif (fieldsize(1)==numberofnodes1+1)
     99                                        md2.(model_fields(i)).(object_fields{j})=[field(pos_node,:); field(end,:)];
     100                                        %size = number of elements * n
     101                                elseif fieldsize(1)==numberofelements1
     102                                        md2.(model_fields{i}).(object_fields{j})=field(pos_elem,:);
     103                                end
     104                        end
     105                else
     106                        %size = number of nodes * n
     107                        if fieldsize(1)==numberofnodes1
     108                                md2.(model_fields{i})=field(pos_node,:);
     109                        elseif (fieldsize(1)==numberofnodes1+1)
     110                                md2.(model_fields(i))=[field(pos_node,:); field(end,:)];
     111                                %size = number of elements * n
     112                        elseif fieldsize(1)==numberofelements1
     113                                md2.(model_fields{i})=field(pos_elem,:);
     114                        end
    99115                end
    100116        end

  • issm/trunk/src/m/model/modelsextract.m

    r3994 r9641  
    1212%
    1313%   Examples:
    14 %      md_list=modelsextract(md,md.elementoniceshelf,1000);
     14%      md_list=modelsextract(md,md.mask.elementonfloatingice,1000);
    1515%
    1616%   See also: EXTRUDE, COLLAPSE, MODELEXTRACT

  • issm/trunk/src/m/model/parameterization/parameterize.m

    r9625 r9641  
    33%
    44%   from a parameter matlab file, start filling in all the @model fields that were not
    5 %   filled in by the mesh.m and geography.m @model methods.
     5%   filled in by the mesh.m and mask.m @model methods.
    66%   Warning: the paramter file must be able to be run in Matlab
    77%

  • issm/trunk/src/m/model/plot/checkplotoptions.m

    r8785 r9641  
    2828        if strcmpi(getfieldvalue(options,'showsection'),'on')
    2929                options=changefieldvalue(options,'showsection',4);
    30         end
    31 end
    32 
    33 %iceshelf values
    34 if exist(options,'iceshelf'),
    35         if strcmpi(getfieldvalue(options,'iceshelf'),'none')
    36                 options=changefieldvalue(options,'iceshelf',0);
    37         end
    38 end
    39 
    40 %icesheet values
    41 if exist(options,'icesheet'),
    42         if strcmpi(getfieldvalue(options,'icesheet'),'none')
    43                 options=changefieldvalue(options,'icesheet',0);
    44         end
    45 end
    46 
    47 %water values
    48 if exist(options,'water'),
    49         if strcmpi(getfieldvalue(options,'water'),'none')
    50                 options=changefieldvalue(options,'water',0);
    5130        end
    5231end

  • issm/trunk/src/m/model/setelementstype.m

    r9532 r9641  
    1616%
    1717%   Example:
    18 %      md=setelementstype(md,'pattyn','Pattyn.exp','macayeal',md.elementoniceshelf,'fill','hutter');
     18%      md=setelementstype(md,'pattyn','Pattyn.exp','macayeal',md.mask.elementonfloatingice,'fill','hutter');
    1919%      md=setelementstype(md,'pattyn','Pattyn.exp',fill','hutter','coupling','tiling');
    2020

  • issm/trunk/src/m/utils/BC/SetIceShelfBC.m

    r9632 r9641  
    5959
    6060%Add water or air enum depending on the element
    61 pressureload=[pressureload 1*md.elementoniceshelf(pressureload(:,end))];
     61pressureload=[pressureload 1*md.mask.elementonfloatingice(pressureload(:,end))];
    6262
    6363%plug onto model

  • issm/trunk/src/m/utils/BC/SetMarineIceSheetBC.m

    r9632 r9641  
    33%
    44%   Neumann BC are used on the ice front (an ARGUS contour around the ice front
    5 %   can be given in input, or it will be deduced as oniceshelf & onboundary)
     5%   can be given in input, or it will be deduced as onfloatingice & onboundary)
    66%   Dirichlet BC are used elsewhere for diagnostic
    77%
    … …  
    2424        end
    2525        nodeinsideicefront=ContourToMesh(md.elements,md.x,md.y,icefrontfile,'node',2);
    26         nodeonicefront=double(md.nodeonboundary & nodeinsideicefront);
     26        vertexonicefront=double(md.nodeonboundary & nodeinsideicefront);
    2727else
    2828        %Guess where the ice front is
    29         nodeoniceshelf=zeros(md.numberofnodes,1);
    30         nodeoniceshelf(md.elements(find(md.elementoniceshelf),:))=1;
    31         nodeonicefront=double(md.nodeonboundary & nodeoniceshelf);
     29        vertexonfloatingice=zeros(md.numberofnodes,1);
     30        vertexonfloatingice(md.elements(find(md.mask.elementonfloatingice),:))=1;
     31        vertexonicefront=double(md.nodeonboundary & vertexonfloatingice);
    3232end
    33 pos=find(md.nodeonboundary & ~nodeonicefront);
     33pos=find(md.nodeonboundary & ~vertexonicefront);
    3434if isempty(pos),
    3535        warning('SetMarineIceSheetBC warning: ice front all around the glacier, no dirichlet found. Dirichlet must be added manually')
    … …  
    5757
    5858%segment on Neumann (Ice Front)
    59 pos=find(nodeonicefront(md.segments(:,1)) | nodeonicefront(md.segments(:,2)));
     59pos=find(vertexonicefront(md.segments(:,1)) | vertexonicefront(md.segments(:,2)));
    6060if (md.dim==2)
    6161        pressureload=md.segments(pos,:);
    … …  
    6969
    7070%Add water or air enum depending on the element
    71 pressureload=[pressureload 1*md.elementoniceshelf(pressureload(:,end))+ 0*md.elementonicesheet(pressureload(:,end))];
     71pressureload=[pressureload 1*md.mask.elementonfloatingice(pressureload(:,end))+ 0*md.mask.elementongroundedice(pressureload(:,end))];
    7272
    7373%plug onto model
    … …  
    105105        if (length(md.basalforcings.geothermalflux)~=md.numberofnodes),
    106106                md.basalforcings.geothermalflux=zeros(md.numberofnodes,1);
    107                 md.basalforcings.geothermalflux(find(md.nodeonicesheet))=50*10^-3; %50mW/m2
     107                md.basalforcings.geothermalflux(find(md.mask.vertexongroundedice))=50*10^-3; %50mW/m2
    108108        end
    109109else

  • issm/trunk/src/m/utils/Geometry/FlagElements.m

    r8102 r9641  
    1212%      flag=FlagElements(md,'Domain.exp');
    1313%      flag=FlagElements(md,'~Domain.exp');
    14 %      flag=FlagElements(md,md.elementonicesheet);
     14%      flag=FlagElements(md,md.mask.elementongroundedice);
    1515
    1616        if ischar(region),

  • issm/trunk/template

    r9636 r9641  
    5050
    5151          thickness_coeff -> rename hydrostatic_ratio (change ThicknessCorrection.m accordingly)
    52 }}}
    53 mask{{{
    54         elementoniceshelf -> rename elementonwater
    55         elementonicesheet -> rename elementonground
    56         elementonwater -> rename elementelementonground
    57         nodeoniceshelf
    58         nodeonicesheet
    59         nodeonwater
    60 
    61         elementongroundedice
    62         elementonfloatingice
    63         elementonwater
    64 
    6552}}}
    6653flowequation{{{

  • issm/trunk/test/Miscellaneous/Bump/Bump.par

    r9636 r9641  
    1616md.drag_coefficient=30*ones(md.numberofnodes,1); %q=1.
    1717%Take care of iceshelves: no basal drag
    18 pos=find(md.elementoniceshelf);
     18pos=find(md.mask.elementonfloatingice);
    1919md.drag_coefficient(md.elements(pos,:))=0;
    2020md.drag_p=ones(md.numberofelements,1);

  • issm/trunk/test/Miscellaneous/Bump/runme.m

    r8308 r9641  
    11md=mesh(model,'DomainOutline.exp',1000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'Bump.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/Miscellaneous/GJM_test1/SquareShelf.par

    r9636 r9641  
    1717
    1818%Friction
    19 pos=find(md.elementoniceshelf);
     19pos=find(md.mask.elementonfloatingice);
    2020md.drag_type=2;
    2121md.drag_coefficient=20*ones(md.numberofnodes,1);

  • issm/trunk/test/Miscellaneous/GJM_test1/test1.m

    r8308 r9641  
    11md=mesh(model,'Square.exp',150000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'SquareShelf.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/Miscellaneous/connectivity/Square.par

    r9636 r9641  
    1818md.drag_coefficient=200*ones(md.numberofnodes,1); %q=1.
    1919%Take care of iceshelves: no basal drag
    20 pos=find(md.elementoniceshelf);
     20pos=find(md.mask.elementonfloatingice);
    2121md.drag_coefficient(md.elements(pos,:))=0;
    2222md.drag_p=ones(md.numberofelements,1);

  • issm/trunk/test/Miscellaneous/connectivity/runme.m

    r8308 r9641  
    3434                md=model;
    3535                md=mesh(md,'DomainOutline.exp',density);
    36                 md=geography(md,'all','');
     36                md=setmask(md,'all','');
    3737                md=parameterize(md,'Square.par');
    3838                md.connectivity=connectivity;

  • issm/trunk/test/NightlyRun/test101.m

    r8295 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test102.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test103.m

    r8295 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');
    44md=extrude(md,3,2);

  • issm/trunk/test/NightlyRun/test104.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');
    44md=extrude(md,3,2);

  • issm/trunk/test/NightlyRun/test105.m

    r8295 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');
    44md=extrude(md,3,2);

  • issm/trunk/test/NightlyRun/test106.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');
    44md=extrude(md,3,2);

  • issm/trunk/test/NightlyRun/test107.m

    r8295 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');
    44md=extrude(md,3,2);

  • issm/trunk/test/NightlyRun/test108.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');
    44md=extrude(md,3,2);

  • issm/trunk/test/NightlyRun/test109.m

    r8295 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test110.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test1101.m

    r8824 r9641  
    1414        md=model;
    1515        md=squaremesh(md,L,L,nx,ny);
    16         md=geography(md,'',''); %ice sheet test
     16        md=setmask(md,'',''); %ice sheet test
    1717        md=parameterize(md,'../Par/ISMIPA.par');
    1818        md=extrude(md,9,1);

  • issm/trunk/test/NightlyRun/test1102.m

    r8824 r9641  
    1414        md=model;
    1515        md=squaremesh(md,L,L,nx,ny);
    16         md=geography(md,'',''); %ice sheet test
     16        md=setmask(md,'',''); %ice sheet test
    1717
    1818%       %Find elements at the corner and extract model

  • issm/trunk/test/NightlyRun/test1103.m

    r8824 r9641  
    1212        md=model;
    1313        md=squaremesh(md,L,L,nx,ny);
    14         md=geography(md,'',''); %ice sheet test
     14        md=setmask(md,'',''); %ice sheet test
    1515        md=parameterize(md,'../Par/ISMIPB.par');
    1616        md=extrude(md,10,1);

  • issm/trunk/test/NightlyRun/test1104.m

    r8824 r9641  
    1111        md=model;
    1212        md=squaremesh(md,L,L,nx,ny);
    13         md=geography(md,'',''); %ice sheet test
     13        md=setmask(md,'',''); %ice sheet test
    1414        md=parameterize(md,'../Par/ISMIPB.par');
    1515        md=extrude(md,10,1);

  • issm/trunk/test/NightlyRun/test1105.m

    r8824 r9641  
    1414        md=model;
    1515        md=squaremesh(md,L,L,nx,ny);
    16         md=geography(md,'',''); %ice sheet test
     16        md=setmask(md,'',''); %ice sheet test
    1717        md=parameterize(md,'../Par/ISMIPC.par');
    1818        md=extrude(md,10,1);

  • issm/trunk/test/NightlyRun/test1106.m

    r8824 r9641  
    1111        md=model;
    1212        md=squaremesh(md,L,L,nx,ny);
    13         md=geography(md,'',''); %ice sheet test
     13        md=setmask(md,'',''); %ice sheet test
    1414        md=parameterize(md,'../Par/ISMIPC.par');
    1515        md=extrude(md,6,1);

  • issm/trunk/test/NightlyRun/test1107.m

    r9042 r9641  
    1414        md=model;
    1515        md=squaremesh(md,L,L,nx,ny);
    16         md=geography(md,'',''); %ice sheet test
     16        md=setmask(md,'',''); %ice sheet test
    1717        md=parameterize(md,'../Par/ISMIPD.par');
    1818        md=extrude(md,10,1);

  • issm/trunk/test/NightlyRun/test1108.m

    r8824 r9641  
    1111        md=model;
    1212        md=squaremesh(md,L,L,nx,ny);
    13         md=geography(md,'',''); %ice sheet test
     13        md=setmask(md,'',''); %ice sheet test
    1414        md=parameterize(md,'../Par/ISMIPD.par');
    1515        md=extrude(md,6,1);

  • issm/trunk/test/NightlyRun/test1109.m

    r8835 r9641  
    1515        md=model;
    1616        md=squaremesh(md,Lx,Ly,nx,ny);
    17         md=geography(md,'',''); %ice sheet test
     17        md=setmask(md,'',''); %ice sheet test
    1818        md=parameterize(md,'../Par/ISMIPE.par');
    1919        md=extrude(md,10,1);

  • issm/trunk/test/NightlyRun/test111.m

    r9239 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    22md=meshconvert(md);
    3 md=geography(md,'all','');
     3md=setmask(md,'all','');
    44md=parameterize(md,'../Par/SquareShelfConstrained.par');
    55md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test1110.m

    r9632 r9641  
    1010        md=squaremesh(md,L,L,nx,ny);
    1111        %md=mesh(md,'../Exp/SquareISMIP.exp',5500);
    12         md=geography(md,'',''); %ice sheet test
     12        md=setmask(md,'',''); %ice sheet test
    1313        md=parameterize(md,'../Par/ISMIPF.par');
    1414        md=extrude(md,4,1);

  • issm/trunk/test/NightlyRun/test112.m

    r9239 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    22md=meshconvert(md);
    3 md=geography(md,'all','');
     3md=setmask(md,'all','');
    44md=parameterize(md,'../Par/SquareShelfConstrained.par');
    55md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test113.m

    r8295 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test114.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test115.m

    r9628 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test116.m

    r9628 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test117.m

    r9611 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test118.m

    r9611 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test119.m

    r8433 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test120.m

    r8824 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test1201.m

    r9607 r9641  
    77        %The goal is to test the prognostic model
    88        md=bamg(model,'domain','../Exp/SquareEISMINT.exp','hmax',3000);
    9         md=geography(md,'all','');
     9        md=setmask(md,'all','');
    1010        md=parameterize(md,'../Par/SquareEISMINT.par');
    1111        md.surfaceforcings.mass_balance(:)=0;

  • issm/trunk/test/NightlyRun/test1202.m

    r8630 r9641  
    55md=model;
    66md=mesh(md,'../Exp/SquareEISMINT.exp',3550);
    7 md=geography(md,'all','');
     7md=setmask(md,'all','');
    88md=parameterize(md,'../Par/SquareEISMINT.par');
    99md=setelementstype(md,'macayeal','all'); %MacAyeal's model and 2d

  • issm/trunk/test/NightlyRun/test1203.m

    r8824 r9641  
    55md=model;
    66md=mesh(md,'../Exp/SquareEISMINT.exp',5100); %test3
    7 md=geography(md,'all','');
     7md=setmask(md,'all','');
    88md=parameterize(md,'../Par/SquareEISMINT.par');
    99md=setelementstype(md,'macayeal','all'); %MacAyeal's model and 2d

  • issm/trunk/test/NightlyRun/test1204.m

    r9628 r9641  
    55md=model;
    66md=mesh(md,'../Exp/SquareEISMINT.exp',3550);
    7 md=geography(md,'all','');
     7md=setmask(md,'all','');
    88md=parameterize(md,'../Par/SquareEISMINT.par');
    99md=setelementstype(md,'macayeal','all'); %MacAyeal's model and 2d

  • issm/trunk/test/NightlyRun/test1205.m

    r8824 r9641  
    88md=model;
    99md=roundmesh(md,750000,resolution);
    10 md=geography(md,'',''); %We can not test iceshelves nor ice rises with this analytical solution
     10md=setmask(md,'',''); %We can not test iceshelves nor ice rises with this analytical solution
    1111md=parameterize(md,'../Par/RoundSheetStaticEISMINT.par');
    1212

  • issm/trunk/test/NightlyRun/test1206.m

    r8824 r9641  
    88md=model;
    99md=roundmesh(md,750000,resolution);
    10 md=geography(md,'',''); %We can not test iceshelves nor ice rises with this analytical solution
     10md=setmask(md,'',''); %We can not test iceshelves nor ice rises with this analytical solution
    1111md=parameterize(md,'../Par/RoundSheetStaticEISMINT.par');
    1212

  • issm/trunk/test/NightlyRun/test1207.m

    r8824 r9641  
    88md=model;
    99md=roundmesh(md,750000,resolution);
    10 md=geography(md,'',''); %We can not test iceshelves nor ice rises with this analytical solution
     10md=setmask(md,'',''); %We can not test iceshelves nor ice rises with this analytical solution
    1111md=parameterize(md,'../Par/RoundSheetStaticEISMINT.par');
    1212

  • issm/trunk/test/NightlyRun/test1208.m

    r9632 r9641  
    55%To begin with the numerical model
    66md=mesh(model,'../Exp/SquareEISMINT750000.exp',resolution);
    7 md=geography(md,'','');
     7md=setmask(md,'','');
    88md=parameterize(md,'../Par/RoundSheetEISMINT.par');
    99

  • issm/trunk/test/NightlyRun/test121.m

    r9611 r9641  
    11md=mesh(model,'../Exp/Square.exp',200000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test122.m

    r9611 r9641  
    11md=mesh(model,'../Exp/Square.exp',200000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test123.m

    r8295 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test124.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test125.m

    r8295 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');
    44md=extrude(md,5,1);

  • issm/trunk/test/NightlyRun/test126.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');
    44md=extrude(md,5,1);

  • issm/trunk/test/NightlyRun/test127.m

    r8295 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test128.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test129.m

    r8295 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');
    44md=extrude(md,5,1);

  • issm/trunk/test/NightlyRun/test130.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');
    44md=extrude(md,5,1);

  • issm/trunk/test/NightlyRun/test1301.m

    r9636 r9641  
    77md=model;
    88md=mesh(md,'../Exp/Square.exp',100000);
    9 md=geography(md,'','');
     9md=setmask(md,'','');
    1010md=parameterize(md,'../Par/SquareThermal.par');
    1111md=extrude(md,3,2);

  • issm/trunk/test/NightlyRun/test1302.m

    r9636 r9641  
    66md=model;
    77md=mesh(md,'../Exp/Square.exp',100000);
    8 md=geography(md,'','');
     8md=setmask(md,'','');
    99md=parameterize(md,'../Par/SquareThermal.par');
    1010md=extrude(md,30,1);   %NB: the more one extrudes, the better (10-> relative~0.35%, 20->0.1%, 30->0.05%)

  • issm/trunk/test/NightlyRun/test1303.m

    r9632 r9641  
    77md=model;
    88md=mesh(md,'../Exp/Square.exp',100000);
    9 md=geography(md,'all','');
     9md=setmask(md,'all','');
    1010md=parameterize(md,'../Par/SquareThermal.par');
    1111md=extrude(md,11,2);

  • issm/trunk/test/NightlyRun/test1304.m

    r9632 r9641  
    77md=model;
    88md=mesh(md,'../Exp/Square.exp',100000);
    9 md=geography(md,'','');
     9md=setmask(md,'','');
    1010md=parameterize(md,'../Par/SquareThermal.par');
    1111md=extrude(md,11,1);

  • issm/trunk/test/NightlyRun/test131.m

    r9080 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');
    44%Add boundary conditions on thickness on the border

  • issm/trunk/test/NightlyRun/test132.m

    r9080 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');
    44%Add boundary conditions on thickness on the border

  • issm/trunk/test/NightlyRun/test133.m

    r9080 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');
    44md=extrude(md,5,1);

  • issm/trunk/test/NightlyRun/test134.m

    r9080 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelfConstrained.par');
    44md=extrude(md,5,1);

  • issm/trunk/test/NightlyRun/test135.m

    r8295 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    22md=meshconvert(md);
    3 md=geography(md,'all','');
     3md=setmask(md,'all','');
    44md=parameterize(md,'../Par/SquareShelfConstrained.par');
    55md.prognostic_DG=1;

  • issm/trunk/test/NightlyRun/test136.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    22md=meshconvert(md);
    3 md=geography(md,'all','');
     3md=setmask(md,'all','');
    44md=parameterize(md,'../Par/SquareShelfConstrained.par');
    55md.prognostic_DG=1;

  • issm/trunk/test/NightlyRun/test1501.m

    r9628 r9641  
    22
    33md=mesh(model,'../Exp/Square.exp',350000);
    4 md=geography(md,'all','');
     4md=setmask(md,'all','');
    55md=parameterize(md,'../Par/SquareShelf.par');
    66md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test1502.m

    r9628 r9641  
    22
    33md=mesh(model,'../Exp/Square.exp',700000);
    4 md=geography(md,'all','');
     4md=setmask(md,'all','');
    55md=parameterize(md,'../Par/SquareShelf.par');
    66md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test201.m

    r8295 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test202.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test203.m

    r8295 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,3,2);

  • issm/trunk/test/NightlyRun/test204.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,3,2);

  • issm/trunk/test/NightlyRun/test205.m

    r8295 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,3,2);

  • issm/trunk/test/NightlyRun/test206.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,3,2);

  • issm/trunk/test/NightlyRun/test207.m

    r8295 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,3,2);

  • issm/trunk/test/NightlyRun/test208.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,3,2);

  • issm/trunk/test/NightlyRun/test209.m

    r8295 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,3,2);

  • issm/trunk/test/NightlyRun/test210.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,3,2);

  • issm/trunk/test/NightlyRun/test211.m

    r9628 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test212.m

    r9628 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test213.m

    r9611 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test214.m

    r9611 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test215.m

    r8433 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test216.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test217.m

    r9611 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test218.m

    r9611 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test219.m

    r9611 r9641  
    11md=mesh(model,'../Exp/Square.exp',200000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test220.m

    r9611 r9641  
    11md=mesh(model,'../Exp/Square.exp',200000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test221.m

    r9611 r9641  
    11md=mesh(model,'../Exp/Square.exp',200000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test222.m

    r9611 r9641  
    11md=mesh(model,'../Exp/Square.exp',200000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test223.m

    r9541 r9641  
    11md=mesh(model,'../Exp/Square.exp',200000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=setelementstype(md,'macayeal','all');
    … …  
    66%control parameters
    77md.control_analysis=1;
    8 md.control_type={'RheologyBbar'};
     8md.control_type={'MaterialsRheologyBbar'};
    99md.cm_min=10^6*ones(md.numberofnodes,1);
    1010md.cm_max=2*10^9*ones(md.numberofnodes,1);
    … …  
    2121
    2222%Fields and tolerances to track changes
    23 field_names     ={'Gradient' 'Misfits' 'RheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
     23field_names     ={'Gradient' 'Misfits' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
    2424field_tolerances={1e-12,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
    2525field_values={...
    2626        PatchToVec(md.results.DiagnosticSolution.Gradient1),...
    2727        md.results.DiagnosticSolution.J,...
    28         PatchToVec(md.results.DiagnosticSolution.RheologyBbar),...
     28        PatchToVec(md.results.DiagnosticSolution.MaterialsRheologyBbar),...
    2929        PatchToVec(md.results.DiagnosticSolution.Pressure),...
    3030        PatchToVec(md.results.DiagnosticSolution.Vel),...

  • issm/trunk/test/NightlyRun/test224.m

    r9541 r9641  
    11md=mesh(model,'../Exp/Square.exp',200000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=setelementstype(md,'macayeal','all');
    … …  
    66%control parameters
    77md.control_analysis=1;
    8 md.control_type={'RheologyBbar'};
     8md.control_type={'MaterialsRheologyBbar'};
    99md.cm_min=10^6*ones(md.numberofnodes,1);
    1010md.cm_max=2*10^9*ones(md.numberofnodes,1);
    … …  
    2121
    2222%Fields and tolerances to track changes
    23 field_names     ={'Gradient' 'Misfits' 'RheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
     23field_names     ={'Gradient' 'Misfits' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
    2424field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
    2525field_values={...
    2626        PatchToVec(md.results.DiagnosticSolution.Gradient1),...
    2727        md.results.DiagnosticSolution.J,...
    28         PatchToVec(md.results.DiagnosticSolution.RheologyBbar),...
     28        PatchToVec(md.results.DiagnosticSolution.MaterialsRheologyBbar),...
    2929        PatchToVec(md.results.DiagnosticSolution.Pressure),...
    3030        PatchToVec(md.results.DiagnosticSolution.Vel),...

  • issm/trunk/test/NightlyRun/test225.m

    r9541 r9641  
    11md=mesh(model,'../Exp/Square.exp',200000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,3,1);
    … …  
    77%control parameters
    88md.control_analysis=1;
    9 md.control_type={'RheologyBbar'};
     9md.control_type={'MaterialsRheologyBbar'};
    1010md.cm_min=10^6*ones(md.numberofnodes,1);
    1111md.cm_max=2*10^9*ones(md.numberofnodes,1);
    … …  
    2222
    2323%Fields and tolerances to track changes
    24 field_names     ={'Gradient' 'Misfits' 'RheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
     24field_names     ={'Gradient' 'Misfits' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
    2525field_tolerances={1e-12,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
    2626field_values={...
    2727        PatchToVec(md.results.DiagnosticSolution.Gradient1),...
    2828        md.results.DiagnosticSolution.J,...
    29         PatchToVec(md.results.DiagnosticSolution.RheologyB),...
     29        PatchToVec(md.results.DiagnosticSolution.MaterialsRheologyB),...
    3030        PatchToVec(md.results.DiagnosticSolution.Pressure),...
    3131        PatchToVec(md.results.DiagnosticSolution.Vel),...

  • issm/trunk/test/NightlyRun/test226.m

    r9541 r9641  
    11md=mesh(model,'../Exp/Square.exp',200000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,3,1);
    … …  
    77%control parameters
    88md.control_analysis=1;
    9 md.control_type={'RheologyBbar'};
     9md.control_type={'MaterialsRheologyBbar'};
    1010md.cm_min=10^6*ones(md.numberofnodes,1);
    1111md.cm_max=2*10^9*ones(md.numberofnodes,1);
    … …  
    2222
    2323%Fields and tolerances to track changes
    24 field_names     ={'Gradient' 'Misfits' 'RheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
     24field_names     ={'Gradient' 'Misfits' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
    2525field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
    2626field_values={...
    2727        PatchToVec(md.results.DiagnosticSolution.Gradient1),...
    2828        md.results.DiagnosticSolution.J,...
    29         PatchToVec(md.results.DiagnosticSolution.RheologyB),...
     29        PatchToVec(md.results.DiagnosticSolution.MaterialsRheologyB),...
    3030        PatchToVec(md.results.DiagnosticSolution.Pressure),...
    3131        PatchToVec(md.results.DiagnosticSolution.Vel),...

  • issm/trunk/test/NightlyRun/test227.m

    r9541 r9641  
    11md=mesh(model,'../Exp/Square.exp',200000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,3,1);
    … …  
    77%control parameters
    88md.control_analysis=1;
    9 md.control_type={'RheologyBbar'};
     9md.control_type={'MaterialsRheologyBbar'};
    1010md.cm_min=10^6*ones(md.numberofnodes,1);
    1111md.cm_max=2*10^9*ones(md.numberofnodes,1);
    … …  
    2222
    2323%Fields and tolerances to track changes
    24 field_names     ={'Gradient' 'Misfits' 'RheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
     24field_names     ={'Gradient' 'Misfits' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
    2525field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09};
    2626field_values={...
    2727        PatchToVec(md.results.DiagnosticSolution.Gradient1),...
    2828        md.results.DiagnosticSolution.J,...
    29         PatchToVec(md.results.DiagnosticSolution.RheologyB),...
     29        PatchToVec(md.results.DiagnosticSolution.MaterialsRheologyB),...
    3030        PatchToVec(md.results.DiagnosticSolution.Pressure),...
    3131        PatchToVec(md.results.DiagnosticSolution.Vel),...

  • issm/trunk/test/NightlyRun/test228.m

    r9541 r9641  
    11md=mesh(model,'../Exp/Square.exp',200000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,3,1);
    … …  
    77%control parameters
    88md.control_analysis=1;
    9 md.control_type={'RheologyBbar'};
     9md.control_type={'MaterialsRheologyBbar'};
    1010md.cm_min=10^6*ones(md.numberofnodes,1);
    1111md.cm_max=2*10^9*ones(md.numberofnodes,1);
    … …  
    2222
    2323%Fields and tolerances to track changes
    24 field_names     ={'Gradient' 'Misfits' 'RheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
     24field_names     ={'Gradient' 'Misfits' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
    2525field_tolerances={1e-07,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08};
    2626field_values={...
    2727        PatchToVec(md.results.DiagnosticSolution.Gradient1),...
    2828        md.results.DiagnosticSolution.J,...
    29         PatchToVec(md.results.DiagnosticSolution.RheologyB),...
     29        PatchToVec(md.results.DiagnosticSolution.MaterialsRheologyB),...
    3030        PatchToVec(md.results.DiagnosticSolution.Pressure),...
    3131        PatchToVec(md.results.DiagnosticSolution.Vel),...

  • issm/trunk/test/NightlyRun/test229.m

    r9541 r9641  
    11md=mesh(model,'../Exp/Square.exp',200000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,3,1);
    … …  
    77%control parameters
    88md.control_analysis=1;
    9 md.control_type={'RheologyBbar'};
     9md.control_type={'MaterialsRheologyBbar'};
    1010md.cm_min=10^6*ones(md.numberofnodes,1);
    1111md.cm_max=2*10^9*ones(md.numberofnodes,1);
    … …  
    2222
    2323%Fields and tolerances to track changes
    24 field_names     ={'Gradient' 'Misfits' 'RheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
     24field_names     ={'Gradient' 'Misfits' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
    2525field_tolerances={1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09};
    2626field_values={...
    2727        PatchToVec(md.results.DiagnosticSolution.Gradient1),...
    2828        md.results.DiagnosticSolution.J,...
    29         PatchToVec(md.results.DiagnosticSolution.RheologyB),...
     29        PatchToVec(md.results.DiagnosticSolution.MaterialsRheologyB),...
    3030        PatchToVec(md.results.DiagnosticSolution.Pressure),...
    3131        PatchToVec(md.results.DiagnosticSolution.Vel),...

  • issm/trunk/test/NightlyRun/test230.m

    r9541 r9641  
    11md=mesh(model,'../Exp/Square.exp',200000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,3,1);
    … …  
    77%control parameters
    88md.control_analysis=1;
    9 md.control_type={'RheologyBbar'};
     9md.control_type={'MaterialsRheologyBbar'};
    1010md.cm_min=10^6*ones(md.numberofnodes,1);
    1111md.cm_max=2*10^9*ones(md.numberofnodes,1);
    … …  
    2222
    2323%Fields and tolerances to track changes
    24 field_names     ={'Gradient' 'Misfits' 'RheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
     24field_names     ={'Gradient' 'Misfits' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'};
    2525field_tolerances={1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09};
    2626field_values={...
    2727        PatchToVec(md.results.DiagnosticSolution.Gradient1),...
    2828        md.results.DiagnosticSolution.J,...
    29         PatchToVec(md.results.DiagnosticSolution.RheologyB),...
     29        PatchToVec(md.results.DiagnosticSolution.MaterialsRheologyB),...
    3030        PatchToVec(md.results.DiagnosticSolution.Pressure),...
    3131        PatchToVec(md.results.DiagnosticSolution.Vel),...

  • issm/trunk/test/NightlyRun/test232.m

    r9619 r9641  
    11md=mesh(model,'../Exp/SquareHole.exp','../Exp/Rifts.exp',50000);
    22md=meshprocessrifts(md,'../Exp/Square.exp');
    3 md=geography(md,'all','');
     3md=setmask(md,'all','');
    44md=parameterize(md,'../Par/SquareShelf.par');
    55md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test233.m

    r9636 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=setelementstype(md,'macayeal','all');
    … …  
    5555pos=find(md.y==ymax); nodeonicefront(pos)=1;
    5656pos=find(nodeonicefront(md.segments(:,1)) | nodeonicefront(md.segments(:,2))); pressureload=md.segments(pos,:);
    57 pressureload=[pressureload 1*md.elementoniceshelf(pressureload(:,end))];
     57pressureload=[pressureload 1*md.mask.elementonfloatingice(pressureload(:,end))];
    5858md.pressureload=pressureload;
    5959

  • issm/trunk/test/NightlyRun/test234.m

    r9636 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=setelementstype(md,'macayeal','all');
    … …  
    5555pos=find(md.y==ymax); nodeonicefront(pos)=1;
    5656pos=find(nodeonicefront(md.segments(:,1)) | nodeonicefront(md.segments(:,2))); pressureload=md.segments(pos,:);
    57 pressureload=[pressureload 1*md.elementoniceshelf(pressureload(:,end))];
     57pressureload=[pressureload 1*md.mask.elementonfloatingice(pressureload(:,end))];
    5858md.pressureload=pressureload;
    5959

  • issm/trunk/test/NightlyRun/test235.m

    r9636 r9641  
    11md=squaremesh(model,1000000,1000000,5,5);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=setelementstype(md,'macayeal','all');
    … …  
    5252pos=find(md.y==ymax); nodeonicefront(pos)=1;
    5353pos=find(nodeonicefront(md.segments(:,1)) | nodeonicefront(md.segments(:,2))); pressureload=md.segments(pos,:);
    54 pressureload=[pressureload 1*md.elementoniceshelf(pressureload(:,end))];
     54pressureload=[pressureload 1*md.mask.elementonfloatingice(pressureload(:,end))];
    5555md.pressureload=pressureload;
    5656
    … …  
    6262%Dakota options
    6363%variables
    64 md.variables.rheology_B=normal_uncertain('scaled_RheologyB',1,.5);
     64md.variables.rheology_B=normal_uncertain('scaled_MaterialsRheologyB',1,.5);
    6565
    6666%responses
    … …  
    8585%Fields and tolerances to track changes
    8686md=tres(md,'dakota');
    87 md.results.dakota.importancefactors=importancefactors(md,'scaled_RheologyB','MaxVel')';
     87md.results.dakota.importancefactors=importancefactors(md,'scaled_MaterialsRheologyB','MaxVel')';
    8888field_names     ={'importancefactors'};
    8989field_tolerances={1e-10};

  • issm/trunk/test/NightlyRun/test236.m

    r9636 r9641  
    11md=squaremesh(model,1000000,1000000,5,5);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=setelementstype(md,'macayeal','all');
    … …  
    5252pos=find(md.y==ymax); nodeonicefront(pos)=1;
    5353pos=find(nodeonicefront(md.segments(:,1)) | nodeonicefront(md.segments(:,2))); pressureload=md.segments(pos,:);
    54 pressureload=[pressureload 1*md.elementoniceshelf(pressureload(:,end))];
     54pressureload=[pressureload 1*md.mask.elementonfloatingice(pressureload(:,end))];
    5555md.pressureload=pressureload;
    5656
    … …  
    6262%Dakota options
    6363%variables
    64 md.variables.rheology_B=normal_uncertain('scaled_RheologyB',1,.05);
     64md.variables.rheology_B=normal_uncertain('scaled_MaterialsRheologyB',1,.05);
    6565
    6666%responses
    … …  
    8585%Fields and tolerances to track changes
    8686md=tres(md,'dakota');
    87 md.results.dakota.importancefactors=importancefactors(md,'scaled_RheologyB','MaxVel')';
     87md.results.dakota.importancefactors=importancefactors(md,'scaled_MaterialsRheologyB','MaxVel')';
    8888field_names     ={'importancefactors'};
    8989field_tolerances={1e-10};

  • issm/trunk/test/NightlyRun/test237.m

    r8295 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,3,2);

  • issm/trunk/test/NightlyRun/test238.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,3,2);

  • issm/trunk/test/NightlyRun/test239.m

    r8295 r9641  
    11md=mesh(model,'../Exp/Square.exp',120000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,2,1);

  • issm/trunk/test/NightlyRun/test240.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Square.exp',120000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,2,1);

  • issm/trunk/test/NightlyRun/test241.m

    r8295 r9641  
    11md=mesh(model,'../Exp/Square.exp',120000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,2,1);

  • issm/trunk/test/NightlyRun/test242.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Square.exp',120000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,2,1);

  • issm/trunk/test/NightlyRun/test243.m

    r9519 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test244.m

    r9519 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test245.m

    r9519 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test246.m

    r9519 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test247.m

    r9611 r9641  
    11md=mesh(model,'../Exp/Square.exp',200000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test248.m

    r9611 r9641  
    11md=mesh(model,'../Exp/Square.exp',200000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test249.m

    r9611 r9641  
    11md=mesh(model,'../Exp/Square.exp',200000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test250.m

    r9611 r9641  
    11md=mesh(model,'../Exp/Square.exp',200000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test251.m

    r9628 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test252.m

    r9628 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test253.m

    r9628 r9641  
    11md=mesh(model,'../Exp/Square.exp',200000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test254.m

    r9628 r9641  
    11md=mesh(model,'../Exp/Square.exp',200000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test255.m

    r9628 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test256.m

    r9628 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test257.m

    r9628 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test258.m

    r9628 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test259.m

    r9628 r9641  
    11md=mesh(model,'../Exp/Square.exp',350000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test260.m

    r9628 r9641  
    11md=mesh(model,'../Exp/Square.exp',350000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test261.m

    r9628 r9641  
    11md=mesh(model,'../Exp/Square.exp',350000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test262.m

    r9628 r9641  
    11md=mesh(model,'../Exp/Square.exp',350000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test263.m

    r9632 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test264.m

    r9632 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test265.m

    r9632 r9641  
    11md=mesh(model,'../Exp/Square.exp',200000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test266.m

    r9632 r9641  
    11md=mesh(model,'../Exp/Square.exp',200000);
    2 md=geography(md,'all','');
     2md=setmask(md,'all','');
    33md=parameterize(md,'../Par/SquareShelf.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test301.m

    r8295 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test302.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test303.m

    r8295 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=setelementstype(md,'hutter','all');

  • issm/trunk/test/NightlyRun/test304.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=setelementstype(md,'hutter','all');

  • issm/trunk/test/NightlyRun/test305.m

    r8295 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=setelementstype(md,'hutter','../Exp/SquareHalfRight.exp','fill','macayeal');

  • issm/trunk/test/NightlyRun/test306.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=setelementstype(md,'hutter','../Exp/SquareHalfRight.exp','fill','macayeal');

  • issm/trunk/test/NightlyRun/test307.m

    r8295 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=extrude(md,3,2);

  • issm/trunk/test/NightlyRun/test308.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=extrude(md,3,2);

  • issm/trunk/test/NightlyRun/test309.m

    r8295 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=extrude(md,5,2);

  • issm/trunk/test/NightlyRun/test310.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=extrude(md,5,2);

  • issm/trunk/test/NightlyRun/test311.m

    r8295 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=extrude(md,4,2);

  • issm/trunk/test/NightlyRun/test312.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=extrude(md,4,2);

  • issm/trunk/test/NightlyRun/test313.m

    r8295 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test314.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test315.m

    r8295 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test316.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test317.m

    r8295 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test318.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test319.m

    r9239 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    22md=meshconvert(md);
    3 md=geography(md,'','');
     3md=setmask(md,'','');
    44md=parameterize(md,'../Par/SquareSheetConstrained.par');
    55md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test320.m

    r9239 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    22md=meshconvert(md);
    3 md=geography(md,'','');
     3md=setmask(md,'','');
    44md=parameterize(md,'../Par/SquareSheetConstrained.par');
    55md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test321.m

    r8295 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test322.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test323.m

    r9628 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test324.m

    r9628 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test325.m

    r9611 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test326.m

    r9611 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test327.m

    r8710 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=setelementstype(md,'hutter','all');

  • issm/trunk/test/NightlyRun/test328.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=setelementstype(md,'hutter','all');

  • issm/trunk/test/NightlyRun/test329.m

    r9611 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=extrude(md,5,1.2);

  • issm/trunk/test/NightlyRun/test330.m

    r9611 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=extrude(md,5,1.2);

  • issm/trunk/test/NightlyRun/test331.m

    r8433 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test332.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test333.m

    r9611 r9641  
    11md=mesh(model,'../Exp/Square.exp',200000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test334.m

    r9611 r9641  
    11md=mesh(model,'../Exp/Square.exp',200000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test335.m

    r9628 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=extrude(md,4,1);

  • issm/trunk/test/NightlyRun/test336.m

    r9628 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=extrude(md,4,1);

  • issm/trunk/test/NightlyRun/test337.m

    r9610 r9641  
    11md=mesh(model,'../Exp/Square.exp',200000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test338.m

    r9610 r9641  
    11md=mesh(model,'../Exp/Square.exp',200000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test339.m

    r9610 r9641  
    11md=mesh(model,'../Exp/Square.exp',200000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test340.m

    r9610 r9641  
    11md=mesh(model,'../Exp/Square.exp',200000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test341.m

    r9610 r9641  
    11md=mesh(model,'../Exp/Square.exp',200000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test342.m

    r9610 r9641  
    11md=mesh(model,'../Exp/Square.exp',200000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test343.m

    r9610 r9641  
    11md=mesh(model,'../Exp/Square.exp',200000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test344.m

    r9610 r9641  
    11md=mesh(model,'../Exp/Square.exp',200000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test345.m

    r9628 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test346.m

    r9628 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test347.m

    r9628 r9641  
    11md=mesh(model,'../Exp/Square.exp',200000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=extrude(md,4,1.2);

  • issm/trunk/test/NightlyRun/test348.m

    r9628 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'','');
     2md=setmask(md,'','');
    33md=parameterize(md,'../Par/SquareSheetConstrained.par');
    44md=extrude(md,5,1.2);

  • issm/trunk/test/NightlyRun/test401.m

    r8295 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'../Exp/SquareShelf.exp','');
     2md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test402.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'../Exp/SquareShelf.exp','');
     2md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test403.m

    r8295 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'../Exp/SquareShelf.exp','');
     2md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    44md=extrude(md,4,1);

  • issm/trunk/test/NightlyRun/test404.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'../Exp/SquareShelf.exp','');
     2md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    44md=extrude(md,4,1);

  • issm/trunk/test/NightlyRun/test405.m

    r8295 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'../Exp/SquareShelf.exp','');
     2md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    44md=extrude(md,5,1);

  • issm/trunk/test/NightlyRun/test406.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'../Exp/SquareShelf.exp','');
     2md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    44md=extrude(md,5,1);

  • issm/trunk/test/NightlyRun/test407.m

    r8295 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'../Exp/SquareShelf.exp','');
     2md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test408.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'../Exp/SquareShelf.exp','');
     2md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test409.m

    r8295 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'../Exp/SquareShelf.exp','');
     2md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    44md=extrude(md,5,1);

  • issm/trunk/test/NightlyRun/test410.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'../Exp/SquareShelf.exp','');
     2md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    44md=extrude(md,5,1);

  • issm/trunk/test/NightlyRun/test411.m

    r9628 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'../Exp/SquareShelf.exp','');
     2md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    44md=extrude(md,4,1);

  • issm/trunk/test/NightlyRun/test412.m

    r9628 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'../Exp/SquareShelf.exp','');
     2md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    44md=extrude(md,4,1);

  • issm/trunk/test/NightlyRun/test413.m

    r9611 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'../Exp/SquareShelf.exp','');
     2md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    44md=extrude(md,4,1);

  • issm/trunk/test/NightlyRun/test414.m

    r9611 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'../Exp/SquareShelf.exp','');
     2md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    44md=extrude(md,4,1);

  • issm/trunk/test/NightlyRun/test415.m

    r8433 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'../Exp/SquareShelf.exp','');
     2md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test416.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'../Exp/SquareShelf.exp','');
     2md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test417.m

    r9611 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'../Exp/SquareShelf.exp','');
     2md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test418.m

    r9611 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'../Exp/SquareShelf.exp','');
     2md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test419.m

    r9628 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'../Exp/SquareShelf.exp','');
     2md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    44md=extrude(md,3,2);

  • issm/trunk/test/NightlyRun/test420.m

    r9628 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'../Exp/SquareShelf.exp','');
     2md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    44md=extrude(md,3,2);

  • issm/trunk/test/NightlyRun/test421.m

    r9628 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'../Exp/SquareShelf.exp','');
     2md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    44md=extrude(md,3,2);

  • issm/trunk/test/NightlyRun/test422.m

    r9628 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'../Exp/SquareShelf.exp','');
     2md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    44md=extrude(md,3,2);

  • issm/trunk/test/NightlyRun/test423.m

    r9636 r9641  
    11md=mesh(model,'../Exp/Square.exp',300000);
    2 md=geography(md,'../Exp/SquareShelf.exp','');
     2md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test424.m

    r9636 r9641  
    11md=mesh(model,'../Exp/Square.exp',300000);
    2 md=geography(md,'../Exp/SquareShelf.exp','');
     2md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test425.m

    r9636 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'../Exp/SquareShelf.exp','');
     2md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test426.m

    r9636 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'../Exp/SquareShelf.exp','');
     2md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test427.m

    r9636 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'../Exp/SquareShelf.exp','');
     2md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test428.m

    r9636 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'../Exp/SquareShelf.exp','');
     2md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test429.m

    r9628 r9641  
    11md=mesh(model,'../Exp/Square.exp',170000);
    2 md=geography(md,'../Exp/SquareShelf.exp','');
     2md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test430.m

    r9628 r9641  
    11md=mesh(model,'../Exp/Square.exp',170000);
    2 md=geography(md,'../Exp/SquareShelf.exp','');
     2md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test431.m

    r9628 r9641  
    11md=mesh(model,'../Exp/Square.exp',170000);
    2 md=geography(md,'../Exp/SquareShelf.exp','');
     2md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test432.m

    r9628 r9641  
    11md=mesh(model,'../Exp/Square.exp',170000);
    2 md=geography(md,'../Exp/SquareShelf.exp','');
     2md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test434.m

    r9636 r9641  
    11md=mesh(model,'../Exp/Square.exp',150000);
    2 md=geography(md,'../Exp/SquareShelf.exp','');
     2md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test435.m

    r8304 r9641  
    11%test partitioning, and partition averaging
    22md=mesh(model,'../Exp/Square.exp',30000);
    3 md=geography(md,'../Exp/SquareShelf.exp','');
     3md=setmask(md,'../Exp/SquareShelf.exp','');
    44md=parameterize(md,'../Par/SquareSheetShelf.par');
    55md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test437.m

    r8295 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'../Exp/SquareShelf.exp','');
     2md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    44md=extrude(md,5,1);

  • issm/trunk/test/NightlyRun/test438.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'../Exp/SquareShelf.exp','');
     2md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    44md=extrude(md,5,1);

  • issm/trunk/test/NightlyRun/test439.m

    r9636 r9641  
    11md=mesh(model,'../Exp/Square.exp',200000);
    2 md=geography(md,'../Exp/SquareShelf.exp','');
     2md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test440.m

    r9636 r9641  
    11md=mesh(model,'../Exp/Square.exp',200000);
    2 md=geography(md,'../Exp/SquareShelf.exp','');
     2md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test441.m

    r8295 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'../Exp/SquareShelf.exp','');
     2md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    44md=extrude(md,5,1);

  • issm/trunk/test/NightlyRun/test442.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'../Exp/SquareShelf.exp','');
     2md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    44md=extrude(md,5,1);

  • issm/trunk/test/NightlyRun/test443.m

    r8295 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'../Exp/SquareShelf.exp','');
     2md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    44md=extrude(md,5,1);

  • issm/trunk/test/NightlyRun/test444.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Square.exp',180000);
    2 md=geography(md,'../Exp/SquareShelf.exp','');
     2md=setmask(md,'../Exp/SquareShelf.exp','');
    33md=parameterize(md,'../Par/SquareSheetShelf.par');
    44md=extrude(md,5,1);

  • issm/trunk/test/NightlyRun/test446.m

    r9636 r9641  
    1717flags(pos)=1;
    1818flags2=zeros(md.numberofelements,1);
    19 md=geography(md,flags,flags2);
     19md=setmask(md,flags,flags2);
    2020%}}}
    2121md=parameterize(md,'../Par/RoundSheetShelf.par');

  • issm/trunk/test/NightlyRun/test501.m

    r8295 r9641  
    11md=mesh(model,'../Exp/Pig.exp',20000);
    2 md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
     2md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test502.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Pig.exp',20000);
    2 md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
     2md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test503.m

    r8295 r9641  
    11md=mesh(model,'../Exp/Pig.exp',20000);
    2 md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
     2md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    44md=extrude(md,3,0.9);

  • issm/trunk/test/NightlyRun/test504.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Pig.exp',20000);
    2 md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
     2md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    44md=extrude(md,3,0.9);

  • issm/trunk/test/NightlyRun/test505.m

    r8295 r9641  
    11md=mesh(model,'../Exp/Pig.exp',20000);
    2 md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
     2md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    44md=extrude(md,3,0.9);

  • issm/trunk/test/NightlyRun/test506.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Pig.exp',20000);
    2 md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
     2md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    44md=extrude(md,3,0.9);

  • issm/trunk/test/NightlyRun/test507.m

    r8433 r9641  
    11md=mesh(model,'../Exp/Pig.exp',20000);
    2 md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
     2md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test508.m

    r8589 r9641  
    11md=mesh(model,'../Exp/Pig.exp',20000);
    2 md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
     2md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test509.m

    r9611 r9641  
    11md=mesh(model,'../Exp/Pig.exp',30000);
    2 md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
     2md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test510.m

    r9611 r9641  
    11md=mesh(model,'../Exp/Pig.exp',30000);
    2 md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
     2md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test511.m

    r9611 r9641  
    11md=mesh(model,'../Exp/Pig.exp',30000);
    2 md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
     2md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    44md=extrude(md,2,1);

  • issm/trunk/test/NightlyRun/test512.m

    r9611 r9641  
    11md=mesh(model,'../Exp/Pig.exp',30000);
    2 md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
     2md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    44md=extrude(md,2,1);

  • issm/trunk/test/NightlyRun/test513.m

    r9611 r9641  
    11md=mesh(model,'../Exp/Pig.exp',30000);
    2 md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
     2md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    44md=extrude(md,2,1);

  • issm/trunk/test/NightlyRun/test514.m

    r9611 r9641  
    11md=mesh(model,'../Exp/Pig.exp',30000);
    2 md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
     2md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    44md=extrude(md,2,1);

  • issm/trunk/test/NightlyRun/test515.m

    r9628 r9641  
    11md=mesh(model,'../Exp/Pig.exp',30000);
    2 md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
     2md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    44md=extrude(md,4,1.1);

  • issm/trunk/test/NightlyRun/test516.m

    r9628 r9641  
    11md=mesh(model,'../Exp/Pig.exp',30000);
    2 md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
     2md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    44md=extrude(md,4,1.1);

  • issm/trunk/test/NightlyRun/test517.m

    r9628 r9641  
    11md=mesh(model,'../Exp/Pig.exp',30000);
    2 md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
     2md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test518.m

    r9628 r9641  
    11md=mesh(model,'../Exp/Pig.exp',30000);
    2 md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
     2md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test519.m

    r9628 r9641  
    11md=mesh(model,'../Exp/Pig.exp',20000);
    2 md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
     2md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    44md=extrude(md,2,1);

  • issm/trunk/test/NightlyRun/test520.m

    r9628 r9641  
    11md=mesh(model,'../Exp/Pig.exp',20000);
    2 md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
     2md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    44md=extrude(md,2,1);

  • issm/trunk/test/NightlyRun/test521.m

    r9636 r9641  
    11md=mesh(model,'../Exp/Pig.exp',10000);
    2 md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
     2md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    44
    … …  
    88md=extrude(md,3,1);
    99md=setelementstype(md,'stokes','all');
    10 md=modelextract(md,md.elementoniceshelf);
     10md=modelextract(md,md.mask.elementonfloatingice);
    1111
    1212%control parameters
    1313md.control_analysis=1;
    14 md.control_type={'RheologyBbar'};
     14md.control_type={'MaterialsRheologyBbar'};
    1515md.cm_min=10^6*ones(md.numberofnodes,1);
    1616md.cm_max=2*10^9*ones(md.numberofnodes,1);
    … …  
    2727
    2828%Fields and tolerances to track changes
    29 field_names     ={'Gradient' 'Misfits' 'RheologyB' 'Pressure' 'Vel' 'Vx' 'Vy'};
     29field_names     ={'Gradient' 'Misfits' 'MaterialsRheologyB' 'Pressure' 'Vel' 'Vx' 'Vy'};
    3030field_tolerances={1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10};
    3131field_values={...
    3232        PatchToVec(md.results.DiagnosticSolution.Gradient1),...
    3333        md.results.DiagnosticSolution.J,...
    34         PatchToVec(md.results.DiagnosticSolution.RheologyB),...
     34        PatchToVec(md.results.DiagnosticSolution.MaterialsRheologyB),...
    3535        PatchToVec(md.results.DiagnosticSolution.Pressure),...
    3636        PatchToVec(md.results.DiagnosticSolution.Vel),...

  • issm/trunk/test/NightlyRun/test522.m

    r9636 r9641  
    11md=mesh(model,'../Exp/Pig.exp',10000);
    2 md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
     2md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    44
    … …  
    88md=extrude(md,3,1);
    99md=setelementstype(md,'stokes','all');
    10 md=modelextract(md,md.elementoniceshelf);
     10md=modelextract(md,md.mask.elementonfloatingice);
    1111
    1212%control parameters
    1313md.control_analysis=1;
    14 md.control_type={'RheologyBbar'};
     14md.control_type={'MaterialsRheologyBbar'};
    1515md.cm_min=10^6*ones(md.numberofnodes,1);
    1616md.cm_max=2*10^9*ones(md.numberofnodes,1);
    … …  
    2727
    2828%Fields and tolerances to track changes
    29 field_names     ={'Gradient' 'Misfits' 'RheologyB' 'Pressure' 'Vel' 'Vx' 'Vy'};
     29field_names     ={'Gradient' 'Misfits' 'MaterialsRheologyB' 'Pressure' 'Vel' 'Vx' 'Vy'};
    3030field_tolerances={1e-11,1e-12,1e-12,1e-09,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12};
    3131field_values={...
    3232        PatchToVec(md.results.DiagnosticSolution.Gradient1),...
    3333        md.results.DiagnosticSolution.J,...
    34         PatchToVec(md.results.DiagnosticSolution.RheologyB),...
     34        PatchToVec(md.results.DiagnosticSolution.MaterialsRheologyB),...
    3535        PatchToVec(md.results.DiagnosticSolution.Pressure),...
    3636        PatchToVec(md.results.DiagnosticSolution.Vel),...

  • issm/trunk/test/NightlyRun/test523.m

    r9610 r9641  
    11md=mesh(model,'../Exp/Pig.exp',20000);
    2 md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
     2md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test524.m

    r9610 r9641  
    11md=mesh(model,'../Exp/Pig.exp',20000);
    2 md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
     2md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test525.m

    r9628 r9641  
    11md=mesh(model,'../Exp/Pig.exp',30000);
    2 md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
     2md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test526.m

    r9628 r9641  
    11md=mesh(model,'../Exp/Pig.exp',30000);
    2 md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
     2md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test527.m

    r8304 r9641  
    88%Simple mesh 2
    99md=bamg(model,'domain','../Exp/Pig.exp','hmax',10000);
    10 md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
     10md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    1111md=parameterize(md,'../Par/Pig.par');
    1212x2=md.x;

  • issm/trunk/test/NightlyRun/test529.m

    r9632 r9641  
    11md=mesh(model,'../Exp/Pig.exp',30000);
    2 md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
     2md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test530.m

    r9632 r9641  
    11md=mesh(model,'../Exp/Pig.exp',30000);
    2 md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
     2md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test531.m

    r9632 r9641  
    11md=mesh(model,'../Exp/Pig.exp',30000);
    2 md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
     2md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test532.m

    r9632 r9641  
    11md=mesh(model,'../Exp/Pig.exp',30000);
    2 md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
     2md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
    33md=parameterize(md,'../Par/Pig.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test601.m

    r8295 r9641  
    11md=mesh(model,'../Exp/79North.exp',10000);
    2 md=geography(md,'../Exp/79NorthShelf.exp','');
     2md=setmask(md,'../Exp/79NorthShelf.exp','');
    33md=parameterize(md,'../Par/79North.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test602.m

    r8589 r9641  
    11md=mesh(model,'../Exp/79North.exp',10000);
    2 md=geography(md,'../Exp/79NorthShelf.exp','');
     2md=setmask(md,'../Exp/79NorthShelf.exp','');
    33md=parameterize(md,'../Par/79North.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test603.m

    r9239 r9641  
    11md=mesh(model,'../Exp/79North.exp',10000);
    22md=meshconvert(md);
    3 md=geography(md,'../Exp/79NorthShelf.exp','');
     3md=setmask(md,'../Exp/79NorthShelf.exp','');
    44md=parameterize(md,'../Par/79North.par');
    55md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test604.m

    r9239 r9641  
    11md=mesh(model,'../Exp/79North.exp',10000);
    22md=meshconvert(md);
    3 md=geography(md,'../Exp/79NorthShelf.exp','');
     3md=setmask(md,'../Exp/79NorthShelf.exp','');
    44md=parameterize(md,'../Par/79North.par');
    55md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test605.m

    r8295 r9641  
    11md=mesh(model,'../Exp/79North.exp',10000);
    2 md=geography(md,'../Exp/79NorthShelf.exp','');
     2md=setmask(md,'../Exp/79NorthShelf.exp','');
    33md=parameterize(md,'../Par/79North.par');
    44md=extrude(md,6,1);

  • issm/trunk/test/NightlyRun/test606.m

    r8589 r9641  
    11md=mesh(model,'../Exp/79North.exp',10000);
    2 md=geography(md,'../Exp/79NorthShelf.exp','');
     2md=setmask(md,'../Exp/79NorthShelf.exp','');
    33md=parameterize(md,'../Par/79North.par');
    44md=extrude(md,6,1);

  • issm/trunk/test/NightlyRun/test607.m

    r8295 r9641  
    11md=mesh(model,'../Exp/79North.exp',10000);
    2 md=geography(md,'../Exp/79NorthShelf.exp','');
     2md=setmask(md,'../Exp/79NorthShelf.exp','');
    33md=parameterize(md,'../Par/79North.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test608.m

    r8589 r9641  
    11md=mesh(model,'../Exp/79North.exp',10000);
    2 md=geography(md,'../Exp/79NorthShelf.exp','');
     2md=setmask(md,'../Exp/79NorthShelf.exp','');
    33md=parameterize(md,'../Par/79North.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test609.m

    r8295 r9641  
    11md=mesh(model,'../Exp/79North.exp',10000);
    2 md=geography(md,'../Exp/79NorthShelf.exp','');
     2md=setmask(md,'../Exp/79NorthShelf.exp','');
    33md=parameterize(md,'../Par/79North.par');
    44md=extrude(md,5,1.5);

  • issm/trunk/test/NightlyRun/test610.m

    r8589 r9641  
    11md=mesh(model,'../Exp/79North.exp',10000);
    2 md=geography(md,'../Exp/79NorthShelf.exp','');
     2md=setmask(md,'../Exp/79NorthShelf.exp','');
    33md=parameterize(md,'../Par/79North.par');
    44md=extrude(md,5,1.5);

  • issm/trunk/test/NightlyRun/test611.m

    r8295 r9641  
    11md=mesh(model,'../Exp/79North.exp',10000);
    2 md=geography(md,'../Exp/79NorthShelf.exp','');
     2md=setmask(md,'../Exp/79NorthShelf.exp','');
    33md=parameterize(md,'../Par/79North.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test612.m

    r8589 r9641  
    11md=mesh(model,'../Exp/79North.exp',10000);
    2 md=geography(md,'../Exp/79NorthShelf.exp','');
     2md=setmask(md,'../Exp/79NorthShelf.exp','');
    33md=parameterize(md,'../Par/79North.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test613.m

    r8295 r9641  
    11md=mesh(model,'../Exp/79North.exp',10000);
    2 md=geography(md,'../Exp/79NorthShelf.exp','');
     2md=setmask(md,'../Exp/79NorthShelf.exp','');
    33md=parameterize(md,'../Par/79North.par');
    44md=extrude(md,2,1);

  • issm/trunk/test/NightlyRun/test614.m

    r8589 r9641  
    11md=mesh(model,'../Exp/79North.exp',10000);
    2 md=geography(md,'../Exp/79NorthShelf.exp','');
     2md=setmask(md,'../Exp/79NorthShelf.exp','');
    33md=parameterize(md,'../Par/79North.par');
    44md=extrude(md,2,1);

  • issm/trunk/test/NightlyRun/test615.m

    r8295 r9641  
    11md=mesh(model,'../Exp/79North.exp',10000);
    2 md=geography(md,'../Exp/79NorthShelf.exp','');
     2md=setmask(md,'../Exp/79NorthShelf.exp','');
    33md=parameterize(md,'../Par/79North.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test616.m

    r8589 r9641  
    11md=mesh(model,'../Exp/79North.exp',10000);
    2 md=geography(md,'../Exp/79NorthShelf.exp','');
     2md=setmask(md,'../Exp/79NorthShelf.exp','');
    33md=parameterize(md,'../Par/79North.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test617.m

    r8295 r9641  
    11md=mesh(model,'../Exp/79North.exp',10000);
    22md=meshconvert(md);
    3 md=geography(md,'../Exp/79NorthShelf.exp','');
     3md=setmask(md,'../Exp/79NorthShelf.exp','');
    44md=parameterize(md,'../Par/79North.par');
    55md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test618.m

    r8589 r9641  
    11md=mesh(model,'../Exp/79North.exp',10000);
    22md=meshconvert(md);
    3 md=geography(md,'../Exp/79NorthShelf.exp','');
     3md=setmask(md,'../Exp/79NorthShelf.exp','');
    44md=parameterize(md,'../Par/79North.par');
    55md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test619.m

    r8295 r9641  
    11md=mesh(model,'../Exp/79North.exp',10000);
    2 md=geography(md,'../Exp/79NorthShelf.exp','');
     2md=setmask(md,'../Exp/79NorthShelf.exp','');
    33md=parameterize(md,'../Par/79North.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test620.m

    r8589 r9641  
    11md=mesh(model,'../Exp/79North.exp',10000);
    2 md=geography(md,'../Exp/79NorthShelf.exp','');
     2md=setmask(md,'../Exp/79NorthShelf.exp','');
    33md=parameterize(md,'../Par/79North.par');
    44md=extrude(md,3,1);

  • issm/trunk/test/NightlyRun/test621.m

    r9597 r9641  
    11md=mesh(model,'../Exp/79North.exp',10000);
    2 md=geography(md,'../Exp/79NorthShelf.exp','');
     2md=setmask(md,'../Exp/79NorthShelf.exp','');
    33md=parameterize(md,'../Par/79North.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test622.m

    r9597 r9641  
    11md=mesh(model,'../Exp/79North.exp',10000);
    2 md=geography(md,'../Exp/79NorthShelf.exp','');
     2md=setmask(md,'../Exp/79NorthShelf.exp','');
    33md=parameterize(md,'../Par/79North.par');
    44md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test623.m

    r9597 r9641  
    11md=mesh(model,'../Exp/79North.exp',10000);
    22md=meshconvert(md);
    3 md=geography(md,'../Exp/79NorthShelf.exp','');
     3md=setmask(md,'../Exp/79NorthShelf.exp','');
    44md=parameterize(md,'../Par/79North.par');
    55md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test624.m

    r9597 r9641  
    11md=mesh(model,'../Exp/79North.exp',10000);
    22md=meshconvert(md);
    3 md=geography(md,'../Exp/79NorthShelf.exp','');
     3md=setmask(md,'../Exp/79NorthShelf.exp','');
    44md=parameterize(md,'../Par/79North.par');
    55md=setelementstype(md,'macayeal','all');

  • issm/trunk/test/NightlyRun/test625.m

    r9597 r9641  
    11md=mesh(model,'../Exp/79North.exp',10000);
    22md=meshconvert(md);
    3 md=geography(md,'../Exp/79NorthShelf.exp','');
     3md=setmask(md,'../Exp/79NorthShelf.exp','');
    44md=parameterize(md,'../Par/79North.par');
    55md=setelementstype(md,'macayeal','all');
    66
    77%Ice sheet only
    8 md=modelextract(md,md.elementonicesheet);
     8md=modelextract(md,md.mask.elementongroundedice);
    99pos=find(md.nodeonboundary);
    1010md.spcthickness(pos)=md.thickness(pos);

  • issm/trunk/test/NightlyRun/test626.m

    r9597 r9641  
    11md=mesh(model,'../Exp/79North.exp',10000);
    22md=meshconvert(md);
    3 md=geography(md,'../Exp/79NorthShelf.exp','');
     3md=setmask(md,'../Exp/79NorthShelf.exp','');
    44md=parameterize(md,'../Par/79North.par');
    55md=setelementstype(md,'macayeal','all');
    66
    77%Ice sheet only
    8 md=modelextract(md,md.elementonicesheet);
     8md=modelextract(md,md.mask.elementongroundedice);
    99pos=find(md.nodeonboundary);
    1010md.spcthickness(pos)=md.thickness(pos);

  • issm/trunk/test/Par/79North.par

    r9636 r9641  
    1616
    1717%Friction
    18 pos=find(md.elementoniceshelf);
     18pos=find(md.mask.elementonfloatingice);
    1919md.friction.coefficient=50*ones(md.numberofnodes,1);
    2020md.friction.coefficient(md.elements(pos,:))=0;
    … …  
    2525md.basalforcings.melting_rate=zeros(md.numberofnodes,1);
    2626pos=zeros(md.numberofnodes,1);
    27 pos(md.elements(find(md.elementoniceshelf),:))=1;
     27pos(md.elements(find(md.mask.elementonfloatingice),:))=1;
    2828md.basalforcings.melting_rate(find(pos))=10;
    2929md.surfaceforcings.mass_balance=15*ones(md.numberofnodes,1);

  • issm/trunk/test/Par/ISMIPA.par

    r9636 r9641  
    99md.friction.coefficient=200*ones(md.numberofnodes,1); %q=1.
    1010%Take care of iceshelves: no basal drag
    11 pos=find(md.elementoniceshelf);
     11pos=find(md.mask.elementonfloatingice);
    1212md.friction.coefficient(md.elements(pos,:))=0;
    1313md.friction.p=ones(md.numberofelements,1);

  • issm/trunk/test/Par/ISMIPB.par

    r9636 r9641  
    99md.friction.coefficient=200*ones(md.numberofnodes,1); %q=1.
    1010%Take care of iceshelves: no basal drag
    11 pos=find(md.elementoniceshelf);
     11pos=find(md.mask.elementonfloatingice);
    1212md.friction.coefficient(md.elements(pos,:))=0;
    1313md.friction.p=ones(md.numberofelements,1);

  • issm/trunk/test/Par/ISMIPC.par

    r9636 r9641  
    1010md.friction.coefficient=sqrt(md.constants.yts.*(1000+1000*sin(md.x*2*pi/max(md.x)).*sin(md.y*2*pi/max(md.x))));
    1111%Take care of iceshelves: no basal drag
    12 pos=find(md.elementoniceshelf);
     12pos=find(md.mask.elementonfloatingice);
    1313md.friction.coefficient(md.elements(pos,:))=0;
    1414md.friction.p=ones(md.numberofelements,1);

  • issm/trunk/test/Par/ISMIPD.par

    r9636 r9641  
    99md.friction.coefficient=sqrt(md.constants.yts.*(1000+1000*sin(md.x*2*pi/max(md.x))));
    1010%Take care of iceshelves: no basal drag
    11 pos=find(md.elementoniceshelf);
     11pos=find(md.mask.elementonfloatingice);
    1212md.friction.coefficient(md.elements(pos,:))=0;
    1313md.friction.p=ones(md.numberofelements,1);

  • issm/trunk/test/Par/Pig.par

    r9636 r9641  
    2121
    2222%Friction
    23 pos=find(md.elementoniceshelf);
     23pos=find(md.mask.elementonfloatingice);
    2424md.friction.coefficient=50*ones(md.numberofnodes,1);
    2525md.friction.coefficient(md.elements(pos,:))=0;

  • issm/trunk/test/Par/RoundSheetShelf.par

    r9636 r9641  
    1313md.bed=-md.materials.rho_ice/md.materials.rho_water*md.thickness;
    1414
    15 pos=find(md.nodeonicesheet);
     15pos=find(md.mask.vertexongroundedice);
    1616md.bed(pos)=md.bed(pos)-300*(radius(pos)-(rad-shelfextent))/(rad-shelfextent);
    1717md.surface=md.bed+md.thickness;
    … …  
    4747md.surfaceforcings.mass_balance=-10*ones(md.numberofnodes,1);
    4848md.basalforcings.melting_rate=zeros(md.numberofnodes,1);
    49 pos=find(md.nodeoniceshelf);md.basalforcings.melting_rate(pos)=10;
     49pos=find(md.mask.vertexonfloatingice);md.basalforcings.melting_rate(pos)=10;
    5050
    5151%Friction
    52 pos=find(md.elementoniceshelf);
     52pos=find(md.mask.elementonfloatingice);
    5353md.friction.coefficient=20*ones(md.numberofnodes,1);
    5454md.friction.coefficient(md.elements(pos,:))=0;
    … …  
    5959md.viscosity_overshoot=0.0;
    6060md.artificial_diffusivity=1;
    61 md.thermal.stabilisation=1;
     61md.thermal.stabilization=1;
    6262md.verbose=verbose(0);
    6363md.waitonlock=30;
    … …  
    7171md.groundingline.migration='AgressiveMigration';
    7272md.bathymetry=md.bed;
    73 pos=find(md.nodeoniceshelf); md.bathymetry(pos)=md.bed(pos)-900;
     73pos=find(md.mask.vertexonfloatingice); md.bathymetry(pos)=md.bed(pos)-900;
    7474
    7575%Deal with boundary conditions:
    … …  
    8383
    8484pressureload=md.segments;
    85 pressureload=[pressureload 1*md.elementoniceshelf(pressureload(:,end)) + 0*md.elementonicesheet(pressureload(:,end))];
     85pressureload=[pressureload 1*md.mask.elementonfloatingice(pressureload(:,end)) + 0*md.mask.elementongroundedice(pressureload(:,end))];
    8686md.pressureload=pressureload;
    8787md.spcthickness=NaN*ones(md.numberofnodes,1);

  • issm/trunk/test/Par/RoundSheetStaticEISMINT.par

    r9636 r9641  
    1111md.friction.coefficient=20*ones(md.numberofnodes,1); %q=1. %no drag is specified in the analytical solution
    1212%Take care of iceshelves: no basal drag
    13 pos=find(md.elementoniceshelf);
     13pos=find(md.mask.elementonfloatingice);
    1414md.friction.coefficient(md.elements(pos,:))=0;
    1515md.friction.p=ones(md.numberofelements,1);

  • issm/trunk/test/Par/SquareEISMINT.par

    r9636 r9641  
    1111md.friction.coefficient=200*ones(md.numberofnodes,1); %q=1.
    1212%Take care of iceshelves: no basal drag
    13 pos=find(md.elementoniceshelf);
     13pos=find(md.mask.elementonfloatingice);
    1414md.friction.coefficient(md.elements(pos,:))=0;
    1515md.friction.p=ones(md.numberofelements,1);

  • issm/trunk/test/Par/SquareSheetConstrained.par

    r9636 r9641  
    2424
    2525%Friction
    26 pos=find(md.elementoniceshelf);
     26pos=find(md.mask.elementonfloatingice);
    2727md.friction.coefficient=20*ones(md.numberofnodes,1);
    2828md.friction.coefficient(md.elements(pos,:))=0;

  • issm/trunk/test/Par/SquareSheetShelf.par

    r9636 r9641  
    3131
    3232%Friction
    33 pos=find(md.elementoniceshelf);
     33pos=find(md.mask.elementonfloatingice);
    3434md.friction.coefficient=20*ones(md.numberofnodes,1);
    3535md.friction.coefficient(md.elements(pos,:))=0;

  • issm/trunk/test/Par/SquareShelf.par

    r9636 r9641  
    2424
    2525%Friction
    26 pos=find(md.elementoniceshelf);
     26pos=find(md.mask.elementonfloatingice);
    2727md.friction.coefficient=20*ones(md.numberofnodes,1);
    2828md.friction.coefficient(md.elements(pos,:))=0;

  • issm/trunk/test/Par/SquareShelfConstrained.par

    r9636 r9641  
    2828
    2929%Friction
    30 pos=find(md.elementoniceshelf);
     30pos=find(md.mask.elementonfloatingice);
    3131md.friction.coefficient=20*ones(md.numberofnodes,1);
    3232md.friction.coefficient(md.elements(pos,:))=0;

  • issm/trunk/test/Par/SquareThermal.par

    r9636 r9641  
    1717md.friction.coefficient=200*ones(md.numberofnodes,1); %q=1.
    1818%Take care of iceshelves: no basal drag
    19 pos=find(md.elementoniceshelf);
     19pos=find(md.mask.elementonfloatingice);
    2020md.friction.coefficient(md.elements(pos,:))=0;
    2121md.friction.p=ones(md.numberofelements,1);
    … …  
    4141md.thermal.spctemperature(:)=md.temperature;
    4242md.basalforcings.geothermalflux=zeros(md.numberofnodes,1);
    43 pos=find(md.elementonicesheet);md.basalforcings.geothermalflux(md.elements(pos,:))=1*10^-3; %1 mW/m^2
     43pos=find(md.mask.elementongroundedice);md.basalforcings.geothermalflux(md.elements(pos,:))=1*10^-3; %1 mW/m^2
Note: See TracChangeset for help on using the changeset viewer.