Index: /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h =================================================================== --- /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h (revision 9640) +++ /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h (revision 9641) @@ -11,5 +11,5 @@ enum definitions{ - /*model fields {{{1*/ + /*Model fields {{{1*/ ConstantsGEnum, ConstantsReferencetemperatureEnum, @@ -59,4 +59,10 @@ MaterialsThermalExchangeVelocityEnum, MaterialsMeltingpointEnum, + MaskElementongroundediceEnum, + MaskElementonfloatingiceEnum, + MaskElementonwaterEnum, + MaskVertexongroundediceEnum, + MaskVertexonfloatingiceEnum, + MaskVertexonwaterEnum, /*}}}*/ /*Datasets {{{1*/ @@ -215,9 +221,6 @@ ControlTypeEnum, ConvergedEnum, - ElementOnBedEnum, - ElementOnIceSheetEnum, - ElementOnIceShelfEnum, - ElementOnSurfaceEnum, - ElementOnWaterEnum, + ElementonbedEnum, + ElementonsurfaceEnum, FillEnum, FractionIncrementEnum, @@ -238,8 +241,6 @@ GroundinglineMeltingRateEnum, MisfitEnum, - NodeOnBedEnum, - NodeOnIceSheetEnum, - NodeOnIceShelfEnum, - NodeOnSurfaceEnum, + NodeonbedEnum, + NodeonsurfaceEnum, NumberNodeToElementConnectivityEnum, PenaltyOffsetEnum, @@ -419,5 +420,4 @@ NumControlTypeEnum, SpcvyEnum, - NodeOnWaterEnum, YEnum, ElementsTypeEnum, @@ -428,6 +428,8 @@ SpcvzEnum, NumberOfNodes2DEnum, - NodeOnStokesEnum, - NodeOnHutterEnum, + NodeonstokesEnum, + NodeonhutterEnum, + NodeonpattynEnum, + NodeonmacayealEnum, ZEnum, SpcthicknessEnum, @@ -435,10 +437,8 @@ SpcvxEnum, UpperelementsEnum, - NodeOnPattynEnum, EdgesEnum, Elements2DEnum, XEnum, NumCmResponsesEnum, - NodeOnMacayealEnum, ElementconnectivityEnum, ArtificialDiffusivityEnum, Index: /issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp =================================================================== --- /issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 9640) +++ /issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 9641) @@ -63,4 +63,10 @@ case MaterialsThermalExchangeVelocityEnum : return "MaterialsThermalExchangeVelocity"; case MaterialsMeltingpointEnum : return "MaterialsMeltingpoint"; + case MaskElementongroundediceEnum : return "MaskElementongroundedice"; + case MaskElementonfloatingiceEnum : return "MaskElementonfloatingice"; + case MaskElementonwaterEnum : return "MaskElementonwater"; + case MaskVertexongroundediceEnum : return "MaskVertexongroundedice"; + case MaskVertexonfloatingiceEnum : return "MaskVertexonfloatingice"; + case MaskVertexonwaterEnum : return "MaskVertexonwater"; case ConstraintsEnum : return "Constraints"; case ElementsEnum : return "Elements"; @@ -182,9 +188,6 @@ case ControlTypeEnum : return "ControlType"; case ConvergedEnum : return "Converged"; - case ElementOnBedEnum : return "ElementOnBed"; - case ElementOnIceSheetEnum : return "ElementOnIceSheet"; - case ElementOnIceShelfEnum : return "ElementOnIceShelf"; - case ElementOnSurfaceEnum : return "ElementOnSurface"; - case ElementOnWaterEnum : return "ElementOnWater"; + case ElementonbedEnum : return "Elementonbed"; + case ElementonsurfaceEnum : return "Elementonsurface"; case FillEnum : return "Fill"; case FractionIncrementEnum : return "FractionIncrement"; @@ -205,8 +208,6 @@ case GroundinglineMeltingRateEnum : return "GroundinglineMeltingRate"; case MisfitEnum : return "Misfit"; - case NodeOnBedEnum : return "NodeOnBed"; - case NodeOnIceSheetEnum : return "NodeOnIceSheet"; - case NodeOnIceShelfEnum : return "NodeOnIceShelf"; - case NodeOnSurfaceEnum : return "NodeOnSurface"; + case NodeonbedEnum : return "Nodeonbed"; + case NodeonsurfaceEnum : return "Nodeonsurface"; case NumberNodeToElementConnectivityEnum : return "NumberNodeToElementConnectivity"; case PenaltyOffsetEnum : return "PenaltyOffset"; @@ -363,5 +364,4 @@ case NumControlTypeEnum : return "NumControlType"; case SpcvyEnum : return "Spcvy"; - case NodeOnWaterEnum : return "NodeOnWater"; case YEnum : return "Y"; case ElementsTypeEnum : return "ElementsType"; @@ -372,6 +372,8 @@ case SpcvzEnum : return "Spcvz"; case NumberOfNodes2DEnum : return "NumberOfNodes2D"; - case NodeOnStokesEnum : return "NodeOnStokes"; - case NodeOnHutterEnum : return "NodeOnHutter"; + case NodeonstokesEnum : return "Nodeonstokes"; + case NodeonhutterEnum : return "Nodeonhutter"; + case NodeonpattynEnum : return "Nodeonpattyn"; + case NodeonmacayealEnum : return "Nodeonmacayeal"; case ZEnum : return "Z"; case SpcthicknessEnum : return "Spcthickness"; @@ -379,10 +381,8 @@ case SpcvxEnum : return "Spcvx"; case UpperelementsEnum : return "Upperelements"; - case NodeOnPattynEnum : return "NodeOnPattyn"; case EdgesEnum : return "Edges"; case Elements2DEnum : return "Elements2D"; case XEnum : return "X"; case NumCmResponsesEnum : return "NumCmResponses"; - case NodeOnMacayealEnum : return "NodeOnMacayeal"; case ElementconnectivityEnum : return "Elementconnectivity"; case ArtificialDiffusivityEnum : return "ArtificialDiffusivity"; Index: /issm/trunk/src/c/modules/ModelProcessorx/Balancethickness/CreateNodesBalancethickness.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Balancethickness/CreateNodesBalancethickness.cpp (revision 9640) +++ /issm/trunk/src/c/modules/ModelProcessorx/Balancethickness/CreateNodesBalancethickness.cpp (revision 9641) @@ -49,5 +49,5 @@ /*First fetch data: */ - iomodel->FetchData(7,ElementsEnum,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,VerticesTypeEnum,NodeOnWaterEnum); + iomodel->FetchData(7,ElementsEnum,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,VerticesTypeEnum,MaskVertexonwaterEnum); if(continuous_galerkin){ @@ -88,5 +88,5 @@ /*Clean fetched data: */ - iomodel->DeleteData(7,ElementsEnum,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,VerticesTypeEnum,NodeOnWaterEnum); + iomodel->DeleteData(7,ElementsEnum,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,VerticesTypeEnum,MaskVertexonwaterEnum); /*Assign output pointer: */ Index: /issm/trunk/src/c/modules/ModelProcessorx/Balancethickness/UpdateElementsBalancethickness.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Balancethickness/UpdateElementsBalancethickness.cpp (revision 9640) +++ /issm/trunk/src/c/modules/ModelProcessorx/Balancethickness/UpdateElementsBalancethickness.cpp (revision 9641) @@ -37,6 +37,6 @@ iomodel->FetchDataToInput(elements,SurfaceEnum); iomodel->FetchDataToInput(elements,BedEnum); - iomodel->FetchDataToInput(elements,ElementOnIceShelfEnum); - iomodel->FetchDataToInput(elements,ElementOnWaterEnum); + iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum); + iomodel->FetchDataToInput(elements,MaskElementonwaterEnum); iomodel->FetchDataToInput(elements,VxEnum); iomodel->FetchDataToInput(elements,VyEnum); @@ -48,6 +48,6 @@ if (dim==3){ - iomodel->FetchDataToInput(elements,ElementOnBedEnum); - iomodel->FetchDataToInput(elements,ElementOnSurfaceEnum); + iomodel->FetchDataToInput(elements,ElementonbedEnum); + iomodel->FetchDataToInput(elements,ElementonsurfaceEnum); } /*Free data: */ Index: /issm/trunk/src/c/modules/ModelProcessorx/BedSlope/CreateNodesBedSlope.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/BedSlope/CreateNodesBedSlope.cpp (revision 9640) +++ /issm/trunk/src/c/modules/ModelProcessorx/BedSlope/CreateNodesBedSlope.cpp (revision 9641) @@ -36,5 +36,5 @@ /*First fetch data: */ - iomodel->FetchData(6,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,VerticesTypeEnum,NodeOnWaterEnum); + iomodel->FetchData(6,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,VerticesTypeEnum,MaskVertexonwaterEnum); for (i=0;iDeleteData(6,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,VerticesTypeEnum,NodeOnWaterEnum); + iomodel->DeleteData(6,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,VerticesTypeEnum,MaskVertexonwaterEnum); /*Assign output pointer: */ Index: /issm/trunk/src/c/modules/ModelProcessorx/BedSlope/UpdateElementsBedSlope.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/BedSlope/UpdateElementsBedSlope.cpp (revision 9640) +++ /issm/trunk/src/c/modules/ModelProcessorx/BedSlope/UpdateElementsBedSlope.cpp (revision 9641) @@ -36,9 +36,9 @@ iomodel->FetchDataToInput(elements,SurfaceEnum); iomodel->FetchDataToInput(elements,BedEnum); - iomodel->FetchDataToInput(elements,ElementOnWaterEnum); + iomodel->FetchDataToInput(elements,MaskElementonwaterEnum); if (dim==3){ - iomodel->FetchDataToInput(elements,ElementOnBedEnum); - iomodel->FetchDataToInput(elements,ElementOnSurfaceEnum); + iomodel->FetchDataToInput(elements,ElementonbedEnum); + iomodel->FetchDataToInput(elements,ElementonsurfaceEnum); } Index: /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp (revision 9640) +++ /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp (revision 9641) @@ -65,8 +65,8 @@ iomodel->FetchData(&spcvy,NULL,NULL,SpcvyEnum); iomodel->FetchData(&spcvz,NULL,NULL,SpcvzEnum); - iomodel->FetchData(&nodeonhutter,NULL,NULL,NodeOnHutterEnum); - iomodel->FetchData(&nodeonmacayeal,NULL,NULL,NodeOnMacayealEnum); - if(dim==3)iomodel->FetchData(&nodeonpattyn,NULL,NULL,NodeOnPattynEnum); - if(dim==3)iomodel->FetchData(&nodeonstokes,NULL,NULL,NodeOnStokesEnum); + iomodel->FetchData(&nodeonhutter,NULL,NULL,NodeonhutterEnum); + iomodel->FetchData(&nodeonmacayeal,NULL,NULL,NodeonmacayealEnum); + if(dim==3)iomodel->FetchData(&nodeonpattyn,NULL,NULL,NodeonpattynEnum); + if(dim==3)iomodel->FetchData(&nodeonstokes,NULL,NULL,NodeonstokesEnum); iomodel->FetchData(&vertices_type,NULL,NULL,VerticesTypeEnum); iomodel->FetchData(&surface,NULL,NULL,SurfaceEnum); Index: /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp (revision 9640) +++ /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp (revision 9641) @@ -124,7 +124,7 @@ /*create penalties for nodes on the base of icesheet. We must have wb=ub*db/dx+vb*db/dy */ - iomodel->FetchData(&nodeonbed,NULL,NULL,NodeOnBedEnum); - iomodel->FetchData(&nodeonicesheet,NULL,NULL,NodeOnIceSheetEnum); - iomodel->FetchData(&nodeonstokes,NULL,NULL,NodeOnStokesEnum); + iomodel->FetchData(&nodeonbed,NULL,NULL,NodeonbedEnum); + iomodel->FetchData(&nodeonicesheet,NULL,NULL,MaskVertexongroundediceEnum); + iomodel->FetchData(&nodeonstokes,NULL,NULL,NodeonstokesEnum); iomodel->FetchData(&vertices_type,NULL,NULL,VerticesTypeEnum); iomodel->FetchData(1,ElementsEnum); @@ -174,5 +174,5 @@ if(numrifts){ iomodel->FetchData(&riftinfo,&numriftsegments,NULL,RiftsRiftstructEnum); - iomodel->FetchData(5,RiftsRiftstructEnum,ThicknessEnum,BedEnum,SurfaceEnum,NodeOnIceShelfEnum); + iomodel->FetchData(5,RiftsRiftstructEnum,ThicknessEnum,BedEnum,SurfaceEnum,MaskVertexonfloatingiceEnum); for(i=0;imy_elements[(int)*(riftinfo+RIFTINFOSIZE*i+2)-1]){ @@ -181,5 +181,5 @@ } } - iomodel->DeleteData(5,RiftsRiftstructEnum,ThicknessEnum,BedEnum,SurfaceEnum,NodeOnIceShelfEnum); + iomodel->DeleteData(5,RiftsRiftstructEnum,ThicknessEnum,BedEnum,SurfaceEnum,MaskVertexonfloatingiceEnum); xfree((void**)&riftfront); } Index: /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp (revision 9640) +++ /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp (revision 9641) @@ -45,6 +45,6 @@ /*Create nodes: */ - iomodel->FetchData(10,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnHutterEnum,NodeOnMacayealEnum,NodeOnStokesEnum, - NodeOnIceSheetEnum,NodeOnIceShelfEnum,NodeOnWaterEnum,VerticesTypeEnum,DiagnosticRefEnum); + iomodel->FetchData(10,NodeonbedEnum,NodeonsurfaceEnum,NodeonhutterEnum,NodeonmacayealEnum,NodeonstokesEnum, + MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,MaskVertexonwaterEnum,VerticesTypeEnum,DiagnosticRefEnum); for (i=0;iDeleteData(10,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnHutterEnum,NodeOnMacayealEnum,NodeOnStokesEnum, - NodeOnIceSheetEnum,NodeOnIceShelfEnum,NodeOnWaterEnum,VerticesTypeEnum,DiagnosticRefEnum); + iomodel->DeleteData(10,NodeonbedEnum,NodeonsurfaceEnum,NodeonhutterEnum,NodeonmacayealEnum,NodeonstokesEnum, + MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,MaskVertexonwaterEnum,VerticesTypeEnum,DiagnosticRefEnum); /*Assign output pointer: */ Index: /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp (revision 9640) +++ /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp (revision 9641) @@ -55,6 +55,6 @@ iomodel->FetchDataToInput(elements,FrictionPEnum); iomodel->FetchDataToInput(elements,FrictionQEnum); - iomodel->FetchDataToInput(elements,ElementOnIceShelfEnum); - iomodel->FetchDataToInput(elements,ElementOnWaterEnum); + iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum); + iomodel->FetchDataToInput(elements,MaskElementonwaterEnum); iomodel->FetchDataToInput(elements,MaterialsRheologyBEnum); iomodel->FetchDataToInput(elements,MaterialsRheologyNEnum); @@ -64,6 +64,6 @@ if (dim==3){ - iomodel->FetchDataToInput(elements,ElementOnBedEnum); - iomodel->FetchDataToInput(elements,ElementOnSurfaceEnum); + iomodel->FetchDataToInput(elements,ElementonbedEnum); + iomodel->FetchDataToInput(elements,ElementonsurfaceEnum); iomodel->FetchDataToInput(elements,VzEnum); iomodel->FetchDataToInput(elements,SurfaceforcingsAccumulationRateEnum); @@ -71,5 +71,5 @@ iomodel->FetchDataToInput(elements,SurfaceforcingsMassBalanceEnum); iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum); - iomodel->FetchDataToInput(elements,NodeOnStokesEnum); + iomodel->FetchDataToInput(elements,NodeonstokesEnum); } Index: /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp (revision 9640) +++ /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp (revision 9641) @@ -42,5 +42,5 @@ /*Fetch data: */ - iomodel->FetchData(3,SpcvxEnum,SpcvyEnum,NodeOnHutterEnum); + iomodel->FetchData(3,SpcvxEnum,SpcvyEnum,NodeonhutterEnum); /*Initialize conunter*/ @@ -51,5 +51,5 @@ /*keep only this partition's nodes:*/ if((iomodel->my_vertices[i])){ - if (!(int)iomodel->Data(NodeOnHutterEnum)[i]){ + if (!(int)iomodel->Data(NodeonhutterEnum)[i]){ constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,1,0,DiagnosticHutterAnalysisEnum)); @@ -74,5 +74,5 @@ /*Free data: */ - iomodel->DeleteData(3,SpcvxEnum,SpcvyEnum,NodeOnHutterEnum); + iomodel->DeleteData(3,SpcvxEnum,SpcvyEnum,NodeonhutterEnum); /*Assign output pointer: */ Index: /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp (revision 9640) +++ /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp (revision 9641) @@ -44,5 +44,5 @@ /*First fetch data: */ - iomodel->FetchData(8,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnHutterEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,ElementsEnum,VerticesTypeEnum,NodeOnWaterEnum); + iomodel->FetchData(8,NodeonbedEnum,NodeonsurfaceEnum,NodeonhutterEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,ElementsEnum,VerticesTypeEnum,MaskVertexonwaterEnum); CreateNumberNodeToElementConnectivity(iomodel); @@ -57,5 +57,5 @@ /*Clean fetched data: */ - iomodel->DeleteData(8,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnHutterEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,ElementsEnum,VerticesTypeEnum,NodeOnWaterEnum); + iomodel->DeleteData(8,NodeonbedEnum,NodeonsurfaceEnum,NodeonhutterEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,ElementsEnum,VerticesTypeEnum,MaskVertexonwaterEnum); /*Assign output pointer: */ Index: /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/UpdateElementsDiagnosticHutter.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/UpdateElementsDiagnosticHutter.cpp (revision 9640) +++ /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/UpdateElementsDiagnosticHutter.cpp (revision 9641) @@ -39,5 +39,5 @@ } - iomodel->FetchDataToInput(elements,NodeOnHutterEnum); + iomodel->FetchDataToInput(elements,NodeonhutterEnum); iomodel->FetchDataToInput(elements,ThicknessEnum); iomodel->FetchDataToInput(elements,ThicknessCoeffEnum); Index: /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticVert/CreateConstraintsDiagnosticVert.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticVert/CreateConstraintsDiagnosticVert.cpp (revision 9640) +++ /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticVert/CreateConstraintsDiagnosticVert.cpp (revision 9641) @@ -41,5 +41,5 @@ /*Fetch data: */ - iomodel->FetchData(2,SpcvzEnum,NodeOnStokesEnum); + iomodel->FetchData(2,SpcvzEnum,NodeonstokesEnum); /*Initialize counter*/ @@ -52,5 +52,5 @@ if(iomodel->my_vertices[i]){ - if ((int)iomodel->Data(NodeOnStokesEnum)[i]){ + if ((int)iomodel->Data(NodeonstokesEnum)[i]){ 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 count++; @@ -66,5 +66,5 @@ /*Free data: */ - iomodel->DeleteData(2,SpcvzEnum,NodeOnStokesEnum); + iomodel->DeleteData(2,SpcvzEnum,NodeonstokesEnum); cleanup_and_return: Index: /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticVert/CreateNodesDiagnosticVert.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticVert/CreateNodesDiagnosticVert.cpp (revision 9640) +++ /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticVert/CreateNodesDiagnosticVert.cpp (revision 9641) @@ -44,5 +44,5 @@ /*First fetch data: */ - iomodel->FetchData(6,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,VerticesTypeEnum,NodeOnWaterEnum); + iomodel->FetchData(6,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,VerticesTypeEnum,MaskVertexonwaterEnum); for (i=0;iDeleteData(6,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,VerticesTypeEnum,NodeOnWaterEnum); + iomodel->DeleteData(6,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,VerticesTypeEnum,MaskVertexonwaterEnum); /*Assign output pointer: */ Index: /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticVert/UpdateElementsDiagnosticVert.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticVert/UpdateElementsDiagnosticVert.cpp (revision 9640) +++ /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticVert/UpdateElementsDiagnosticVert.cpp (revision 9641) @@ -43,8 +43,8 @@ iomodel->FetchDataToInput(elements,SurfaceEnum); iomodel->FetchDataToInput(elements,BedEnum); - iomodel->FetchDataToInput(elements,ElementOnIceShelfEnum); - iomodel->FetchDataToInput(elements,ElementOnBedEnum); - iomodel->FetchDataToInput(elements,ElementOnSurfaceEnum); - iomodel->FetchDataToInput(elements,ElementOnWaterEnum); + iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum); + iomodel->FetchDataToInput(elements,ElementonbedEnum); + iomodel->FetchDataToInput(elements,ElementonsurfaceEnum); + iomodel->FetchDataToInput(elements,MaskElementonwaterEnum); iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum); iomodel->FetchDataToInput(elements,SurfaceforcingsAccumulationRateEnum); Index: /issm/trunk/src/c/modules/ModelProcessorx/Enthalpy/CreateNodesEnthalpy.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Enthalpy/CreateNodesEnthalpy.cpp (revision 9640) +++ /issm/trunk/src/c/modules/ModelProcessorx/Enthalpy/CreateNodesEnthalpy.cpp (revision 9641) @@ -36,5 +36,5 @@ /*Create nodes and vertices: */ - iomodel->FetchData(6,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,VerticesTypeEnum,NodeOnWaterEnum); + iomodel->FetchData(6,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,VerticesTypeEnum,MaskVertexonwaterEnum); for (i=0;iDeleteData(6,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,VerticesTypeEnum,NodeOnWaterEnum); + iomodel->DeleteData(6,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,VerticesTypeEnum,MaskVertexonwaterEnum); /*Assign output pointer: */ Index: /issm/trunk/src/c/modules/ModelProcessorx/Enthalpy/UpdateElementsEnthalpy.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Enthalpy/UpdateElementsEnthalpy.cpp (revision 9640) +++ /issm/trunk/src/c/modules/ModelProcessorx/Enthalpy/UpdateElementsEnthalpy.cpp (revision 9641) @@ -45,8 +45,8 @@ iomodel->FetchDataToInput(elements,FrictionPEnum); iomodel->FetchDataToInput(elements,FrictionQEnum); - iomodel->FetchDataToInput(elements,ElementOnIceShelfEnum); - iomodel->FetchDataToInput(elements,ElementOnBedEnum); - iomodel->FetchDataToInput(elements,ElementOnSurfaceEnum); - iomodel->FetchDataToInput(elements,ElementOnWaterEnum); + iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum); + iomodel->FetchDataToInput(elements,ElementonbedEnum); + iomodel->FetchDataToInput(elements,ElementonsurfaceEnum); + iomodel->FetchDataToInput(elements,MaskElementonwaterEnum); iomodel->FetchDataToInput(elements,ElementsTypeEnum); iomodel->FetchDataToInput(elements,MaterialsRheologyBEnum); Index: /issm/trunk/src/c/modules/ModelProcessorx/Hydrology/CreateNodesHydrology.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Hydrology/CreateNodesHydrology.cpp (revision 9640) +++ /issm/trunk/src/c/modules/ModelProcessorx/Hydrology/CreateNodesHydrology.cpp (revision 9641) @@ -36,5 +36,5 @@ /*Create nodes and vertices: */ - iomodel->FetchData(6,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,VerticesTypeEnum,NodeOnWaterEnum); + iomodel->FetchData(6,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,VerticesTypeEnum,MaskVertexonwaterEnum); for (i=0;iDeleteData(6,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,VerticesTypeEnum,NodeOnWaterEnum); + iomodel->DeleteData(6,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,VerticesTypeEnum,MaskVertexonwaterEnum); /*Assign output pointer: */ Index: /issm/trunk/src/c/modules/ModelProcessorx/Hydrology/UpdateElementsHydrology.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Hydrology/UpdateElementsHydrology.cpp (revision 9640) +++ /issm/trunk/src/c/modules/ModelProcessorx/Hydrology/UpdateElementsHydrology.cpp (revision 9641) @@ -38,8 +38,8 @@ iomodel->FetchDataToInput(elements,FrictionPEnum); iomodel->FetchDataToInput(elements,FrictionQEnum); - iomodel->FetchDataToInput(elements,ElementOnIceShelfEnum); - iomodel->FetchDataToInput(elements,ElementOnBedEnum); - iomodel->FetchDataToInput(elements,ElementOnSurfaceEnum); - iomodel->FetchDataToInput(elements,ElementOnWaterEnum); + iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum); + iomodel->FetchDataToInput(elements,ElementonbedEnum); + iomodel->FetchDataToInput(elements,ElementonsurfaceEnum); + iomodel->FetchDataToInput(elements,MaskElementonwaterEnum); iomodel->FetchDataToInput(elements,ElementsTypeEnum); iomodel->FetchDataToInput(elements,MaterialsRheologyBEnum); Index: /issm/trunk/src/c/modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp (revision 9640) +++ /issm/trunk/src/c/modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp (revision 9641) @@ -35,15 +35,15 @@ //create penalties for nodes: no node can have a temperature over the melting point - iomodel->FetchData(2,NodeOnBedEnum,ElementsEnum); + iomodel->FetchData(2,NodeonbedEnum,ElementsEnum); CreateSingleNodeToElementConnectivity(iomodel); for (i=0;imy_vertices[i]==1)){ - if (iomodel->Data(NodeOnBedEnum)[i]){ + if (iomodel->Data(NodeonbedEnum)[i]){ loads->AddObject(new Pengrid(iomodel->loadcounter+i+1,i,iomodel,MeltingAnalysisEnum)); } } } - iomodel->DeleteData(2,NodeOnBedEnum,ElementsEnum); + iomodel->DeleteData(2,NodeonbedEnum,ElementsEnum); /*Assign output pointer: */ Index: /issm/trunk/src/c/modules/ModelProcessorx/Melting/CreateNodesMelting.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Melting/CreateNodesMelting.cpp (revision 9640) +++ /issm/trunk/src/c/modules/ModelProcessorx/Melting/CreateNodesMelting.cpp (revision 9641) @@ -36,5 +36,5 @@ /*First fetch data: */ - iomodel->FetchData(6,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,VerticesTypeEnum,NodeOnWaterEnum); + iomodel->FetchData(6,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,VerticesTypeEnum,MaskVertexonwaterEnum); for (i=0;iDeleteData(6,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,VerticesTypeEnum,NodeOnWaterEnum); + iomodel->DeleteData(6,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,VerticesTypeEnum,MaskVertexonwaterEnum); /*Assign output pointer: */ Index: /issm/trunk/src/c/modules/ModelProcessorx/Melting/UpdateElementsMelting.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Melting/UpdateElementsMelting.cpp (revision 9640) +++ /issm/trunk/src/c/modules/ModelProcessorx/Melting/UpdateElementsMelting.cpp (revision 9641) @@ -46,8 +46,8 @@ iomodel->FetchDataToInput(elements,FrictionPEnum); iomodel->FetchDataToInput(elements,FrictionQEnum); - iomodel->FetchDataToInput(elements,ElementOnIceShelfEnum); - iomodel->FetchDataToInput(elements,ElementOnBedEnum); - iomodel->FetchDataToInput(elements,ElementOnSurfaceEnum); - iomodel->FetchDataToInput(elements,ElementOnWaterEnum); + iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum); + iomodel->FetchDataToInput(elements,ElementonbedEnum); + iomodel->FetchDataToInput(elements,ElementonsurfaceEnum); + iomodel->FetchDataToInput(elements,MaskElementonwaterEnum); iomodel->FetchDataToInput(elements,ElementsTypeEnum); iomodel->FetchDataToInput(elements,MaterialsRheologyBEnum); Index: /issm/trunk/src/c/modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp (revision 9640) +++ /issm/trunk/src/c/modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp (revision 9641) @@ -64,5 +64,5 @@ double *nodeonbed=NULL; iomodel->FetchData(&penalties,&numpenalties,NULL,PenaltiesEnum); - iomodel->FetchData(&nodeonbed,NULL,NULL,NodeOnBedEnum); + iomodel->FetchData(&nodeonbed,NULL,NULL,NodeonbedEnum); for(i=0;iFetchData(7,ElementsEnum,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,VerticesTypeEnum,NodeOnWaterEnum); + iomodel->FetchData(7,ElementsEnum,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,VerticesTypeEnum,MaskVertexonwaterEnum); if(continuous_galerkin){ @@ -88,5 +88,5 @@ /*Clean fetched data: */ - iomodel->DeleteData(7,ElementsEnum,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,VerticesTypeEnum,NodeOnWaterEnum); + iomodel->DeleteData(7,ElementsEnum,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,VerticesTypeEnum,MaskVertexonwaterEnum); /*Assign output pointer: */ Index: /issm/trunk/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp (revision 9640) +++ /issm/trunk/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp (revision 9641) @@ -39,6 +39,6 @@ iomodel->FetchDataToInput(elements,SurfaceEnum); iomodel->FetchDataToInput(elements,BedEnum); - iomodel->FetchDataToInput(elements,ElementOnIceShelfEnum); - iomodel->FetchDataToInput(elements,ElementOnWaterEnum); + iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum); + iomodel->FetchDataToInput(elements,MaskElementonwaterEnum); iomodel->FetchDataToInput(elements,SurfaceforcingsAccumulationRateEnum); iomodel->FetchDataToInput(elements,SurfaceforcingsAblationRateEnum); @@ -54,6 +54,6 @@ if (dim==3){ - iomodel->FetchDataToInput(elements,ElementOnBedEnum); - iomodel->FetchDataToInput(elements,ElementOnSurfaceEnum); + iomodel->FetchDataToInput(elements,ElementonbedEnum); + iomodel->FetchDataToInput(elements,ElementonsurfaceEnum); iomodel->FetchDataToInput(elements,PressureEnum); iomodel->FetchDataToInput(elements,TemperatureEnum); Index: /issm/trunk/src/c/modules/ModelProcessorx/SurfaceSlope/CreateNodesSurfaceSlope.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/SurfaceSlope/CreateNodesSurfaceSlope.cpp (revision 9640) +++ /issm/trunk/src/c/modules/ModelProcessorx/SurfaceSlope/CreateNodesSurfaceSlope.cpp (revision 9641) @@ -36,5 +36,5 @@ /*First fetch data: */ - iomodel->FetchData(6,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,VerticesTypeEnum,NodeOnWaterEnum); + iomodel->FetchData(6,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,VerticesTypeEnum,MaskVertexonwaterEnum); for (i=0;iDeleteData(6,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,VerticesTypeEnum,NodeOnWaterEnum); + iomodel->DeleteData(6,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,VerticesTypeEnum,MaskVertexonwaterEnum); /*Assign output pointer: */ Index: /issm/trunk/src/c/modules/ModelProcessorx/SurfaceSlope/UpdateElementsSurfaceSlope.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/SurfaceSlope/UpdateElementsSurfaceSlope.cpp (revision 9640) +++ /issm/trunk/src/c/modules/ModelProcessorx/SurfaceSlope/UpdateElementsSurfaceSlope.cpp (revision 9641) @@ -36,9 +36,9 @@ iomodel->FetchDataToInput(elements,SurfaceEnum); iomodel->FetchDataToInput(elements,BedEnum); - iomodel->FetchDataToInput(elements,ElementOnWaterEnum); + iomodel->FetchDataToInput(elements,MaskElementonwaterEnum); if (dim==3){ - iomodel->FetchDataToInput(elements,ElementOnBedEnum); - iomodel->FetchDataToInput(elements,ElementOnSurfaceEnum); + iomodel->FetchDataToInput(elements,ElementonbedEnum); + iomodel->FetchDataToInput(elements,ElementonsurfaceEnum); } Index: /issm/trunk/src/c/modules/ModelProcessorx/Thermal/CreateNodesThermal.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Thermal/CreateNodesThermal.cpp (revision 9640) +++ /issm/trunk/src/c/modules/ModelProcessorx/Thermal/CreateNodesThermal.cpp (revision 9641) @@ -36,5 +36,5 @@ /*Create nodes and vertices: */ - iomodel->FetchData(6,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,VerticesTypeEnum,NodeOnWaterEnum); + iomodel->FetchData(6,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,VerticesTypeEnum,MaskVertexonwaterEnum); for (i=0;iDeleteData(6,NodeOnBedEnum,NodeOnSurfaceEnum,NodeOnIceSheetEnum,NodeOnIceShelfEnum,VerticesTypeEnum,NodeOnWaterEnum); + iomodel->DeleteData(6,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,VerticesTypeEnum,MaskVertexonwaterEnum); /*Assign output pointer: */ Index: /issm/trunk/src/c/modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp (revision 9640) +++ /issm/trunk/src/c/modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp (revision 9641) @@ -47,8 +47,8 @@ iomodel->FetchDataToInput(elements,FrictionPEnum); iomodel->FetchDataToInput(elements,FrictionQEnum); - iomodel->FetchDataToInput(elements,ElementOnIceShelfEnum); - iomodel->FetchDataToInput(elements,ElementOnBedEnum); - iomodel->FetchDataToInput(elements,ElementOnSurfaceEnum); - iomodel->FetchDataToInput(elements,ElementOnWaterEnum); + iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum); + iomodel->FetchDataToInput(elements,ElementonbedEnum); + iomodel->FetchDataToInput(elements,ElementonsurfaceEnum); + iomodel->FetchDataToInput(elements,MaskElementonwaterEnum); iomodel->FetchDataToInput(elements,ElementsTypeEnum); iomodel->FetchDataToInput(elements,MaterialsRheologyBEnum); Index: /issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp =================================================================== --- /issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 9640) +++ /issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 9641) @@ -61,4 +61,10 @@ else if (strcmp(name,"MaterialsThermalExchangeVelocity")==0) return MaterialsThermalExchangeVelocityEnum; else if (strcmp(name,"MaterialsMeltingpoint")==0) return MaterialsMeltingpointEnum; + else if (strcmp(name,"MaskElementongroundedice")==0) return MaskElementongroundediceEnum; + else if (strcmp(name,"MaskElementonfloatingice")==0) return MaskElementonfloatingiceEnum; + else if (strcmp(name,"MaskElementonwater")==0) return MaskElementonwaterEnum; + else if (strcmp(name,"MaskVertexongroundedice")==0) return MaskVertexongroundediceEnum; + else if (strcmp(name,"MaskVertexonfloatingice")==0) return MaskVertexonfloatingiceEnum; + else if (strcmp(name,"MaskVertexonwater")==0) return MaskVertexonwaterEnum; else if (strcmp(name,"Constraints")==0) return ConstraintsEnum; else if (strcmp(name,"Elements")==0) return ElementsEnum; @@ -180,9 +186,6 @@ else if (strcmp(name,"ControlType")==0) return ControlTypeEnum; else if (strcmp(name,"Converged")==0) return ConvergedEnum; - else if (strcmp(name,"ElementOnBed")==0) return ElementOnBedEnum; - else if (strcmp(name,"ElementOnIceSheet")==0) return ElementOnIceSheetEnum; - else if (strcmp(name,"ElementOnIceShelf")==0) return ElementOnIceShelfEnum; - else if (strcmp(name,"ElementOnSurface")==0) return ElementOnSurfaceEnum; - else if (strcmp(name,"ElementOnWater")==0) return ElementOnWaterEnum; + else if (strcmp(name,"Elementonbed")==0) return ElementonbedEnum; + else if (strcmp(name,"Elementonsurface")==0) return ElementonsurfaceEnum; else if (strcmp(name,"Fill")==0) return FillEnum; else if (strcmp(name,"FractionIncrement")==0) return FractionIncrementEnum; @@ -203,8 +206,6 @@ else if (strcmp(name,"GroundinglineMeltingRate")==0) return GroundinglineMeltingRateEnum; else if (strcmp(name,"Misfit")==0) return MisfitEnum; - else if (strcmp(name,"NodeOnBed")==0) return NodeOnBedEnum; - else if (strcmp(name,"NodeOnIceSheet")==0) return NodeOnIceSheetEnum; - else if (strcmp(name,"NodeOnIceShelf")==0) return NodeOnIceShelfEnum; - else if (strcmp(name,"NodeOnSurface")==0) return NodeOnSurfaceEnum; + else if (strcmp(name,"Nodeonbed")==0) return NodeonbedEnum; + else if (strcmp(name,"Nodeonsurface")==0) return NodeonsurfaceEnum; else if (strcmp(name,"NumberNodeToElementConnectivity")==0) return NumberNodeToElementConnectivityEnum; else if (strcmp(name,"PenaltyOffset")==0) return PenaltyOffsetEnum; @@ -361,5 +362,4 @@ else if (strcmp(name,"NumControlType")==0) return NumControlTypeEnum; else if (strcmp(name,"Spcvy")==0) return SpcvyEnum; - else if (strcmp(name,"NodeOnWater")==0) return NodeOnWaterEnum; else if (strcmp(name,"Y")==0) return YEnum; else if (strcmp(name,"ElementsType")==0) return ElementsTypeEnum; @@ -370,6 +370,8 @@ else if (strcmp(name,"Spcvz")==0) return SpcvzEnum; else if (strcmp(name,"NumberOfNodes2D")==0) return NumberOfNodes2DEnum; - else if (strcmp(name,"NodeOnStokes")==0) return NodeOnStokesEnum; - else if (strcmp(name,"NodeOnHutter")==0) return NodeOnHutterEnum; + else if (strcmp(name,"Nodeonstokes")==0) return NodeonstokesEnum; + else if (strcmp(name,"Nodeonhutter")==0) return NodeonhutterEnum; + else if (strcmp(name,"Nodeonpattyn")==0) return NodeonpattynEnum; + else if (strcmp(name,"Nodeonmacayeal")==0) return NodeonmacayealEnum; else if (strcmp(name,"Z")==0) return ZEnum; else if (strcmp(name,"Spcthickness")==0) return SpcthicknessEnum; @@ -377,10 +379,8 @@ else if (strcmp(name,"Spcvx")==0) return SpcvxEnum; else if (strcmp(name,"Upperelements")==0) return UpperelementsEnum; - else if (strcmp(name,"NodeOnPattyn")==0) return NodeOnPattynEnum; else if (strcmp(name,"Edges")==0) return EdgesEnum; else if (strcmp(name,"Elements2D")==0) return Elements2DEnum; else if (strcmp(name,"X")==0) return XEnum; else if (strcmp(name,"NumCmResponses")==0) return NumCmResponsesEnum; - else if (strcmp(name,"NodeOnMacayeal")==0) return NodeOnMacayealEnum; else if (strcmp(name,"Elementconnectivity")==0) return ElementconnectivityEnum; else if (strcmp(name,"ArtificialDiffusivity")==0) return ArtificialDiffusivityEnum; Index: /issm/trunk/src/c/objects/Elements/Penta.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/Penta.cpp (revision 9640) +++ /issm/trunk/src/c/objects/Elements/Penta.cpp (revision 9641) @@ -6575,5 +6575,5 @@ bool onbed; - inputs->GetParameterValue(&onbed,ElementOnBedEnum); + inputs->GetParameterValue(&onbed,ElementonbedEnum); return onbed; } @@ -6613,5 +6613,5 @@ bool onshelf; - inputs->GetParameterValue(&onshelf,ElementOnIceShelfEnum); + inputs->GetParameterValue(&onshelf,MaskElementonfloatingiceEnum); return onshelf; } @@ -6651,5 +6651,5 @@ bool onsurface; - inputs->GetParameterValue(&onsurface,ElementOnSurfaceEnum); + inputs->GetParameterValue(&onsurface,ElementonsurfaceEnum); return onsurface; } @@ -6659,5 +6659,5 @@ bool onwater; - inputs->GetParameterValue(&onwater,ElementOnWaterEnum); + inputs->GetParameterValue(&onwater,MaskElementonwaterEnum); return onwater; } @@ -7585,8 +7585,8 @@ if(*(iomodel->Data(ElementsTypeEnum)+index)==PattynStokesApproximationEnum){ /*Create VzPattyn and VzStokes Enums*/ - if(iomodel->Data(VzEnum) && iomodel->Data(NodeOnStokesEnum)){ - 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]; + if(iomodel->Data(VzEnum) && iomodel->Data(NodeonstokesEnum)){ + 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]; this->inputs->AddInput(new PentaVertexInput(VzStokesEnum,nodeinputs)); - 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]); + 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]); this->inputs->AddInput(new PentaVertexInput(VzPattynEnum,nodeinputs)); } @@ -7599,8 +7599,8 @@ if(*(iomodel->Data(ElementsTypeEnum)+index)==MacAyealStokesApproximationEnum){ /*Create VzMacAyeal and VzStokes Enums*/ - if(iomodel->Data(VzEnum) && iomodel->Data(NodeOnStokesEnum)){ - 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]; + if(iomodel->Data(VzEnum) && iomodel->Data(NodeonstokesEnum)){ + 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]; this->inputs->AddInput(new PentaVertexInput(VzStokesEnum,nodeinputs)); - 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]); + 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]); this->inputs->AddInput(new PentaVertexInput(VzMacAyealEnum,nodeinputs)); } Index: /issm/trunk/src/c/objects/Elements/Tria.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/Tria.cpp (revision 9640) +++ /issm/trunk/src/c/objects/Elements/Tria.cpp (revision 9641) @@ -4001,5 +4001,5 @@ bool onbed; - inputs->GetParameterValue(&onbed,ElementOnBedEnum); + inputs->GetParameterValue(&onbed,ElementonbedEnum); return onbed; } @@ -4009,5 +4009,5 @@ bool shelf; - inputs->GetParameterValue(&shelf,ElementOnIceShelfEnum); + inputs->GetParameterValue(&shelf,MaskElementonfloatingiceEnum); return shelf; } @@ -4047,5 +4047,5 @@ bool water; - inputs->GetParameterValue(&water,ElementOnWaterEnum); + inputs->GetParameterValue(&water,MaskElementonwaterEnum); return water; } @@ -4603,10 +4603,10 @@ if(b[i]==ba[i]){ - nodes[i]->inputs->AddInput(new BoolInput(NodeOnIceShelfEnum,false)); - nodes[i]->inputs->AddInput(new BoolInput(NodeOnIceSheetEnum,true)); + nodes[i]->inputs->AddInput(new BoolInput(MaskVertexonfloatingiceEnum,false)); + nodes[i]->inputs->AddInput(new BoolInput(MaskVertexongroundediceEnum,true)); } else{ - nodes[i]->inputs->AddInput(new BoolInput(NodeOnIceShelfEnum,true)); - nodes[i]->inputs->AddInput(new BoolInput(NodeOnIceSheetEnum,false)); + nodes[i]->inputs->AddInput(new BoolInput(MaskVertexonfloatingiceEnum,true)); + nodes[i]->inputs->AddInput(new BoolInput(MaskVertexongroundediceEnum,false)); } @@ -4623,5 +4623,5 @@ } if(!this->IsOnShelf() && elementonshelf==true)swap=1; - this->inputs->AddInput(new BoolInput(ElementOnIceShelfEnum,elementonshelf)); + this->inputs->AddInput(new BoolInput(MaskElementonfloatingiceEnum,elementonshelf)); /*If this element just became ungrounded, set its basal melting rate at 50 m/yr:*/ @@ -5348,6 +5348,6 @@ for(i=0;i<3;i++){ if(b[i]<=ba[i]){ //the = will lead to oscillations. - nodes[i]->inputs->AddInput(new BoolInput(NodeOnIceShelfEnum,false)); - nodes[i]->inputs->AddInput(new BoolInput(NodeOnIceSheetEnum,true)); + nodes[i]->inputs->AddInput(new BoolInput(MaskVertexonfloatingiceEnum,false)); + nodes[i]->inputs->AddInput(new BoolInput(MaskVertexongroundediceEnum,true)); if(shelfstatus[i]){ flipped++; @@ -5357,6 +5357,6 @@ } else{ - nodes[i]->inputs->AddInput(new BoolInput(NodeOnIceShelfEnum,true)); - nodes[i]->inputs->AddInput(new BoolInput(NodeOnIceSheetEnum,false)); + nodes[i]->inputs->AddInput(new BoolInput(MaskVertexonfloatingiceEnum,true)); + nodes[i]->inputs->AddInput(new BoolInput(MaskVertexongroundediceEnum,false)); if(!shelfstatus[i]){ flipped++; @@ -5375,5 +5375,5 @@ } } - this->inputs->AddInput(new BoolInput(ElementOnIceShelfEnum,elementonshelf)); + this->inputs->AddInput(new BoolInput(MaskElementonfloatingiceEnum,elementonshelf)); return flipped; @@ -5383,5 +5383,5 @@ void Tria::UpdateShelfFlags(double* new_shelf_nodes){ - /*go through vertices, and update the status of NodeOnIceShelfEnum and NodeOnIceSheetEnum flags: */ + /*go through vertices, and update the status of MaskVertexonfloatingiceEnum and MaskVertexongroundediceEnum flags: */ bool flag; int i; @@ -5398,6 +5398,6 @@ for(i=0;i<3;i++){ flag=(bool)new_shelf_nodes[nodes[i]->Sid()]; - nodes[i]->inputs->AddInput(new BoolInput(NodeOnIceShelfEnum,flag)); - nodes[i]->inputs->AddInput(new BoolInput(NodeOnIceSheetEnum,!flag)); + nodes[i]->inputs->AddInput(new BoolInput(MaskVertexonfloatingiceEnum,flag)); + nodes[i]->inputs->AddInput(new BoolInput(MaskVertexongroundediceEnum,!flag)); } } Index: /issm/trunk/src/c/objects/Loads/Riftfront.cpp =================================================================== --- /issm/trunk/src/c/objects/Loads/Riftfront.cpp (revision 9640) +++ /issm/trunk/src/c/objects/Loads/Riftfront.cpp (revision 9641) @@ -102,5 +102,5 @@ riftfront_friction=*(iomodel->Data(RiftsRiftstructEnum)+RIFTINFOSIZE*i+8); riftfront_fractionincrement=*(iomodel->Data(RiftsRiftstructEnum)+RIFTINFOSIZE*i+10); - riftfront_shelf=(bool)iomodel->Data(NodeOnIceShelfEnum)[node1-1]; + riftfront_shelf=(bool)iomodel->Data(MaskVertexonfloatingiceEnum)[node1-1]; this->inputs->AddInput(new IntInput(TypeEnum,riftfront_type)); Index: /issm/trunk/src/c/objects/Node.cpp =================================================================== --- /issm/trunk/src/c/objects/Node.cpp (revision 9640) +++ /issm/trunk/src/c/objects/Node.cpp (revision 9641) @@ -54,8 +54,8 @@ //intialize inputs, and add as many inputs per element as requested: this->inputs=new Inputs(); - if (iomodel->Data(NodeOnBedEnum)) this->inputs->AddInput(new BoolInput(NodeOnBedEnum,(IssmBool)iomodel->Data(NodeOnBedEnum)[io_index])); - if (iomodel->Data(NodeOnSurfaceEnum)) this->inputs->AddInput(new BoolInput(NodeOnSurfaceEnum,(IssmBool)iomodel->Data(NodeOnSurfaceEnum)[io_index])); - if (iomodel->Data(NodeOnIceShelfEnum)) this->inputs->AddInput(new BoolInput(NodeOnIceShelfEnum,(IssmBool)iomodel->Data(NodeOnIceShelfEnum)[io_index])); - if (iomodel->Data(NodeOnIceSheetEnum)) this->inputs->AddInput(new BoolInput(NodeOnIceSheetEnum,(IssmBool)iomodel->Data(NodeOnIceSheetEnum)[io_index])); + if (iomodel->Data(NodeonbedEnum)) this->inputs->AddInput(new BoolInput(NodeonbedEnum,(IssmBool)iomodel->Data(NodeonbedEnum)[io_index])); + if (iomodel->Data(NodeonsurfaceEnum)) this->inputs->AddInput(new BoolInput(NodeonsurfaceEnum,(IssmBool)iomodel->Data(NodeonsurfaceEnum)[io_index])); + if (iomodel->Data(MaskVertexonfloatingiceEnum)) this->inputs->AddInput(new BoolInput(MaskVertexonfloatingiceEnum,(IssmBool)iomodel->Data(MaskVertexonfloatingiceEnum)[io_index])); + if (iomodel->Data(MaskVertexongroundediceEnum)) this->inputs->AddInput(new BoolInput(MaskVertexongroundediceEnum,(IssmBool)iomodel->Data(MaskVertexongroundediceEnum)[io_index])); if (iomodel->numbernodetoelementconnectivity) this->inputs->AddInput(new IntInput(NumberNodeToElementConnectivityEnum,(IssmInt)iomodel->numbernodetoelementconnectivity[io_index])); if (analysis_type==DiagnosticHorizAnalysisEnum) this->inputs->AddInput(new IntInput(ApproximationEnum,(IssmInt)iomodel->Data(VerticesTypeEnum)[io_index])); @@ -64,6 +64,6 @@ /*spc all nodes on water*/ - if (!iomodel->Data(NodeOnWaterEnum)) _error_("iomodel->nodeonwater is NULL"); - if (iomodel->Data(NodeOnWaterEnum)[io_index]){ + if (!iomodel->Data(MaskVertexonwaterEnum)) _error_("iomodel->nodeonwater is NULL"); + if (iomodel->Data(MaskVertexonwaterEnum)[io_index]){ for(k=1;k<=gsize;k++){ this->FreezeDof(k); @@ -75,16 +75,16 @@ if (dim==3){ /*We have a 3d mesh, we may have collapsed elements, hence dead nodes. Freeze them out: */ - if (!iomodel->Data(NodeOnBedEnum)) _error_("iomodel->nodeonbed is NULL"); + if (!iomodel->Data(NodeonbedEnum)) _error_("iomodel->nodeonbed is NULL"); if (!iomodel->Data(VerticesTypeEnum)) _error_("iomodel->vertices_type is NULL"); - if (iomodel->Data(VerticesTypeEnum)[io_index]==MacAyealApproximationEnum && !iomodel->Data(NodeOnBedEnum)[io_index]){ + if (iomodel->Data(VerticesTypeEnum)[io_index]==MacAyealApproximationEnum && !iomodel->Data(NodeonbedEnum)[io_index]){ for(k=1;k<=gsize;k++) this->FreezeDof(k); } - if (iomodel->Data(VerticesTypeEnum)[io_index]==MacAyealPattynApproximationEnum && iomodel->Data(NodeOnMacayealEnum)[io_index]){ - if(!iomodel->Data(NodeOnBedEnum)[io_index]){ + if (iomodel->Data(VerticesTypeEnum)[io_index]==MacAyealPattynApproximationEnum && iomodel->Data(NodeonmacayealEnum)[io_index]){ + if(!iomodel->Data(NodeonbedEnum)[io_index]){ for(k=1;k<=gsize;k++) this->FreezeDof(k); } } - if (iomodel->Data(VerticesTypeEnum)[io_index]==MacAyealStokesApproximationEnum && iomodel->Data(NodeOnMacayealEnum)[io_index]){ - if(!iomodel->Data(NodeOnBedEnum)[io_index]){ + if (iomodel->Data(VerticesTypeEnum)[io_index]==MacAyealStokesApproximationEnum && iomodel->Data(NodeonmacayealEnum)[io_index]){ + if(!iomodel->Data(NodeonbedEnum)[io_index]){ for(k=1;k<=2;k++) this->FreezeDof(k); } @@ -92,6 +92,6 @@ } /*spc all nodes on hutter*/ - if (!iomodel->Data(NodeOnHutterEnum)) _error_("iomodel->nodeonhutter is NULL"); - if (iomodel->Data(NodeOnHutterEnum)[io_index]){ + if (!iomodel->Data(NodeonhutterEnum)) _error_("iomodel->nodeonhutter is NULL"); + if (iomodel->Data(NodeonhutterEnum)[io_index]){ for(k=1;k<=gsize;k++){ this->FreezeDof(k); @@ -104,6 +104,6 @@ if (analysis_type==DiagnosticHutterAnalysisEnum){ /*Constrain all nodes that are not Hutter*/ - if (!iomodel->Data(NodeOnHutterEnum)) _error_("iomodel->nodeonhutter is NULL"); - if (!iomodel->Data(NodeOnHutterEnum)[io_index]){ + if (!iomodel->Data(NodeonhutterEnum)) _error_("iomodel->nodeonhutter is NULL"); + if (!iomodel->Data(NodeonhutterEnum)[io_index]){ for(k=1;k<=gsize;k++){ this->FreezeDof(k); @@ -122,6 +122,6 @@ if (dim==3){ /*On a 3d mesh, we may have collapsed elements, hence dead nodes. Freeze them out: */ - _assert_(iomodel->Data(NodeOnBedEnum)); - if (!iomodel->Data(NodeOnBedEnum)[io_index]){ + _assert_(iomodel->Data(NodeonbedEnum)); + if (!iomodel->Data(NodeonbedEnum)[io_index]){ for(k=1;k<=gsize;k++){ this->FreezeDof(k); @@ -739,5 +739,5 @@ /*recover parameters: */ - inputs->GetParameterValue(&onbed,NodeOnBedEnum); + inputs->GetParameterValue(&onbed,NodeonbedEnum); return onbed; @@ -750,5 +750,5 @@ /*recover parameters: */ - inputs->GetParameterValue(&onsheet,NodeOnIceSheetEnum); + inputs->GetParameterValue(&onsheet,MaskVertexongroundediceEnum); return onsheet; @@ -761,5 +761,5 @@ /*recover parameters: */ - inputs->GetParameterValue(&onshelf,NodeOnIceShelfEnum); + inputs->GetParameterValue(&onshelf,MaskVertexonfloatingiceEnum); return onshelf; @@ -772,5 +772,5 @@ /*recover parameters: */ - inputs->GetParameterValue(&onsurface,NodeOnSurfaceEnum); + inputs->GetParameterValue(&onsurface,NodeonsurfaceEnum); return onsurface; Index: /issm/trunk/src/c/solutions/groundinglinemigration2d_core.cpp =================================================================== --- /issm/trunk/src/c/solutions/groundinglinemigration2d_core.cpp (revision 9640) +++ /issm/trunk/src/c/solutions/groundinglinemigration2d_core.cpp (revision 9641) @@ -29,5 +29,5 @@ if(solution_type==GroundinglineMigration2DSolutionEnum){ _printf_(VerboseSolution(),"%s\n"," saving results\n"); - InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ElementOnIceShelfEnum); + InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,MaskElementonfloatingiceEnum); InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ThicknessEnum); InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SurfaceEnum); Index: /issm/trunk/src/c/solutions/transient_core.cpp =================================================================== --- /issm/trunk/src/c/solutions/transient_core.cpp (revision 9640) +++ /issm/trunk/src/c/solutions/transient_core.cpp (revision 9641) @@ -96,5 +96,5 @@ InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BasalforcingsMeltingRateEnum,step,time); InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SurfaceforcingsMassBalanceEnum,step,time); - InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ElementOnIceShelfEnum,step,time); + InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,MaskElementonfloatingiceEnum,step,time); /*unload results*/ Index: /issm/trunk/src/m/classes/model/model.m =================================================================== --- /issm/trunk/src/m/classes/model/model.m (revision 9640) +++ /issm/trunk/src/m/classes/model/model.m (revision 9641) @@ -28,4 +28,5 @@ groundingline = modelfield('default',0,'marshall',true); materials = modelfield('default',0,'marshall',true); + mask = modelfield('default',0,'marshall',true); %FIXME: all other fields should belong to other classes @@ -108,10 +109,4 @@ %Geometrical parameters - elementoniceshelf = modelfield('default',NaN,'marshall',true,'format','BooleanMat','mattype',2); - elementonicesheet = modelfield('default',NaN,'marshall',true,'format','BooleanMat','mattype',2); - elementonwater = modelfield('default',NaN,'marshall',true,'format','BooleanMat','mattype',2); - nodeoniceshelf = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); - nodeonicesheet = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); - nodeonwater = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); surface = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); thickness = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',1); @@ -324,5 +319,4 @@ disp(sprintf('%s%s%s',' Materials: type ''',inputname(1),'.mat'' to display')); disp(sprintf('%s%s%s',' Parameters: type ''',inputname(1),'.par'' to display')); - disp(sprintf('%s%s%s',' ExpPar: type ''',inputname(1),'.exppar'' to display')); disp(sprintf(' Solution parameters: %s')); disp(sprintf('%s%s%s',' Qmu: type ''',inputname(1),'.qmu'' to display')); @@ -407,4 +401,10 @@ if isfield(structmd,'rheology_B'), md.materials.rheology_B=structmd.B; end if isfield(structmd,'rheology_n'), md.materials.rheology_n=structmd.n; end + if isfield(structmd,'elementoniceshelf'), md.mask.elementonfloatingice=structmd.elementoniceshelf; end + if isfield(structmd,'elementonicesheet'), md.mask.elementongroundedice=structmd.elementonicesheet; end + if isfield(structmd,'elementonwater'), md.mask.elementonwater=structmd.elementonwater; end + if isfield(structmd,'nodeoniceshelf'), md.mask.vertexonfloatingice=structmd.nodeoniceshelf; end + if isfield(structmd,'nodeonicesheet'), md.mask.vertexongroundedice=structmd.nodeonicesheet; end + if isfield(structmd,'nodeonwater'), md.mask.vertexonwater=structmd.nodeonwater; end %Field changes @@ -526,4 +526,5 @@ md.groundingline=groundingline; md.materials=materials; + md.mask=mask; @@ -663,5 +664,4 @@ if(strcmp(index1.subs,'mat')), displaymaterials(md);return; end if(strcmp(index1.subs,'par')), displayparameters(md);return; end - if(strcmp(index1.subs,'exppar')), displayexppar(md);return; end if(strcmp(index1.subs,'res')), displayresults(md);return; end if(strcmp(index1.subs,'obs')), displayobservations(md);return; end Index: /issm/trunk/src/m/model/BasinConstrain.m =================================================================== --- /issm/trunk/src/m/model/BasinConstrain.m (revision 9640) +++ /issm/trunk/src/m/model/BasinConstrain.m (revision 9641) @@ -18,9 +18,9 @@ if isempty(domain), elementondomain=zeros(md.numberofelements,1); - nodeondomain=zeros(md.numberofnodes,1); + vertexondomain=zeros(md.numberofnodes,1); invert=0; elseif strcmpi(domain,'all') elementondomain=ones(md.numberofelements,1); - nodeondomain=ones(md.numberofnodes,1); + vertexondomain=ones(md.numberofnodes,1); invert=0; else @@ -33,8 +33,8 @@ end %ok, flag elements and nodes - [nodeondomain elementondomain]=ContourToMesh(md.elements(:,1:3),md.x,md.y,domain,'element and node',2); + [vertexondomain elementondomain]=ContourToMesh(md.elements(:,1:3),md.x,md.y,domain,'element and node',2); end if invert, - nodeondomain=~nodeondomain; + vertexondomain=~vertexondomain; elementondomain=~elementondomain; end @@ -44,14 +44,14 @@ %list of elements and nodes not on domain -nodenotondomain=find(~nodeondomain); +vertexnotondomain=find(~vertexondomain); elementnotondomain=find(~elementondomain); %all elements outside the constraint domain are equivalent to water. all nodes outside are spc'd. -md.spcvx(nodenotondomain)=md.vx_obs(nodenotondomain); -md.spcvy(nodenotondomain)=md.vy_obs(nodenotondomain); -md.elementonwater(elementnotondomain)=1; +md.spcvx(vertexnotondomain)=md.vx_obs(vertexnotondomain); +md.spcvy(vertexnotondomain)=md.vy_obs(vertexnotondomain); +md.mask.elementonwater(elementnotondomain)=1; %now, make sure all elements on water have nodes that are spc'd, otherwise, we'll get a singular problem. -pos=find(~md.elementonwater); +pos=find(~md.mask.elementonwater); numpos=unique(md.elements(pos,:)); nodes=setdiff(1:1:md.numberofnodes,numpos); Index: /issm/trunk/src/m/model/BasinConstrainShelf.m =================================================================== --- /issm/trunk/src/m/model/BasinConstrainShelf.m (revision 9640) +++ /issm/trunk/src/m/model/BasinConstrainShelf.m (revision 9641) @@ -18,9 +18,9 @@ if isempty(domain), elementondomain=zeros(md.numberofelements,1); - nodeondomain=zeros(md.numberofnodes,1); + vertexondomain=zeros(md.numberofnodes,1); invert=0; elseif strcmpi(domain,'all') elementondomain=ones(md.numberofelements,1); - nodeondomain=ones(md.numberofnodes,1); + vertexondomain=ones(md.numberofnodes,1); invert=0; else @@ -33,8 +33,8 @@ end %ok, flag elements and nodes - [nodeondomain elementondomain]=ContourToMesh(md.elements(:,1:3),md.x,md.y,domain,'element and node',2); + [vertexondomain elementondomain]=ContourToMesh(md.elements(:,1:3),md.x,md.y,domain,'element and node',2); end if invert, - nodeondomain=~nodeondomain; + vertexondomain=~vertexondomain; elementondomain=~elementondomain; end @@ -44,14 +44,14 @@ %list of elements and nodes not on domain -nodenotondomain=find(~nodeondomain); +vertexnotondomain=find(~vertexondomain); elementnotondomain=find(~elementondomain); %all elements outside the constraint domain are equivalent to water. all nodes outside are spc'd. -md.spcvx(nodenotondomain)=md.vx_obs(nodenotondomain); -md.spcvy(nodenotondomain)=md.vy_obs(nodenotondomain); -md.elementonwater(elementnotondomain)=1; +md.spcvx(vertexnotondomain)=md.vx_obs(vertexnotondomain); +md.spcvy(vertexnotondomain)=md.vy_obs(vertexnotondomain); +md.mask.elementonwater(elementnotondomain)=1; %now, make sure all elements on water have nodes that are spc'd, otherwise, we'll get a singular problem. -pos=find(~md.elementonwater); +pos=find(~md.mask.elementonwater); numpos=unique(md.elements(pos,:)); nodes=setdiff(1:1:md.numberofnodes,numpos); @@ -66,6 +66,6 @@ md.spcvy(pos)=md.vy_obs(pos); -%iceshelves: any node on icesheet is spc'd -pos=find(md.nodeonicesheet); +%iceshelves: any vertex on floating ice is spc'd +pos=find(md.mask.vertexongroundedice); md.spcvx(pos)=md.vx_obs(pos); md.spcvy(pos)=md.vy_obs(pos); Index: /issm/trunk/src/m/model/MeltingGroundingLines.m =================================================================== --- /issm/trunk/src/m/model/MeltingGroundingLines.m (revision 9640) +++ /issm/trunk/src/m/model/MeltingGroundingLines.m (revision 9641) @@ -7,6 +7,6 @@ %get nodes on ice sheet and on ice shelf -pos_shelf=find(~md.nodeonicesheet); -pos_GL=intersect(unique(md.elements(find(md.elementonicesheet),:)),unique(md.elements(find(md.elementoniceshelf),:))); +pos_shelf=find(~md.mask.vertexongroundedice); +pos_GL=intersect(unique(md.elements(find(md.mask.elementongroundedice),:)),unique(md.elements(find(md.mask.elementonfloatingice),:))); for i=1:length(pos_shelf) Index: /issm/trunk/src/m/model/ThicknessCorrection.m =================================================================== --- /issm/trunk/src/m/model/ThicknessCorrection.m (revision 9640) +++ /issm/trunk/src/m/model/ThicknessCorrection.m (revision 9641) @@ -23,11 +23,11 @@ %get nodes on ice sheet and on ice shelf -pos_shelf=find(~md.nodeonicesheet); -pos_GL=intersect(unique(md.elements(find(md.elementonicesheet),:)),unique(md.elements(find(md.elementoniceshelf),:))); +pos_shelf=find(~md.mask.vertexongroundedice); +pos_GL=intersect(unique(md.elements(find(md.mask.elementongroundedice),:)),unique(md.elements(find(md.mask.elementonfloatingice),:))); debug=(length(pos_shelf)>50000); %check that there is a GL if isempty(pos_GL) - error('ThicknessCorrection error message: no grounding line has been detected. Check the model geography'); + error('ThicknessCorrection error message: no grounding line has been detected. Check the model mask'); end Index: /issm/trunk/src/m/model/collapse.m =================================================================== --- /issm/trunk/src/m/model/collapse.m (revision 9640) +++ /issm/trunk/src/m/model/collapse.m (revision 9641) @@ -88,8 +88,8 @@ md.bed=project2d(md,md.bed,1); md.nodeonboundary=project2d(md,md.nodeonboundary,1); -md.elementoniceshelf=project2d(md,md.elementoniceshelf,1); -md.nodeoniceshelf=project2d(md,md.nodeoniceshelf,1); -md.elementonicesheet=project2d(md,md.elementonicesheet,1); -md.nodeonicesheet=project2d(md,md.nodeonicesheet,1); +md.mask.elementonfloatingice=project2d(md,md.mask.elementonfloatingice,1); +md.mask.vertexonfloatingice=project2d(md,md.mask.vertexonfloatingice,1); +md.mask.elementongroundedice=project2d(md,md.mask.elementongroundedice,1); +md.mask.vertexongroundedice=project2d(md,md.mask.vertexongroundedice,1); %Initialize with the 2d mesh Index: /issm/trunk/src/m/model/contourenvelope.m =================================================================== --- /issm/trunk/src/m/model/contourenvelope.m (revision 9640) +++ /issm/trunk/src/m/model/contourenvelope.m (revision 9641) @@ -7,5 +7,5 @@ % Example: % segments=contourenvelope(md,'Stream.exp'); -% segments=contourenvelope(md,md.elementoniceshelf) +% segments=contourenvelope(md,md.mask.elementonfloatingice) % segments=contourenvelope(md); Index: /issm/trunk/src/m/model/display/displaybc.m =================================================================== --- /issm/trunk/src/m/model/display/displaybc.m (revision 9640) +++ /issm/trunk/src/m/model/display/displaybc.m (revision 9641) @@ -11,11 +11,4 @@ disp(sprintf(' Boundary conditions:')); -disp(sprintf('\n geography:')); -fielddisplay(md,'nodeonboundary','node on boundary flags list'); -fielddisplay(md,'elementoniceshelf','element on ice shelf flags list'); -fielddisplay(md,'nodeoniceshelf','node on ice shelf flags list'); -fielddisplay(md,'elementonicesheet','element on ice sheet flags list'); -fielddisplay(md,'nodeonicesheet','node on ice sheet flags list'); - disp(sprintf('\n diagnostic:')); fielddisplay(md,'spcvx','x-axis velocity constraint (NaN means no constraint)'); Index: sm/trunk/src/m/model/display/displayexppar.m =================================================================== --- /issm/trunk/src/m/model/display/displayexppar.m (revision 9640) +++ (revision ) @@ -1,18 +1,0 @@ -function displayoutlines(md); -%DISPLAYOUTLINES - display outline information -% -% To avoid clobbering display.m with every field from model md, -% we create this routine that displays outline information from model md, -% only if requested. -% -% Usage: -% displayoutline(md) - -disp(sprintf('\n Outlines:')); -fielddisplay(md,'domainoutline','domain outline Argus file'); -fielddisplay(md,'riftoutline','rift outline Argus file'); -fielddisplay(md,'iceshelfoutline','ice shelf outline Argus file'); -fielddisplay(md,'icesheetoutline','ice sheet outline Argus file'); - -disp(sprintf('\n Model files:')); -fielddisplay(md,'parameterfile','parameter file content'); Index: /issm/trunk/src/m/model/extrude.m =================================================================== --- /issm/trunk/src/m/model/extrude.m (revision 9640) +++ /issm/trunk/src/m/model/extrude.m (revision 9641) @@ -207,10 +207,10 @@ md.bathymetry=project3d(md,'vector',md.bathymetry,'type','node'); md.nodeonboundary=project3d(md,'vector',md.nodeonboundary,'type','node'); -md.elementoniceshelf=project3d(md,'vector',md.elementoniceshelf,'type','element'); -md.nodeoniceshelf=project3d(md,'vector',md.nodeoniceshelf,'type','node'); -md.elementonicesheet=project3d(md,'vector',md.elementonicesheet,'type','element'); -md.nodeonicesheet=project3d(md,'vector',md.nodeonicesheet,'type','node'); -md.elementonwater=project3d(md,'vector',md.elementonwater,'type','element'); -md.nodeonwater=project3d(md,'vector',md.nodeonwater,'type','node'); +md.mask.elementonfloatingice=project3d(md,'vector',md.mask.elementonfloatingice,'type','element'); +md.mask.vertexonfloatingice=project3d(md,'vector',md.mask.vertexonfloatingice,'type','node'); +md.mask.elementongroundedice=project3d(md,'vector',md.mask.elementongroundedice,'type','element'); +md.mask.vertexongroundedice=project3d(md,'vector',md.mask.vertexongroundedice,'type','node'); +md.mask.elementonwater=project3d(md,'vector',md.mask.elementonwater,'type','element'); +md.mask.vertexonwater=project3d(md,'vector',md.mask.vertexonwater,'type','node'); if ~isnan(md.weights),md.weights=project3d(md,'vector',md.weights,'type','node');end; Index: sm/trunk/src/m/model/geography.m =================================================================== --- /issm/trunk/src/m/model/geography.m (revision 9640) +++ (revision ) @@ -1,51 +1,0 @@ -function md=geography(md,iceshelfname,icesheetname) -%GEOGRAPHY - establish boundaries between grounded and floating ice. -% -% By default, ice is considered grounded. The contour iceshelfname defines nodes -% for which ice is floating. The contour icesheetname defines nodes inside an iceshelf, -% that are grounded (ie: ice rises, islands, etc ...) -% All input files are in the Argus format (extension .exp). -% -% Usage: -% md=geography(md,iceshelfname,icesheetname) -% -% Examples: -% md=geography(md,'all',''); -% md=geography(md,'Iceshelves.exp','Islands.exp'); - -%some checks on list of arguments -if ((nargin~=3) | (nargout~=1)), - help geography - error('geography error message'); -end - -%Get assigned fields -x=md.x; -y=md.y; -elements=md.elements; - -%Assign elementoniceshelf, elementonicesheet, nodeonicesheet and nodeoniceshelf. Only change at your own peril! This is synchronized heavily with the GroundingLineMigration module. {{{1 -elementoniceshelf=FlagElements(md,iceshelfname); -elementonicesheet=FlagElements(md,icesheetname); - -%Because icesheet nodes and elements can be included into an iceshelf, we need to update. Remember, all the previous -%arrays come from domain outlines that can intersect one another: -elementoniceshelf=double((elementoniceshelf & ~elementonicesheet)); -elementonicesheet=double(~elementoniceshelf); - -%the order here is important. we choose nodeonicesheet as default on the grounding line. -nodeoniceshelf=zeros(md.numberofnodes,1); -nodeonicesheet=zeros(md.numberofnodes,1); -nodeonicesheet(md.elements(find(elementonicesheet),:))=1; -nodeoniceshelf(find(~nodeonicesheet))=1; -%}}} - -%Return: -md.elementoniceshelf=elementoniceshelf; -md.nodeoniceshelf=nodeoniceshelf; - -md.elementonicesheet=elementonicesheet; -md.nodeonicesheet=nodeonicesheet; - -md.nodeonwater=zeros(md.numberofnodes,1); -md.elementonwater=zeros(md.numberofelements,1); Index: sm/trunk/src/m/model/geography2.m =================================================================== --- /issm/trunk/src/m/model/geography2.m (revision 9640) +++ (revision ) @@ -1,150 +1,0 @@ -function md=geography2(md,landname,iceshelfname,icesheetname) -%GEOGRAPHY2 - establish land, ice sheet and ice shelf areas in a domains. -% -% Usage: -% md=geography2(md,landname,iceshelfname,icesheetname) -% -% Examples: -% md=geography2(md,'LandName.exp','Iceshelves.exp','Islands.exp'); - -%Get assigned fields -x=md.x; -y=md.y; -elements=md.elements; - -%recover elements and nodes on land. -if ischar(landname), - [nodeonland,elementonland]=ContourToMesh(elements,x,y,landname,'element and node',2); -elseif isfloat(landname), - if size(landname,1)~=md.numberofelements, - error('Landname for area must be of same size as number of elements in model'); - end - elementonland=landname; - nodeonland=zeros(md.numberofnodes,1); - nodeonland(md.elements(find(elementonland),:))=1; -else - error('Invalid area option option'); -end - -%Now, build the connectivity tables for this mesh. -if size(md.nodeconnectivity,1)~=md.numberofnodes, - md.nodeconnectivity=NodeConnectivity(md.elements,md.numberofnodes); -end -if size(md.elementconnectivity,1)~=md.numberofelements, - md.elementconnectivity=ElementConnectivity(md.elements,md.nodeconnectivity); -end - -%any element with 3 nodes on land should be on land: -elementsonwater=find(~elementonland); -wrongelements=elementsonwater(find(( nodeonland(md.elements(elementsonwater,1)) + nodeonland(md.elements(elementsonwater,2)) + nodeonland(md.elements(elementsonwater,3)) ... - )==3)); -elementonland(wrongelements)=1; - -%any element with its barycentre on land should be on land: (only if landname is an expfile) -if ischar(landname), -weights={[1;1;1],[2;1;1],[1;2;1],[1;1;2]}; - for i=1:length(weights), - xelem=x(md.elements)*weights{i}/sum(weights{i}); - yelem=y(md.elements)*weights{i}/sum(weights{i}); - end - baryonland=ContourToNodes(xelem,yelem,landname,1); - pos=find(~baryonland); elementonland(pos)=0; - pos=find(baryonland); elementonland(pos)=1; -end - -%figure out which elements on land are actually in the middle of the ocean! -pos1=find(elementonland); -connectedtoland=md.elementconnectivity(pos1,:); -pos=find(connectedtoland); connectedtoland(pos)=1-elementonland(connectedtoland(pos)); -connectedtolandsum=sum(connectedtoland,2); -waterelements=pos1(find(connectedtolandsum==3)); -elementonland(waterelements)=0; - -%figure out which elements on water are actually in the middle of the land! -pos1=find(~elementonland); -connectedtowater=md.elementconnectivity(pos1,:); -pos=find(connectedtowater); connectedtowater(pos)=elementonland(connectedtowater(pos)); -connectedtowatersum=sum(connectedtowater,2); -landelements=pos1(find(connectedtowatersum==3)); -elementonland(landelements)=1; - -%recover arrays of ice shelf nodes and elements, and ice sheet nodes and elements. -elementoniceshelf=FlagElements(md,iceshelfname); -elementonicesheet=FlagElements(md,icesheetname); - -%Because icesheet nodes and elements can be included into an iceshelf, we need to update. Remember, all the previous -%arrays come from domain outlines that can intersect one another: -nodeoniceshelf=zeros(md.numberofnodes,1); -nodeonicesheet=zeros(md.numberofnodes,1); -elementoniceshelf=double((elementoniceshelf & ~elementonicesheet)); -elementonicesheet=double(~elementoniceshelf); -nodeoniceshelf(md.elements(find(elementoniceshelf),:))=1; -nodeonicesheet(md.elements(find(elementonicesheet),:))=1; - -%now correct, so that none of the iceshelf and icesheet elements and nodes are in the water. -pos=find(~elementonland); -elementoniceshelf(pos)=0; -elementonicesheet(pos)=0; - -pos=find(~nodeonland); -nodeoniceshelf(pos)=0; -nodeonicesheet(pos)=0; - -%create nodeonwater and elementonwater: -nodeonwater=double(~nodeonland); -elementonwater=double(~elementonland); - -%correct for islands: -nodeoniceshelf=double(nodeoniceshelf & ~nodeonicesheet); -elementoniceshelf=double(elementoniceshelf & ~elementonicesheet); - -%now, icesheets are everything except iceshelves and water -nodeonicesheet=double(~nodeoniceshelf & ~nodeonwater); -elementonicesheet=double(~elementoniceshelf & ~elementonwater); - -%Deal with segments on neumann: - -%Get current connectivity -elementconnectivity=md.elementconnectivity; - -%put 0 for elements on water -pos=find(elementconnectivity); -elementconnectivity(pos)=elementconnectivity(pos).*(~elementonwater(elementconnectivity(pos))); - -%put line of ones for elements on water -pos=find(elementonwater); -elementconnectivity(pos,:)=1;% line of ones for elements on water so they won't be considered - -%resort lines (zeros must be at the last column for findsegments) -elementconnectivity=sort(elementconnectivity,2,'descend'); - -%call findsegments to build segment using THIS conectivity -md.segments=findsegments(md,'elementconnectivity',elementconnectivity); - -%some final checks: -%check that no node thinks it's on an ice shelf or ice sheet, and lies actually in the middle of the water. -nodesgrounded=find(~nodeonwater); -lengthconnectivity=size(md.nodeconnectivity,2); -groundedcounters=md.nodeconnectivity(nodesgrounded,lengthconnectivity); -groundedconnectivity=md.nodeconnectivity(nodesgrounded,1:lengthconnectivity-1); -pos=find(groundedconnectivity); -groundedconnectivity(pos)=elementonwater(groundedconnectivity(pos)); -groundedsum=sum(groundedconnectivity,2); -errorflags=find(groundedsum==groundedcounters); -errornodes=nodesgrounded(errorflags); - -nodeonwater(errornodes)=1; -nodeonicesheet(errornodes)=0; -nodeoniceshelf(errornodes)=0; - -%Return: -md.nodeoniceshelf=nodeoniceshelf; -md.elementoniceshelf=elementoniceshelf; - -md.nodeonwater=nodeonwater; -md.elementonwater=elementonwater; - -md.nodeonicesheet=nodeonicesheet; -md.elementonicesheet=elementonicesheet; - -md.segmentmarkers(:)=1; Index: /issm/trunk/src/m/model/ismodelselfconsistent.m =================================================================== --- /issm/trunk/src/m/model/ismodelselfconsistent.m (revision 9640) +++ /issm/trunk/src/m/model/ismodelselfconsistent.m (revision 9641) @@ -83,5 +83,5 @@ %NO NAN {{{1 fields={'numberofelements','numberofnodes','x','y','z','friction.coefficient','friction.p','friction.q',... - 'materials.rho_ice','materials.rho_water','materials.rheology_B','elementoniceshelf','surface','thickness','bed','constants.g','settings.lowmem','nsteps','maxiter',... + 'materials.rho_ice','materials.rho_water','materials.rheology_B','mask.elementonfloatingice','surface','thickness','bed','constants.g','settings.lowmem','nsteps','maxiter',... 'eps_res','max_nonlinear_iterations','materials.rheology_n','nodeonbed','nodeonsurface','elementonbed','elementonsurface','elementconnectivity'}; checknan(md,fields); @@ -89,5 +89,5 @@ %FIELDS >= 0 {{{1 fields={'numberofelements','numberofnodes','elements','friction.coefficient','friction.p','friction.q',... - 'materials.rho_ice','materials.rho_water','materials.rheology_B','elementoniceshelf','thickness','constants.g','eps_res','max_nonlinear_iterations','eps_rel','eps_abs','nsteps','maxiter',... + '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',... 'settings.lowmem','materials.rheology_n','nodeonbed','nodeonsurface','elementonbed','elementonsurface'}; checkgreater(md,fields,0); @@ -99,5 +99,5 @@ %}}} %SIZE NUMBEROFELEMENTS {{{1 -fields={'friction.p','friction.q','elementoniceshelf','materials.rheology_n','elementonbed'}; +fields={'friction.p','friction.q','mask.elementonfloatingice','materials.rheology_n','elementonbed'}; checksize(md,fields,[md.numberofelements 1]); %}}} @@ -130,11 +130,11 @@ message(['model not consistent: model ' md.miscellaneous.name ' requesting grounding line migration, but bathymetry is absent!']); end - pos=find(md.nodeonicesheet); + pos=find(md.mask.vertexongroundedice); if any(md.bed(pos)-md.bathymetry(pos)), - message(['model not consistent: model ' md.miscellaneous.name ' bathymetry not equal to bed on icesheet!']); - end - pos=find(md.nodeoniceshelf); + message(['model not consistent: model ' md.miscellaneous.name ' bathymetry not equal to bed on grounded ice !']); + end + pos=find(md.mask.vertexonfloatingice); if any(md.bathymetry(pos)-md.bed(pos)>tolerance), - message(['model not consistent: model ' md.miscellaneous.name ' bathymetry superior to bed on iceshelf!']); + message(['model not consistent: model ' md.miscellaneous.name ' bathymetry superior to bed on floating ice !']); end @@ -209,6 +209,6 @@ message(['model not consistent: model ' md.miscellaneous.name ' control_type field should be a cell of strings']); end - if ~ismember(md.control_type,{'Dhdt' 'FrictionCoefficient' 'RheologyBbar' 'Vx' 'Vy'}); - message(['model not consistent: model ' md.miscellaneous.name ' control_type field should be ''Dhdt'' ''FrictionCoefficient'' ''RheologyBbar'' ''Vx'' ''Vy''']); + if ~ismember(md.control_type,{'Dhdt' 'FrictionCoefficient' 'MaterialsRheologyBbar' 'Vx' 'Vy'}); + message(['model not consistent: model ' md.miscellaneous.name ' control_type field should be ''Dhdt'' ''FrictionCoefficient'' ''MaterialsRheologyBbar'' ''Vx'' ''Vy''']); end @@ -435,5 +435,5 @@ % {{{2 %HUTTER ON ICESHELF WARNING - if any(md.elements_type==1 & md.elementoniceshelf), + if any(md.elements_type==1 & md.mask.elementonfloatingice), disp(sprintf('\n !!! Warning: Hutter''s model is not consistent on ice shelves !!!\n')); end Index: /issm/trunk/src/m/model/marshall.m =================================================================== --- /issm/trunk/src/m/model/marshall.m (revision 9640) +++ /issm/trunk/src/m/model/marshall.m (revision 9641) @@ -270,28 +270,4 @@ if strcmp(string,'Numberofnodes'), string='Numberofvertices'; -end - -if findstr(string,'icesheet'), - indices=findstr(string,'icesheet'); - for i=1:length(indices), - string(indices(i):(indices(i)+7))='IceSheet'; - end -end - -if findstr(string,'iceshelf'), - indices=findstr(string,'iceshelf'); - for i=1:length(indices), - string(indices(i):(indices(i)+7))='IceShelf'; - end -end - -if strncmpi(string,'elementon',9), - string(1:9)='ElementOn'; - string(10)=upper(string(10)); -end - -if strncmpi(string,'nodeon',6), - string(1:6)='NodeOn'; - string(7)=upper(string(7)); end Index: sm/trunk/src/m/model/mask.m =================================================================== --- /issm/trunk/src/m/model/mask.m (revision 9640) +++ (revision ) @@ -1,49 +1,0 @@ -function md=setmask(md,floatingicename,groundedicename) -%GEOGRAPHY - establish boundaries between grounded and floating ice. -% -% By default, ice is considered grounded. The contour floatingicename defines nodes -% for which ice is floating. The contour groundedicename defines nodes inside an floatingice, -% that are grounded (ie: ice rises, islands, etc ...) -% All input files are in the Argus format (extension .exp). -% -% Usage: -% md=setmask(md,floatingicename,groundedicename) -% -% Examples: -% md=setmask(md,'all',''); -% md=setmask(md,'Iceshelves.exp','Islands.exp'); - -%some checks on list of arguments -if ((nargin~=3) | (nargout~=1)), - help mask - error('mask error message'); -end - -%Get assigned fields -x=md.x; -y=md.y; -elements=md.elements; - -%Assign elementonfloatingice, elementongroundedice, vertexongroundedice and vertexonfloatingice. Only change at your own peril! This is synchronized heavily with the GroundingLineMigration module. {{{1 -elementonfloatingice=FlagElements(md,floatingicename); -elementongroundedice=FlagElements(md,groundedicename); - -%Because groundedice nodes and elements can be included into an floatingice, we need to update. Remember, all the previous -%arrays come from domain outlines that can intersect one another: -elementonfloatingice=double((elementonfloatingice & ~elementongroundedice)); -elementongroundedice=double(~elementonfloatingice); - -%the order here is important. we choose vertexongroundedice as default on the grounding line. -vertexonfloatingice=zeros(md.numberofnodes,1); -vertexongroundedice=zeros(md.numberofnodes,1); -vertexongroundedice(md.elements(find(elementongroundedice),:))=1; -vertexonfloatingice(find(~vertexongroundedice))=1; -%}}} - -%Return: -md.mask.elementonfloatingice=elementonfloatingice; -md.mask.vertexonfloatingice=vertexonfloatingice; -md.mask.elementongroundedice=elementongroundedice; -md.mask.vertexongroundedice=vertexongroundedice; -md.mask.vertexonwater=zeros(md.numberofnodes,1); -md.mask.elementonwater=zeros(md.numberofelements,1); Index: sm/trunk/src/m/model/mask2.m =================================================================== --- /issm/trunk/src/m/model/mask2.m (revision 9640) +++ (revision ) @@ -1,148 +1,0 @@ -function md=setmask2(md,landname,floatingicename,groundedicename) -%GEOGRAPHY2 - establish land, ice sheet and ice shelf areas in a domains. -% -% Usage: -% md=setmask2(md,landname,floatingicename,groundedicename) -% -% Examples: -% md=setmask2(md,'LandName.exp','Iceshelves.exp','Islands.exp'); - -%Get assigned fields -x=md.x; -y=md.y; -elements=md.elements; - -%recover elements and nodes on land. -if ischar(landname), - [vertexonland,elementonland]=ContourToMesh(elements,x,y,landname,'element and node',2); -elseif isfloat(landname), - if size(landname,1)~=md.numberofelements, - error('Landname for area must be of same size as number of elements in model'); - end - elementonland=landname; - vertexonland=zeros(md.numberofnodes,1); - vertexonland(md.elements(find(elementonland),:))=1; -else - error('Invalid area option option'); -end - -%Now, build the connectivity tables for this mesh. -if size(md.nodeconnectivity,1)~=md.numberofnodes, - md.nodeconnectivity=NodeConnectivity(md.elements,md.numberofnodes); -end -if size(md.elementconnectivity,1)~=md.numberofelements, - md.elementconnectivity=ElementConnectivity(md.elements,md.nodeconnectivity); -end - -%any element with 3 nodes on land should be on land: -elementsonwater=find(~elementonland); -wrongelements=elementsonwater(find(( vertexonland(md.elements(elementsonwater,1)) + vertexonland(md.elements(elementsonwater,2)) + vertexonland(md.elements(elementsonwater,3)) ... - )==3)); -elementonland(wrongelements)=1; - -%any element with its barycentre on land should be on land: (only if landname is an expfile) -if ischar(landname), -weights={[1;1;1],[2;1;1],[1;2;1],[1;1;2]}; - for i=1:length(weights), - xelem=x(md.elements)*weights{i}/sum(weights{i}); - yelem=y(md.elements)*weights{i}/sum(weights{i}); - end - baryonland=ContourToNodes(xelem,yelem,landname,1); - pos=find(~baryonland); elementonland(pos)=0; - pos=find(baryonland); elementonland(pos)=1; -end - -%figure out which elements on land are actually in the middle of the ocean! -pos1=find(elementonland); -connectedtoland=md.elementconnectivity(pos1,:); -pos=find(connectedtoland); connectedtoland(pos)=1-elementonland(connectedtoland(pos)); -connectedtolandsum=sum(connectedtoland,2); -waterelements=pos1(find(connectedtolandsum==3)); -elementonland(waterelements)=0; - -%figure out which elements on water are actually in the middle of the land! -pos1=find(~elementonland); -connectedtowater=md.elementconnectivity(pos1,:); -pos=find(connectedtowater); connectedtowater(pos)=elementonland(connectedtowater(pos)); -connectedtowatersum=sum(connectedtowater,2); -landelements=pos1(find(connectedtowatersum==3)); -elementonland(landelements)=1; - -%recover arrays of ice shelf nodes and elements, and ice sheet nodes and elements. -elementonfloatingice=FlagElements(md,floatingicename); -elementongroundedice=FlagElements(md,groundedicename); - -%Because groundedice nodes and elements can be included into an floatingice, we need to update. Remember, all the previous -%arrays come from domain outlines that can intersect one another: -vertexonfloatingice=zeros(md.numberofnodes,1); -vertexongroundedice=zeros(md.numberofnodes,1); -elementonfloatingice=double((elementonfloatingice & ~elementongroundedice)); -elementongroundedice=double(~elementonfloatingice); -vertexonfloatingice(md.elements(find(elementonfloatingice),:))=1; -vertexongroundedice(md.elements(find(elementongroundedice),:))=1; - -%now correct, so that none of the floatingice and groundedice elements and nodes are in the water. -pos=find(~elementonland); -elementonfloatingice(pos)=0; -elementongroundedice(pos)=0; - -pos=find(~vertexonland); -vertexonfloatingice(pos)=0; -vertexongroundedice(pos)=0; - -%create vertexonwater and elementonwater: -vertexonwater=double(~vertexonland); -elementonwater=double(~elementonland); - -%correct for islands: -vertexonfloatingice=double(vertexonfloatingice & ~vertexongroundedice); -elementonfloatingice=double(elementonfloatingice & ~elementongroundedice); - -%now, groundedices are everything except iceshelves and water -vertexongroundedice=double(~vertexonfloatingice & ~vertexonwater); -elementongroundedice=double(~elementonfloatingice & ~elementonwater); - -%Deal with segments on neumann: - -%Get current connectivity -elementconnectivity=md.elementconnectivity; - -%put 0 for elements on water -pos=find(elementconnectivity); -elementconnectivity(pos)=elementconnectivity(pos).*(~elementonwater(elementconnectivity(pos))); - -%put line of ones for elements on water -pos=find(elementonwater); -elementconnectivity(pos,:)=1;% line of ones for elements on water so they won't be considered - -%resort lines (zeros must be at the last column for findsegments) -elementconnectivity=sort(elementconnectivity,2,'descend'); - -%call findsegments to build segment using THIS conectivity -md.segments=findsegments(md,'elementconnectivity',elementconnectivity); - -%some final checks: -%check that no node thinks it's on an ice shelf or ice sheet, and lies actually in the middle of the water. -nodesgrounded=find(~vertexonwater); -lengthconnectivity=size(md.nodeconnectivity,2); -groundedcounters=md.nodeconnectivity(nodesgrounded,lengthconnectivity); -groundedconnectivity=md.nodeconnectivity(nodesgrounded,1:lengthconnectivity-1); -pos=find(groundedconnectivity); -groundedconnectivity(pos)=elementonwater(groundedconnectivity(pos)); -groundedsum=sum(groundedconnectivity,2); -errorflags=find(groundedsum==groundedcounters); -errornodes=nodesgrounded(errorflags); - -vertexonwater(errornodes)=1; -vertexongroundedice(errornodes)=0; -vertexonfloatingice(errornodes)=0; - -%Return: -md.mask.vertexonfloatingice=vertexonfloatingice; -md.mask.elementonfloatingice=elementonfloatingice; -md.mask.vertexonwater=vertexonwater; -md.mask.elementonwater=elementonwater; -md.mask.vertexongroundedice=vertexongroundedice; -md.mask.elementongroundedice=elementongroundedice; - -md.segmentmarkers(:)=1; Index: /issm/trunk/src/m/model/modelextract.m =================================================================== --- /issm/trunk/src/m/model/modelextract.m (revision 9640) +++ /issm/trunk/src/m/model/modelextract.m (revision 9641) @@ -16,5 +16,5 @@ % Examples: % md2=modelextract(md,'Domain.exp'); -% md2=modelextract(md,md.elementoniceshelf); +% md2=modelextract(md,md.mask.elementonfloatingice); % % See also: EXTRUDE, COLLAPSE @@ -84,17 +84,33 @@ model_fields=fields(md1); for i=1:length(model_fields), - %get field field=md1.(model_fields{i}); fieldsize=size(field); - - %size = number of nodes * n - if fieldsize(1)==numberofnodes1 - md2.(model_fields{i})=field(pos_node,:); - elseif (fieldsize(1)==numberofnodes1+1) - md2.(model_fields(i))=[field(pos_node,:); field(end,:)]; - %size = number of elements * n - elseif fieldsize(1)==numberofelements1 - md2.(model_fields{i})=field(pos_elem,:); + if isobject(field), %recursive call + object_fields=fields(md1.(model_fields{i})); + for j=1:length(object_fields), + %get field + field=md1.(model_fields{i}).(object_fields{j}); + fieldsize=size(field); + %size = number of nodes * n + if fieldsize(1)==numberofnodes1 + md2.(model_fields{i}).(object_fields{j})=field(pos_node,:); + elseif (fieldsize(1)==numberofnodes1+1) + md2.(model_fields(i)).(object_fields{j})=[field(pos_node,:); field(end,:)]; + %size = number of elements * n + elseif fieldsize(1)==numberofelements1 + md2.(model_fields{i}).(object_fields{j})=field(pos_elem,:); + end + end + else + %size = number of nodes * n + if fieldsize(1)==numberofnodes1 + md2.(model_fields{i})=field(pos_node,:); + elseif (fieldsize(1)==numberofnodes1+1) + md2.(model_fields(i))=[field(pos_node,:); field(end,:)]; + %size = number of elements * n + elseif fieldsize(1)==numberofelements1 + md2.(model_fields{i})=field(pos_elem,:); + end end end Index: /issm/trunk/src/m/model/modelsextract.m =================================================================== --- /issm/trunk/src/m/model/modelsextract.m (revision 9640) +++ /issm/trunk/src/m/model/modelsextract.m (revision 9641) @@ -12,5 +12,5 @@ % % Examples: -% md_list=modelsextract(md,md.elementoniceshelf,1000); +% md_list=modelsextract(md,md.mask.elementonfloatingice,1000); % % See also: EXTRUDE, COLLAPSE, MODELEXTRACT Index: /issm/trunk/src/m/model/parameterization/parameterize.m =================================================================== --- /issm/trunk/src/m/model/parameterization/parameterize.m (revision 9640) +++ /issm/trunk/src/m/model/parameterization/parameterize.m (revision 9641) @@ -3,5 +3,5 @@ % % from a parameter matlab file, start filling in all the @model fields that were not -% filled in by the mesh.m and geography.m @model methods. +% filled in by the mesh.m and mask.m @model methods. % Warning: the paramter file must be able to be run in Matlab % Index: /issm/trunk/src/m/model/plot/checkplotoptions.m =================================================================== --- /issm/trunk/src/m/model/plot/checkplotoptions.m (revision 9640) +++ /issm/trunk/src/m/model/plot/checkplotoptions.m (revision 9641) @@ -28,25 +28,4 @@ if strcmpi(getfieldvalue(options,'showsection'),'on') options=changefieldvalue(options,'showsection',4); - end -end - -%iceshelf values -if exist(options,'iceshelf'), - if strcmpi(getfieldvalue(options,'iceshelf'),'none') - options=changefieldvalue(options,'iceshelf',0); - end -end - -%icesheet values -if exist(options,'icesheet'), - if strcmpi(getfieldvalue(options,'icesheet'),'none') - options=changefieldvalue(options,'icesheet',0); - end -end - -%water values -if exist(options,'water'), - if strcmpi(getfieldvalue(options,'water'),'none') - options=changefieldvalue(options,'water',0); end end Index: sm/trunk/src/m/model/plot/plotanalyse.m =================================================================== --- /issm/trunk/src/m/model/plot/plotanalyse.m (revision 9640) +++ (revision ) @@ -1,23 +1,0 @@ -function plotanalyse(md) -%PLOTANALYSE - analyse entire model by plotting everything! -% -% Usage: -% plotanalyse(md) - -%Do a series of plots that will help the user analyse what is going on. -plot(md,'data','segmentonneumann_diag','title','dynamic boundary conditions',... - 'data','nodeondirichlet_diag','title','fixed velocity nodes',... - 'data','vx_obs','title','vx observation (m/s)',... - 'data','vy_obs','title','vy observation (m/s)',... - 'colorbar#all','on','figure',1); - -plot(md,'data','surface','title','surface','data','thickness','title','thickness',... - 'data','bed','title','bedrock','colorbar#all','on','figure',2); - -plot(md,'data','drag','title','drag coefficient','data','p','title','p coeff',... - 'data','q','title','q coeff','colorbar#all','on','figure',3); - -plot(md,'data','elementoniceshelf','title','elements on iceshelf',... - 'data','nodeoniceshelf','title','nodes on iceshelf',... - 'data','elementonicesheet','title','elements on icesheet',... - 'data','nodeonicesheet','title','nodes on icesheet','colorbar#all','on','figure',4); Index: /issm/trunk/src/m/model/setelementstype.m =================================================================== --- /issm/trunk/src/m/model/setelementstype.m (revision 9640) +++ /issm/trunk/src/m/model/setelementstype.m (revision 9641) @@ -16,5 +16,5 @@ % % Example: -% md=setelementstype(md,'pattyn','Pattyn.exp','macayeal',md.elementoniceshelf,'fill','hutter'); +% md=setelementstype(md,'pattyn','Pattyn.exp','macayeal',md.mask.elementonfloatingice,'fill','hutter'); % md=setelementstype(md,'pattyn','Pattyn.exp',fill','hutter','coupling','tiling'); Index: /issm/trunk/src/m/model/setmask.m =================================================================== --- /issm/trunk/src/m/model/setmask.m (revision 9641) +++ /issm/trunk/src/m/model/setmask.m (revision 9641) @@ -0,0 +1,49 @@ +function md=setmask(md,floatingicename,groundedicename) +%GEOGRAPHY - establish boundaries between grounded and floating ice. +% +% By default, ice is considered grounded. The contour floatingicename defines nodes +% for which ice is floating. The contour groundedicename defines nodes inside an floatingice, +% that are grounded (ie: ice rises, islands, etc ...) +% All input files are in the Argus format (extension .exp). +% +% Usage: +% md=setmask(md,floatingicename,groundedicename) +% +% Examples: +% md=setmask(md,'all',''); +% md=setmask(md,'Iceshelves.exp','Islands.exp'); + +%some checks on list of arguments +if ((nargin~=3) | (nargout~=1)), + help mask + error('mask error message'); +end + +%Get assigned fields +x=md.x; +y=md.y; +elements=md.elements; + +%Assign elementonfloatingice, elementongroundedice, vertexongroundedice and vertexonfloatingice. Only change at your own peril! This is synchronized heavily with the GroundingLineMigration module. {{{1 +elementonfloatingice=FlagElements(md,floatingicename); +elementongroundedice=FlagElements(md,groundedicename); + +%Because groundedice nodes and elements can be included into an floatingice, we need to update. Remember, all the previous +%arrays come from domain outlines that can intersect one another: +elementonfloatingice=double((elementonfloatingice & ~elementongroundedice)); +elementongroundedice=double(~elementonfloatingice); + +%the order here is important. we choose vertexongroundedice as default on the grounding line. +vertexonfloatingice=zeros(md.numberofnodes,1); +vertexongroundedice=zeros(md.numberofnodes,1); +vertexongroundedice(md.elements(find(elementongroundedice),:))=1; +vertexonfloatingice(find(~vertexongroundedice))=1; +%}}} + +%Return: +md.mask.elementonfloatingice=elementonfloatingice; +md.mask.vertexonfloatingice=vertexonfloatingice; +md.mask.elementongroundedice=elementongroundedice; +md.mask.vertexongroundedice=vertexongroundedice; +md.mask.vertexonwater=zeros(md.numberofnodes,1); +md.mask.elementonwater=zeros(md.numberofelements,1); Index: /issm/trunk/src/m/model/setmask2.m =================================================================== --- /issm/trunk/src/m/model/setmask2.m (revision 9641) +++ /issm/trunk/src/m/model/setmask2.m (revision 9641) @@ -0,0 +1,148 @@ +function md=setmask2(md,landname,floatingicename,groundedicename) +%GEOGRAPHY2 - establish land, ice sheet and ice shelf areas in a domains. +% +% Usage: +% md=setmask2(md,landname,floatingicename,groundedicename) +% +% Examples: +% md=setmask2(md,'LandName.exp','Iceshelves.exp','Islands.exp'); + +%Get assigned fields +x=md.x; +y=md.y; +elements=md.elements; + +%recover elements and nodes on land. +if ischar(landname), + [vertexonland,elementonland]=ContourToMesh(elements,x,y,landname,'element and node',2); +elseif isfloat(landname), + if size(landname,1)~=md.numberofelements, + error('Landname for area must be of same size as number of elements in model'); + end + elementonland=landname; + vertexonland=zeros(md.numberofnodes,1); + vertexonland(md.elements(find(elementonland),:))=1; +else + error('Invalid area option option'); +end + +%Now, build the connectivity tables for this mesh. +if size(md.nodeconnectivity,1)~=md.numberofnodes, + md.nodeconnectivity=NodeConnectivity(md.elements,md.numberofnodes); +end +if size(md.elementconnectivity,1)~=md.numberofelements, + md.elementconnectivity=ElementConnectivity(md.elements,md.nodeconnectivity); +end + +%any element with 3 nodes on land should be on land: +elementsonwater=find(~elementonland); +wrongelements=elementsonwater(find(( vertexonland(md.elements(elementsonwater,1)) + vertexonland(md.elements(elementsonwater,2)) + vertexonland(md.elements(elementsonwater,3)) ... + )==3)); +elementonland(wrongelements)=1; + +%any element with its barycentre on land should be on land: (only if landname is an expfile) +if ischar(landname), +weights={[1;1;1],[2;1;1],[1;2;1],[1;1;2]}; + for i=1:length(weights), + xelem=x(md.elements)*weights{i}/sum(weights{i}); + yelem=y(md.elements)*weights{i}/sum(weights{i}); + end + baryonland=ContourToNodes(xelem,yelem,landname,1); + pos=find(~baryonland); elementonland(pos)=0; + pos=find(baryonland); elementonland(pos)=1; +end + +%figure out which elements on land are actually in the middle of the ocean! +pos1=find(elementonland); +connectedtoland=md.elementconnectivity(pos1,:); +pos=find(connectedtoland); connectedtoland(pos)=1-elementonland(connectedtoland(pos)); +connectedtolandsum=sum(connectedtoland,2); +waterelements=pos1(find(connectedtolandsum==3)); +elementonland(waterelements)=0; + +%figure out which elements on water are actually in the middle of the land! +pos1=find(~elementonland); +connectedtowater=md.elementconnectivity(pos1,:); +pos=find(connectedtowater); connectedtowater(pos)=elementonland(connectedtowater(pos)); +connectedtowatersum=sum(connectedtowater,2); +landelements=pos1(find(connectedtowatersum==3)); +elementonland(landelements)=1; + +%recover arrays of ice shelf nodes and elements, and ice sheet nodes and elements. +elementonfloatingice=FlagElements(md,floatingicename); +elementongroundedice=FlagElements(md,groundedicename); + +%Because groundedice nodes and elements can be included into an floatingice, we need to update. Remember, all the previous +%arrays come from domain outlines that can intersect one another: +vertexonfloatingice=zeros(md.numberofnodes,1); +vertexongroundedice=zeros(md.numberofnodes,1); +elementonfloatingice=double((elementonfloatingice & ~elementongroundedice)); +elementongroundedice=double(~elementonfloatingice); +vertexonfloatingice(md.elements(find(elementonfloatingice),:))=1; +vertexongroundedice(md.elements(find(elementongroundedice),:))=1; + +%now correct, so that none of the floatingice and groundedice elements and nodes are in the water. +pos=find(~elementonland); +elementonfloatingice(pos)=0; +elementongroundedice(pos)=0; + +pos=find(~vertexonland); +vertexonfloatingice(pos)=0; +vertexongroundedice(pos)=0; + +%create vertexonwater and elementonwater: +vertexonwater=double(~vertexonland); +elementonwater=double(~elementonland); + +%correct for islands: +vertexonfloatingice=double(vertexonfloatingice & ~vertexongroundedice); +elementonfloatingice=double(elementonfloatingice & ~elementongroundedice); + +%now, groundedices are everything except iceshelves and water +vertexongroundedice=double(~vertexonfloatingice & ~vertexonwater); +elementongroundedice=double(~elementonfloatingice & ~elementonwater); + +%Deal with segments on neumann: + +%Get current connectivity +elementconnectivity=md.elementconnectivity; + +%put 0 for elements on water +pos=find(elementconnectivity); +elementconnectivity(pos)=elementconnectivity(pos).*(~elementonwater(elementconnectivity(pos))); + +%put line of ones for elements on water +pos=find(elementonwater); +elementconnectivity(pos,:)=1;% line of ones for elements on water so they won't be considered + +%resort lines (zeros must be at the last column for findsegments) +elementconnectivity=sort(elementconnectivity,2,'descend'); + +%call findsegments to build segment using THIS conectivity +md.segments=findsegments(md,'elementconnectivity',elementconnectivity); + +%some final checks: +%check that no node thinks it's on an ice shelf or ice sheet, and lies actually in the middle of the water. +nodesgrounded=find(~vertexonwater); +lengthconnectivity=size(md.nodeconnectivity,2); +groundedcounters=md.nodeconnectivity(nodesgrounded,lengthconnectivity); +groundedconnectivity=md.nodeconnectivity(nodesgrounded,1:lengthconnectivity-1); +pos=find(groundedconnectivity); +groundedconnectivity(pos)=elementonwater(groundedconnectivity(pos)); +groundedsum=sum(groundedconnectivity,2); +errorflags=find(groundedsum==groundedcounters); +errornodes=nodesgrounded(errorflags); + +vertexonwater(errornodes)=1; +vertexongroundedice(errornodes)=0; +vertexonfloatingice(errornodes)=0; + +%Return: +md.mask.vertexonfloatingice=vertexonfloatingice; +md.mask.elementonfloatingice=elementonfloatingice; +md.mask.vertexonwater=vertexonwater; +md.mask.elementonwater=elementonwater; +md.mask.vertexongroundedice=vertexongroundedice; +md.mask.elementongroundedice=elementongroundedice; + +md.segmentmarkers(:)=1; Index: /issm/trunk/src/m/utils/BC/SetIceShelfBC.m =================================================================== --- /issm/trunk/src/m/utils/BC/SetIceShelfBC.m (revision 9640) +++ /issm/trunk/src/m/utils/BC/SetIceShelfBC.m (revision 9641) @@ -59,5 +59,5 @@ %Add water or air enum depending on the element -pressureload=[pressureload 1*md.elementoniceshelf(pressureload(:,end))]; +pressureload=[pressureload 1*md.mask.elementonfloatingice(pressureload(:,end))]; %plug onto model Index: /issm/trunk/src/m/utils/BC/SetMarineIceSheetBC.m =================================================================== --- /issm/trunk/src/m/utils/BC/SetMarineIceSheetBC.m (revision 9640) +++ /issm/trunk/src/m/utils/BC/SetMarineIceSheetBC.m (revision 9641) @@ -3,5 +3,5 @@ % % Neumann BC are used on the ice front (an ARGUS contour around the ice front -% can be given in input, or it will be deduced as oniceshelf & onboundary) +% can be given in input, or it will be deduced as onfloatingice & onboundary) % Dirichlet BC are used elsewhere for diagnostic % @@ -24,12 +24,12 @@ end nodeinsideicefront=ContourToMesh(md.elements,md.x,md.y,icefrontfile,'node',2); - nodeonicefront=double(md.nodeonboundary & nodeinsideicefront); + vertexonicefront=double(md.nodeonboundary & nodeinsideicefront); else %Guess where the ice front is - nodeoniceshelf=zeros(md.numberofnodes,1); - nodeoniceshelf(md.elements(find(md.elementoniceshelf),:))=1; - nodeonicefront=double(md.nodeonboundary & nodeoniceshelf); + vertexonfloatingice=zeros(md.numberofnodes,1); + vertexonfloatingice(md.elements(find(md.mask.elementonfloatingice),:))=1; + vertexonicefront=double(md.nodeonboundary & vertexonfloatingice); end -pos=find(md.nodeonboundary & ~nodeonicefront); +pos=find(md.nodeonboundary & ~vertexonicefront); if isempty(pos), warning('SetMarineIceSheetBC warning: ice front all around the glacier, no dirichlet found. Dirichlet must be added manually') @@ -57,5 +57,5 @@ %segment on Neumann (Ice Front) -pos=find(nodeonicefront(md.segments(:,1)) | nodeonicefront(md.segments(:,2))); +pos=find(vertexonicefront(md.segments(:,1)) | vertexonicefront(md.segments(:,2))); if (md.dim==2) pressureload=md.segments(pos,:); @@ -69,5 +69,5 @@ %Add water or air enum depending on the element -pressureload=[pressureload 1*md.elementoniceshelf(pressureload(:,end))+ 0*md.elementonicesheet(pressureload(:,end))]; +pressureload=[pressureload 1*md.mask.elementonfloatingice(pressureload(:,end))+ 0*md.mask.elementongroundedice(pressureload(:,end))]; %plug onto model @@ -105,5 +105,5 @@ if (length(md.basalforcings.geothermalflux)~=md.numberofnodes), md.basalforcings.geothermalflux=zeros(md.numberofnodes,1); - md.basalforcings.geothermalflux(find(md.nodeonicesheet))=50*10^-3; %50mW/m2 + md.basalforcings.geothermalflux(find(md.mask.vertexongroundedice))=50*10^-3; %50mW/m2 end else Index: /issm/trunk/src/m/utils/Geometry/FlagElements.m =================================================================== --- /issm/trunk/src/m/utils/Geometry/FlagElements.m (revision 9640) +++ /issm/trunk/src/m/utils/Geometry/FlagElements.m (revision 9641) @@ -12,5 +12,5 @@ % flag=FlagElements(md,'Domain.exp'); % flag=FlagElements(md,'~Domain.exp'); -% flag=FlagElements(md,md.elementonicesheet); +% flag=FlagElements(md,md.mask.elementongroundedice); if ischar(region), Index: sm/trunk/src/m/utils/Mesh/zerothickness_icesheetfront.m =================================================================== --- /issm/trunk/src/m/utils/Mesh/zerothickness_icesheetfront.m (revision 9640) +++ (revision ) @@ -1,26 +1,0 @@ -function [thickness,surface,bed]=zerothickness_icesheetfront(md,default_value) -%ZEROTHICKNESS_ICESHEETFRONT zero the thickness, surface and bed at a grounded icefront -% -% Usage: [thickness,surface,bed]=zerothickness_icesheetfront(md,default) -% -% See also: parameterize.m - -%retrieve thickness, surface and bed -thickness=md.thickness; -bed=md.bed; -surface=md.surface; - - -%retrieve elements on ice sheet front -segments=md.pressureload; -els=segments(:,3); -pos=find(md.elementonicesheet(els)); -segments_icesheet=segments(pos,:); - -%retrieve nodes on ice sheet front -node_icesheetfront=intersect(segments_icesheet(:,1),segments_icesheet(:,2)); - -%modify thickness, surface and bed to be a default value -thickness(node_icesheetfront)=default_value; -bed(node_icesheetfront)=surface(node_icesheetfront)-thickness(node_icesheetfront); - Index: /issm/trunk/template =================================================================== --- /issm/trunk/template (revision 9640) +++ /issm/trunk/template (revision 9641) @@ -50,17 +50,4 @@ thickness_coeff -> rename hydrostatic_ratio (change ThicknessCorrection.m accordingly) -}}} -mask{{{ - elementoniceshelf -> rename elementonwater - elementonicesheet -> rename elementonground - elementonwater -> rename elementelementonground - nodeoniceshelf - nodeonicesheet - nodeonwater - - elementongroundedice - elementonfloatingice - elementonwater - }}} flowequation{{{ Index: /issm/trunk/test/Miscellaneous/Bump/Bump.par =================================================================== --- /issm/trunk/test/Miscellaneous/Bump/Bump.par (revision 9640) +++ /issm/trunk/test/Miscellaneous/Bump/Bump.par (revision 9641) @@ -16,5 +16,5 @@ md.drag_coefficient=30*ones(md.numberofnodes,1); %q=1. %Take care of iceshelves: no basal drag -pos=find(md.elementoniceshelf); +pos=find(md.mask.elementonfloatingice); md.drag_coefficient(md.elements(pos,:))=0; md.drag_p=ones(md.numberofelements,1); Index: /issm/trunk/test/Miscellaneous/Bump/runme.m =================================================================== --- /issm/trunk/test/Miscellaneous/Bump/runme.m (revision 9640) +++ /issm/trunk/test/Miscellaneous/Bump/runme.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'DomainOutline.exp',1000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'Bump.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/Miscellaneous/GJM_test1/SquareShelf.par =================================================================== --- /issm/trunk/test/Miscellaneous/GJM_test1/SquareShelf.par (revision 9640) +++ /issm/trunk/test/Miscellaneous/GJM_test1/SquareShelf.par (revision 9641) @@ -17,5 +17,5 @@ %Friction -pos=find(md.elementoniceshelf); +pos=find(md.mask.elementonfloatingice); md.drag_type=2; md.drag_coefficient=20*ones(md.numberofnodes,1); Index: /issm/trunk/test/Miscellaneous/GJM_test1/test1.m =================================================================== --- /issm/trunk/test/Miscellaneous/GJM_test1/test1.m (revision 9640) +++ /issm/trunk/test/Miscellaneous/GJM_test1/test1.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'Square.exp',150000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'SquareShelf.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/Miscellaneous/connectivity/Square.par =================================================================== --- /issm/trunk/test/Miscellaneous/connectivity/Square.par (revision 9640) +++ /issm/trunk/test/Miscellaneous/connectivity/Square.par (revision 9641) @@ -18,5 +18,5 @@ md.drag_coefficient=200*ones(md.numberofnodes,1); %q=1. %Take care of iceshelves: no basal drag -pos=find(md.elementoniceshelf); +pos=find(md.mask.elementonfloatingice); md.drag_coefficient(md.elements(pos,:))=0; md.drag_p=ones(md.numberofelements,1); Index: /issm/trunk/test/Miscellaneous/connectivity/runme.m =================================================================== --- /issm/trunk/test/Miscellaneous/connectivity/runme.m (revision 9640) +++ /issm/trunk/test/Miscellaneous/connectivity/runme.m (revision 9641) @@ -34,5 +34,5 @@ md=model; md=mesh(md,'DomainOutline.exp',density); - md=geography(md,'all',''); + md=setmask(md,'all',''); md=parameterize(md,'Square.par'); md.connectivity=connectivity; Index: /issm/trunk/test/NightlyRun/test101.m =================================================================== --- /issm/trunk/test/NightlyRun/test101.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test101.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test102.m =================================================================== --- /issm/trunk/test/NightlyRun/test102.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test102.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test103.m =================================================================== --- /issm/trunk/test/NightlyRun/test103.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test103.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=extrude(md,3,2); Index: /issm/trunk/test/NightlyRun/test104.m =================================================================== --- /issm/trunk/test/NightlyRun/test104.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test104.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=extrude(md,3,2); Index: /issm/trunk/test/NightlyRun/test105.m =================================================================== --- /issm/trunk/test/NightlyRun/test105.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test105.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=extrude(md,3,2); Index: /issm/trunk/test/NightlyRun/test106.m =================================================================== --- /issm/trunk/test/NightlyRun/test106.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test106.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=extrude(md,3,2); Index: /issm/trunk/test/NightlyRun/test107.m =================================================================== --- /issm/trunk/test/NightlyRun/test107.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test107.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=extrude(md,3,2); Index: /issm/trunk/test/NightlyRun/test108.m =================================================================== --- /issm/trunk/test/NightlyRun/test108.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test108.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=extrude(md,3,2); Index: /issm/trunk/test/NightlyRun/test109.m =================================================================== --- /issm/trunk/test/NightlyRun/test109.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test109.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test110.m =================================================================== --- /issm/trunk/test/NightlyRun/test110.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test110.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test1101.m =================================================================== --- /issm/trunk/test/NightlyRun/test1101.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test1101.m (revision 9641) @@ -14,5 +14,5 @@ md=model; md=squaremesh(md,L,L,nx,ny); - md=geography(md,'',''); %ice sheet test + md=setmask(md,'',''); %ice sheet test md=parameterize(md,'../Par/ISMIPA.par'); md=extrude(md,9,1); Index: /issm/trunk/test/NightlyRun/test1102.m =================================================================== --- /issm/trunk/test/NightlyRun/test1102.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test1102.m (revision 9641) @@ -14,5 +14,5 @@ md=model; md=squaremesh(md,L,L,nx,ny); - md=geography(md,'',''); %ice sheet test + md=setmask(md,'',''); %ice sheet test % %Find elements at the corner and extract model Index: /issm/trunk/test/NightlyRun/test1103.m =================================================================== --- /issm/trunk/test/NightlyRun/test1103.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test1103.m (revision 9641) @@ -12,5 +12,5 @@ md=model; md=squaremesh(md,L,L,nx,ny); - md=geography(md,'',''); %ice sheet test + md=setmask(md,'',''); %ice sheet test md=parameterize(md,'../Par/ISMIPB.par'); md=extrude(md,10,1); Index: /issm/trunk/test/NightlyRun/test1104.m =================================================================== --- /issm/trunk/test/NightlyRun/test1104.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test1104.m (revision 9641) @@ -11,5 +11,5 @@ md=model; md=squaremesh(md,L,L,nx,ny); - md=geography(md,'',''); %ice sheet test + md=setmask(md,'',''); %ice sheet test md=parameterize(md,'../Par/ISMIPB.par'); md=extrude(md,10,1); Index: /issm/trunk/test/NightlyRun/test1105.m =================================================================== --- /issm/trunk/test/NightlyRun/test1105.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test1105.m (revision 9641) @@ -14,5 +14,5 @@ md=model; md=squaremesh(md,L,L,nx,ny); - md=geography(md,'',''); %ice sheet test + md=setmask(md,'',''); %ice sheet test md=parameterize(md,'../Par/ISMIPC.par'); md=extrude(md,10,1); Index: /issm/trunk/test/NightlyRun/test1106.m =================================================================== --- /issm/trunk/test/NightlyRun/test1106.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test1106.m (revision 9641) @@ -11,5 +11,5 @@ md=model; md=squaremesh(md,L,L,nx,ny); - md=geography(md,'',''); %ice sheet test + md=setmask(md,'',''); %ice sheet test md=parameterize(md,'../Par/ISMIPC.par'); md=extrude(md,6,1); Index: /issm/trunk/test/NightlyRun/test1107.m =================================================================== --- /issm/trunk/test/NightlyRun/test1107.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test1107.m (revision 9641) @@ -14,5 +14,5 @@ md=model; md=squaremesh(md,L,L,nx,ny); - md=geography(md,'',''); %ice sheet test + md=setmask(md,'',''); %ice sheet test md=parameterize(md,'../Par/ISMIPD.par'); md=extrude(md,10,1); Index: /issm/trunk/test/NightlyRun/test1108.m =================================================================== --- /issm/trunk/test/NightlyRun/test1108.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test1108.m (revision 9641) @@ -11,5 +11,5 @@ md=model; md=squaremesh(md,L,L,nx,ny); - md=geography(md,'',''); %ice sheet test + md=setmask(md,'',''); %ice sheet test md=parameterize(md,'../Par/ISMIPD.par'); md=extrude(md,6,1); Index: /issm/trunk/test/NightlyRun/test1109.m =================================================================== --- /issm/trunk/test/NightlyRun/test1109.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test1109.m (revision 9641) @@ -15,5 +15,5 @@ md=model; md=squaremesh(md,Lx,Ly,nx,ny); - md=geography(md,'',''); %ice sheet test + md=setmask(md,'',''); %ice sheet test md=parameterize(md,'../Par/ISMIPE.par'); md=extrude(md,10,1); Index: /issm/trunk/test/NightlyRun/test111.m =================================================================== --- /issm/trunk/test/NightlyRun/test111.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test111.m (revision 9641) @@ -1,5 +1,5 @@ md=mesh(model,'../Exp/Square.exp',150000); md=meshconvert(md); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test1110.m =================================================================== --- /issm/trunk/test/NightlyRun/test1110.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test1110.m (revision 9641) @@ -10,5 +10,5 @@ md=squaremesh(md,L,L,nx,ny); %md=mesh(md,'../Exp/SquareISMIP.exp',5500); - md=geography(md,'',''); %ice sheet test + md=setmask(md,'',''); %ice sheet test md=parameterize(md,'../Par/ISMIPF.par'); md=extrude(md,4,1); Index: /issm/trunk/test/NightlyRun/test112.m =================================================================== --- /issm/trunk/test/NightlyRun/test112.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test112.m (revision 9641) @@ -1,5 +1,5 @@ md=mesh(model,'../Exp/Square.exp',150000); md=meshconvert(md); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test113.m =================================================================== --- /issm/trunk/test/NightlyRun/test113.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test113.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test114.m =================================================================== --- /issm/trunk/test/NightlyRun/test114.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test114.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test115.m =================================================================== --- /issm/trunk/test/NightlyRun/test115.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test115.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test116.m =================================================================== --- /issm/trunk/test/NightlyRun/test116.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test116.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test117.m =================================================================== --- /issm/trunk/test/NightlyRun/test117.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test117.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test118.m =================================================================== --- /issm/trunk/test/NightlyRun/test118.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test118.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test119.m =================================================================== --- /issm/trunk/test/NightlyRun/test119.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test119.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test120.m =================================================================== --- /issm/trunk/test/NightlyRun/test120.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test120.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test1201.m =================================================================== --- /issm/trunk/test/NightlyRun/test1201.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test1201.m (revision 9641) @@ -7,5 +7,5 @@ %The goal is to test the prognostic model md=bamg(model,'domain','../Exp/SquareEISMINT.exp','hmax',3000); - md=geography(md,'all',''); + md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareEISMINT.par'); md.surfaceforcings.mass_balance(:)=0; Index: /issm/trunk/test/NightlyRun/test1202.m =================================================================== --- /issm/trunk/test/NightlyRun/test1202.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test1202.m (revision 9641) @@ -5,5 +5,5 @@ md=model; md=mesh(md,'../Exp/SquareEISMINT.exp',3550); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareEISMINT.par'); md=setelementstype(md,'macayeal','all'); %MacAyeal's model and 2d Index: /issm/trunk/test/NightlyRun/test1203.m =================================================================== --- /issm/trunk/test/NightlyRun/test1203.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test1203.m (revision 9641) @@ -5,5 +5,5 @@ md=model; md=mesh(md,'../Exp/SquareEISMINT.exp',5100); %test3 -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareEISMINT.par'); md=setelementstype(md,'macayeal','all'); %MacAyeal's model and 2d Index: /issm/trunk/test/NightlyRun/test1204.m =================================================================== --- /issm/trunk/test/NightlyRun/test1204.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test1204.m (revision 9641) @@ -5,5 +5,5 @@ md=model; md=mesh(md,'../Exp/SquareEISMINT.exp',3550); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareEISMINT.par'); md=setelementstype(md,'macayeal','all'); %MacAyeal's model and 2d Index: /issm/trunk/test/NightlyRun/test1205.m =================================================================== --- /issm/trunk/test/NightlyRun/test1205.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test1205.m (revision 9641) @@ -8,5 +8,5 @@ md=model; md=roundmesh(md,750000,resolution); -md=geography(md,'',''); %We can not test iceshelves nor ice rises with this analytical solution +md=setmask(md,'',''); %We can not test iceshelves nor ice rises with this analytical solution md=parameterize(md,'../Par/RoundSheetStaticEISMINT.par'); Index: /issm/trunk/test/NightlyRun/test1206.m =================================================================== --- /issm/trunk/test/NightlyRun/test1206.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test1206.m (revision 9641) @@ -8,5 +8,5 @@ md=model; md=roundmesh(md,750000,resolution); -md=geography(md,'',''); %We can not test iceshelves nor ice rises with this analytical solution +md=setmask(md,'',''); %We can not test iceshelves nor ice rises with this analytical solution md=parameterize(md,'../Par/RoundSheetStaticEISMINT.par'); Index: /issm/trunk/test/NightlyRun/test1207.m =================================================================== --- /issm/trunk/test/NightlyRun/test1207.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test1207.m (revision 9641) @@ -8,5 +8,5 @@ md=model; md=roundmesh(md,750000,resolution); -md=geography(md,'',''); %We can not test iceshelves nor ice rises with this analytical solution +md=setmask(md,'',''); %We can not test iceshelves nor ice rises with this analytical solution md=parameterize(md,'../Par/RoundSheetStaticEISMINT.par'); Index: /issm/trunk/test/NightlyRun/test1208.m =================================================================== --- /issm/trunk/test/NightlyRun/test1208.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test1208.m (revision 9641) @@ -5,5 +5,5 @@ %To begin with the numerical model md=mesh(model,'../Exp/SquareEISMINT750000.exp',resolution); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/RoundSheetEISMINT.par'); Index: /issm/trunk/test/NightlyRun/test121.m =================================================================== --- /issm/trunk/test/NightlyRun/test121.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test121.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',200000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test122.m =================================================================== --- /issm/trunk/test/NightlyRun/test122.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test122.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',200000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test123.m =================================================================== --- /issm/trunk/test/NightlyRun/test123.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test123.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test124.m =================================================================== --- /issm/trunk/test/NightlyRun/test124.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test124.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test125.m =================================================================== --- /issm/trunk/test/NightlyRun/test125.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test125.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=extrude(md,5,1); Index: /issm/trunk/test/NightlyRun/test126.m =================================================================== --- /issm/trunk/test/NightlyRun/test126.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test126.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=extrude(md,5,1); Index: /issm/trunk/test/NightlyRun/test127.m =================================================================== --- /issm/trunk/test/NightlyRun/test127.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test127.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test128.m =================================================================== --- /issm/trunk/test/NightlyRun/test128.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test128.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test129.m =================================================================== --- /issm/trunk/test/NightlyRun/test129.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test129.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=extrude(md,5,1); Index: /issm/trunk/test/NightlyRun/test130.m =================================================================== --- /issm/trunk/test/NightlyRun/test130.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test130.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=extrude(md,5,1); Index: /issm/trunk/test/NightlyRun/test1301.m =================================================================== --- /issm/trunk/test/NightlyRun/test1301.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test1301.m (revision 9641) @@ -7,5 +7,5 @@ md=model; md=mesh(md,'../Exp/Square.exp',100000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareThermal.par'); md=extrude(md,3,2); Index: /issm/trunk/test/NightlyRun/test1302.m =================================================================== --- /issm/trunk/test/NightlyRun/test1302.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test1302.m (revision 9641) @@ -6,5 +6,5 @@ md=model; md=mesh(md,'../Exp/Square.exp',100000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareThermal.par'); md=extrude(md,30,1); %NB: the more one extrudes, the better (10-> relative~0.35%, 20->0.1%, 30->0.05%) Index: /issm/trunk/test/NightlyRun/test1303.m =================================================================== --- /issm/trunk/test/NightlyRun/test1303.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test1303.m (revision 9641) @@ -7,5 +7,5 @@ md=model; md=mesh(md,'../Exp/Square.exp',100000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareThermal.par'); md=extrude(md,11,2); Index: /issm/trunk/test/NightlyRun/test1304.m =================================================================== --- /issm/trunk/test/NightlyRun/test1304.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test1304.m (revision 9641) @@ -7,5 +7,5 @@ md=model; md=mesh(md,'../Exp/Square.exp',100000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareThermal.par'); md=extrude(md,11,1); Index: /issm/trunk/test/NightlyRun/test131.m =================================================================== --- /issm/trunk/test/NightlyRun/test131.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test131.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); %Add boundary conditions on thickness on the border Index: /issm/trunk/test/NightlyRun/test132.m =================================================================== --- /issm/trunk/test/NightlyRun/test132.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test132.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); %Add boundary conditions on thickness on the border Index: /issm/trunk/test/NightlyRun/test133.m =================================================================== --- /issm/trunk/test/NightlyRun/test133.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test133.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=extrude(md,5,1); Index: /issm/trunk/test/NightlyRun/test134.m =================================================================== --- /issm/trunk/test/NightlyRun/test134.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test134.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=extrude(md,5,1); Index: /issm/trunk/test/NightlyRun/test135.m =================================================================== --- /issm/trunk/test/NightlyRun/test135.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test135.m (revision 9641) @@ -1,5 +1,5 @@ md=mesh(model,'../Exp/Square.exp',150000); md=meshconvert(md); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); md.prognostic_DG=1; Index: /issm/trunk/test/NightlyRun/test136.m =================================================================== --- /issm/trunk/test/NightlyRun/test136.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test136.m (revision 9641) @@ -1,5 +1,5 @@ md=mesh(model,'../Exp/Square.exp',150000); md=meshconvert(md); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); md.prognostic_DG=1; Index: /issm/trunk/test/NightlyRun/test1501.m =================================================================== --- /issm/trunk/test/NightlyRun/test1501.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test1501.m (revision 9641) @@ -2,5 +2,5 @@ md=mesh(model,'../Exp/Square.exp',350000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test1502.m =================================================================== --- /issm/trunk/test/NightlyRun/test1502.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test1502.m (revision 9641) @@ -2,5 +2,5 @@ md=mesh(model,'../Exp/Square.exp',700000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test201.m =================================================================== --- /issm/trunk/test/NightlyRun/test201.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test201.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test202.m =================================================================== --- /issm/trunk/test/NightlyRun/test202.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test202.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test203.m =================================================================== --- /issm/trunk/test/NightlyRun/test203.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test203.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,2); Index: /issm/trunk/test/NightlyRun/test204.m =================================================================== --- /issm/trunk/test/NightlyRun/test204.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test204.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,2); Index: /issm/trunk/test/NightlyRun/test205.m =================================================================== --- /issm/trunk/test/NightlyRun/test205.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test205.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,2); Index: /issm/trunk/test/NightlyRun/test206.m =================================================================== --- /issm/trunk/test/NightlyRun/test206.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test206.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,2); Index: /issm/trunk/test/NightlyRun/test207.m =================================================================== --- /issm/trunk/test/NightlyRun/test207.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test207.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,2); Index: /issm/trunk/test/NightlyRun/test208.m =================================================================== --- /issm/trunk/test/NightlyRun/test208.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test208.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,2); Index: /issm/trunk/test/NightlyRun/test209.m =================================================================== --- /issm/trunk/test/NightlyRun/test209.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test209.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,2); Index: /issm/trunk/test/NightlyRun/test210.m =================================================================== --- /issm/trunk/test/NightlyRun/test210.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test210.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,2); Index: /issm/trunk/test/NightlyRun/test211.m =================================================================== --- /issm/trunk/test/NightlyRun/test211.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test211.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test212.m =================================================================== --- /issm/trunk/test/NightlyRun/test212.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test212.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test213.m =================================================================== --- /issm/trunk/test/NightlyRun/test213.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test213.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test214.m =================================================================== --- /issm/trunk/test/NightlyRun/test214.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test214.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test215.m =================================================================== --- /issm/trunk/test/NightlyRun/test215.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test215.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test216.m =================================================================== --- /issm/trunk/test/NightlyRun/test216.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test216.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test217.m =================================================================== --- /issm/trunk/test/NightlyRun/test217.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test217.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test218.m =================================================================== --- /issm/trunk/test/NightlyRun/test218.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test218.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test219.m =================================================================== --- /issm/trunk/test/NightlyRun/test219.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test219.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',200000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test220.m =================================================================== --- /issm/trunk/test/NightlyRun/test220.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test220.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',200000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test221.m =================================================================== --- /issm/trunk/test/NightlyRun/test221.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test221.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',200000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test222.m =================================================================== --- /issm/trunk/test/NightlyRun/test222.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test222.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',200000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test223.m =================================================================== --- /issm/trunk/test/NightlyRun/test223.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test223.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',200000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=setelementstype(md,'macayeal','all'); @@ -6,5 +6,5 @@ %control parameters md.control_analysis=1; -md.control_type={'RheologyBbar'}; +md.control_type={'MaterialsRheologyBbar'}; md.cm_min=10^6*ones(md.numberofnodes,1); md.cm_max=2*10^9*ones(md.numberofnodes,1); @@ -21,10 +21,10 @@ %Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'RheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'}; +field_names ={'Gradient' 'Misfits' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'}; field_tolerances={1e-12,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; field_values={... PatchToVec(md.results.DiagnosticSolution.Gradient1),... md.results.DiagnosticSolution.J,... - PatchToVec(md.results.DiagnosticSolution.RheologyBbar),... + PatchToVec(md.results.DiagnosticSolution.MaterialsRheologyBbar),... PatchToVec(md.results.DiagnosticSolution.Pressure),... PatchToVec(md.results.DiagnosticSolution.Vel),... Index: /issm/trunk/test/NightlyRun/test224.m =================================================================== --- /issm/trunk/test/NightlyRun/test224.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test224.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',200000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=setelementstype(md,'macayeal','all'); @@ -6,5 +6,5 @@ %control parameters md.control_analysis=1; -md.control_type={'RheologyBbar'}; +md.control_type={'MaterialsRheologyBbar'}; md.cm_min=10^6*ones(md.numberofnodes,1); md.cm_max=2*10^9*ones(md.numberofnodes,1); @@ -21,10 +21,10 @@ %Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'RheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'}; +field_names ={'Gradient' 'Misfits' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'}; field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; field_values={... PatchToVec(md.results.DiagnosticSolution.Gradient1),... md.results.DiagnosticSolution.J,... - PatchToVec(md.results.DiagnosticSolution.RheologyBbar),... + PatchToVec(md.results.DiagnosticSolution.MaterialsRheologyBbar),... PatchToVec(md.results.DiagnosticSolution.Pressure),... PatchToVec(md.results.DiagnosticSolution.Vel),... Index: /issm/trunk/test/NightlyRun/test225.m =================================================================== --- /issm/trunk/test/NightlyRun/test225.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test225.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',200000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1); @@ -7,5 +7,5 @@ %control parameters md.control_analysis=1; -md.control_type={'RheologyBbar'}; +md.control_type={'MaterialsRheologyBbar'}; md.cm_min=10^6*ones(md.numberofnodes,1); md.cm_max=2*10^9*ones(md.numberofnodes,1); @@ -22,10 +22,10 @@ %Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'RheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'}; +field_names ={'Gradient' 'Misfits' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'}; field_tolerances={1e-12,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; field_values={... PatchToVec(md.results.DiagnosticSolution.Gradient1),... md.results.DiagnosticSolution.J,... - PatchToVec(md.results.DiagnosticSolution.RheologyB),... + PatchToVec(md.results.DiagnosticSolution.MaterialsRheologyB),... PatchToVec(md.results.DiagnosticSolution.Pressure),... PatchToVec(md.results.DiagnosticSolution.Vel),... Index: /issm/trunk/test/NightlyRun/test226.m =================================================================== --- /issm/trunk/test/NightlyRun/test226.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test226.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',200000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1); @@ -7,5 +7,5 @@ %control parameters md.control_analysis=1; -md.control_type={'RheologyBbar'}; +md.control_type={'MaterialsRheologyBbar'}; md.cm_min=10^6*ones(md.numberofnodes,1); md.cm_max=2*10^9*ones(md.numberofnodes,1); @@ -22,10 +22,10 @@ %Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'RheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'}; +field_names ={'Gradient' 'Misfits' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'}; field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; field_values={... PatchToVec(md.results.DiagnosticSolution.Gradient1),... md.results.DiagnosticSolution.J,... - PatchToVec(md.results.DiagnosticSolution.RheologyB),... + PatchToVec(md.results.DiagnosticSolution.MaterialsRheologyB),... PatchToVec(md.results.DiagnosticSolution.Pressure),... PatchToVec(md.results.DiagnosticSolution.Vel),... Index: /issm/trunk/test/NightlyRun/test227.m =================================================================== --- /issm/trunk/test/NightlyRun/test227.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test227.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',200000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1); @@ -7,5 +7,5 @@ %control parameters md.control_analysis=1; -md.control_type={'RheologyBbar'}; +md.control_type={'MaterialsRheologyBbar'}; md.cm_min=10^6*ones(md.numberofnodes,1); md.cm_max=2*10^9*ones(md.numberofnodes,1); @@ -22,10 +22,10 @@ %Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'RheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'}; +field_names ={'Gradient' 'Misfits' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'}; field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09}; field_values={... PatchToVec(md.results.DiagnosticSolution.Gradient1),... md.results.DiagnosticSolution.J,... - PatchToVec(md.results.DiagnosticSolution.RheologyB),... + PatchToVec(md.results.DiagnosticSolution.MaterialsRheologyB),... PatchToVec(md.results.DiagnosticSolution.Pressure),... PatchToVec(md.results.DiagnosticSolution.Vel),... Index: /issm/trunk/test/NightlyRun/test228.m =================================================================== --- /issm/trunk/test/NightlyRun/test228.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test228.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',200000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1); @@ -7,5 +7,5 @@ %control parameters md.control_analysis=1; -md.control_type={'RheologyBbar'}; +md.control_type={'MaterialsRheologyBbar'}; md.cm_min=10^6*ones(md.numberofnodes,1); md.cm_max=2*10^9*ones(md.numberofnodes,1); @@ -22,10 +22,10 @@ %Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'RheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'}; +field_names ={'Gradient' 'Misfits' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'}; field_tolerances={1e-07,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08}; field_values={... PatchToVec(md.results.DiagnosticSolution.Gradient1),... md.results.DiagnosticSolution.J,... - PatchToVec(md.results.DiagnosticSolution.RheologyB),... + PatchToVec(md.results.DiagnosticSolution.MaterialsRheologyB),... PatchToVec(md.results.DiagnosticSolution.Pressure),... PatchToVec(md.results.DiagnosticSolution.Vel),... Index: /issm/trunk/test/NightlyRun/test229.m =================================================================== --- /issm/trunk/test/NightlyRun/test229.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test229.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',200000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1); @@ -7,5 +7,5 @@ %control parameters md.control_analysis=1; -md.control_type={'RheologyBbar'}; +md.control_type={'MaterialsRheologyBbar'}; md.cm_min=10^6*ones(md.numberofnodes,1); md.cm_max=2*10^9*ones(md.numberofnodes,1); @@ -22,10 +22,10 @@ %Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'RheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'}; +field_names ={'Gradient' 'Misfits' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'}; field_tolerances={1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09}; field_values={... PatchToVec(md.results.DiagnosticSolution.Gradient1),... md.results.DiagnosticSolution.J,... - PatchToVec(md.results.DiagnosticSolution.RheologyB),... + PatchToVec(md.results.DiagnosticSolution.MaterialsRheologyB),... PatchToVec(md.results.DiagnosticSolution.Pressure),... PatchToVec(md.results.DiagnosticSolution.Vel),... Index: /issm/trunk/test/NightlyRun/test230.m =================================================================== --- /issm/trunk/test/NightlyRun/test230.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test230.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',200000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1); @@ -7,5 +7,5 @@ %control parameters md.control_analysis=1; -md.control_type={'RheologyBbar'}; +md.control_type={'MaterialsRheologyBbar'}; md.cm_min=10^6*ones(md.numberofnodes,1); md.cm_max=2*10^9*ones(md.numberofnodes,1); @@ -22,10 +22,10 @@ %Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'RheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'}; +field_names ={'Gradient' 'Misfits' 'MaterialsRheologyBbar' 'Pressure' 'Vel' 'Vx' 'Vy'}; field_tolerances={1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09}; field_values={... PatchToVec(md.results.DiagnosticSolution.Gradient1),... md.results.DiagnosticSolution.J,... - PatchToVec(md.results.DiagnosticSolution.RheologyB),... + PatchToVec(md.results.DiagnosticSolution.MaterialsRheologyB),... PatchToVec(md.results.DiagnosticSolution.Pressure),... PatchToVec(md.results.DiagnosticSolution.Vel),... Index: /issm/trunk/test/NightlyRun/test232.m =================================================================== --- /issm/trunk/test/NightlyRun/test232.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test232.m (revision 9641) @@ -1,5 +1,5 @@ md=mesh(model,'../Exp/SquareHole.exp','../Exp/Rifts.exp',50000); md=meshprocessrifts(md,'../Exp/Square.exp'); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test233.m =================================================================== --- /issm/trunk/test/NightlyRun/test233.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test233.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=setelementstype(md,'macayeal','all'); @@ -55,5 +55,5 @@ pos=find(md.y==ymax); nodeonicefront(pos)=1; pos=find(nodeonicefront(md.segments(:,1)) | nodeonicefront(md.segments(:,2))); pressureload=md.segments(pos,:); -pressureload=[pressureload 1*md.elementoniceshelf(pressureload(:,end))]; +pressureload=[pressureload 1*md.mask.elementonfloatingice(pressureload(:,end))]; md.pressureload=pressureload; Index: /issm/trunk/test/NightlyRun/test234.m =================================================================== --- /issm/trunk/test/NightlyRun/test234.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test234.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=setelementstype(md,'macayeal','all'); @@ -55,5 +55,5 @@ pos=find(md.y==ymax); nodeonicefront(pos)=1; pos=find(nodeonicefront(md.segments(:,1)) | nodeonicefront(md.segments(:,2))); pressureload=md.segments(pos,:); -pressureload=[pressureload 1*md.elementoniceshelf(pressureload(:,end))]; +pressureload=[pressureload 1*md.mask.elementonfloatingice(pressureload(:,end))]; md.pressureload=pressureload; Index: /issm/trunk/test/NightlyRun/test235.m =================================================================== --- /issm/trunk/test/NightlyRun/test235.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test235.m (revision 9641) @@ -1,4 +1,4 @@ md=squaremesh(model,1000000,1000000,5,5); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=setelementstype(md,'macayeal','all'); @@ -52,5 +52,5 @@ pos=find(md.y==ymax); nodeonicefront(pos)=1; pos=find(nodeonicefront(md.segments(:,1)) | nodeonicefront(md.segments(:,2))); pressureload=md.segments(pos,:); -pressureload=[pressureload 1*md.elementoniceshelf(pressureload(:,end))]; +pressureload=[pressureload 1*md.mask.elementonfloatingice(pressureload(:,end))]; md.pressureload=pressureload; @@ -62,5 +62,5 @@ %Dakota options %variables -md.variables.rheology_B=normal_uncertain('scaled_RheologyB',1,.5); +md.variables.rheology_B=normal_uncertain('scaled_MaterialsRheologyB',1,.5); %responses @@ -85,5 +85,5 @@ %Fields and tolerances to track changes md=tres(md,'dakota'); -md.results.dakota.importancefactors=importancefactors(md,'scaled_RheologyB','MaxVel')'; +md.results.dakota.importancefactors=importancefactors(md,'scaled_MaterialsRheologyB','MaxVel')'; field_names ={'importancefactors'}; field_tolerances={1e-10}; Index: /issm/trunk/test/NightlyRun/test236.m =================================================================== --- /issm/trunk/test/NightlyRun/test236.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test236.m (revision 9641) @@ -1,4 +1,4 @@ md=squaremesh(model,1000000,1000000,5,5); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=setelementstype(md,'macayeal','all'); @@ -52,5 +52,5 @@ pos=find(md.y==ymax); nodeonicefront(pos)=1; pos=find(nodeonicefront(md.segments(:,1)) | nodeonicefront(md.segments(:,2))); pressureload=md.segments(pos,:); -pressureload=[pressureload 1*md.elementoniceshelf(pressureload(:,end))]; +pressureload=[pressureload 1*md.mask.elementonfloatingice(pressureload(:,end))]; md.pressureload=pressureload; @@ -62,5 +62,5 @@ %Dakota options %variables -md.variables.rheology_B=normal_uncertain('scaled_RheologyB',1,.05); +md.variables.rheology_B=normal_uncertain('scaled_MaterialsRheologyB',1,.05); %responses @@ -85,5 +85,5 @@ %Fields and tolerances to track changes md=tres(md,'dakota'); -md.results.dakota.importancefactors=importancefactors(md,'scaled_RheologyB','MaxVel')'; +md.results.dakota.importancefactors=importancefactors(md,'scaled_MaterialsRheologyB','MaxVel')'; field_names ={'importancefactors'}; field_tolerances={1e-10}; Index: /issm/trunk/test/NightlyRun/test237.m =================================================================== --- /issm/trunk/test/NightlyRun/test237.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test237.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,2); Index: /issm/trunk/test/NightlyRun/test238.m =================================================================== --- /issm/trunk/test/NightlyRun/test238.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test238.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,2); Index: /issm/trunk/test/NightlyRun/test239.m =================================================================== --- /issm/trunk/test/NightlyRun/test239.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test239.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',120000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,2,1); Index: /issm/trunk/test/NightlyRun/test240.m =================================================================== --- /issm/trunk/test/NightlyRun/test240.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test240.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',120000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,2,1); Index: /issm/trunk/test/NightlyRun/test241.m =================================================================== --- /issm/trunk/test/NightlyRun/test241.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test241.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',120000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,2,1); Index: /issm/trunk/test/NightlyRun/test242.m =================================================================== --- /issm/trunk/test/NightlyRun/test242.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test242.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',120000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,2,1); Index: /issm/trunk/test/NightlyRun/test243.m =================================================================== --- /issm/trunk/test/NightlyRun/test243.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test243.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test244.m =================================================================== --- /issm/trunk/test/NightlyRun/test244.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test244.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test245.m =================================================================== --- /issm/trunk/test/NightlyRun/test245.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test245.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test246.m =================================================================== --- /issm/trunk/test/NightlyRun/test246.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test246.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test247.m =================================================================== --- /issm/trunk/test/NightlyRun/test247.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test247.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',200000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test248.m =================================================================== --- /issm/trunk/test/NightlyRun/test248.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test248.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',200000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test249.m =================================================================== --- /issm/trunk/test/NightlyRun/test249.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test249.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',200000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test250.m =================================================================== --- /issm/trunk/test/NightlyRun/test250.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test250.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',200000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test251.m =================================================================== --- /issm/trunk/test/NightlyRun/test251.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test251.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test252.m =================================================================== --- /issm/trunk/test/NightlyRun/test252.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test252.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test253.m =================================================================== --- /issm/trunk/test/NightlyRun/test253.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test253.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',200000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test254.m =================================================================== --- /issm/trunk/test/NightlyRun/test254.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test254.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',200000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test255.m =================================================================== --- /issm/trunk/test/NightlyRun/test255.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test255.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test256.m =================================================================== --- /issm/trunk/test/NightlyRun/test256.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test256.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test257.m =================================================================== --- /issm/trunk/test/NightlyRun/test257.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test257.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test258.m =================================================================== --- /issm/trunk/test/NightlyRun/test258.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test258.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test259.m =================================================================== --- /issm/trunk/test/NightlyRun/test259.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test259.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',350000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test260.m =================================================================== --- /issm/trunk/test/NightlyRun/test260.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test260.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',350000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test261.m =================================================================== --- /issm/trunk/test/NightlyRun/test261.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test261.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',350000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test262.m =================================================================== --- /issm/trunk/test/NightlyRun/test262.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test262.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',350000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test263.m =================================================================== --- /issm/trunk/test/NightlyRun/test263.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test263.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test264.m =================================================================== --- /issm/trunk/test/NightlyRun/test264.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test264.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test265.m =================================================================== --- /issm/trunk/test/NightlyRun/test265.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test265.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',200000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test266.m =================================================================== --- /issm/trunk/test/NightlyRun/test266.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test266.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',200000); -md=geography(md,'all',''); +md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test301.m =================================================================== --- /issm/trunk/test/NightlyRun/test301.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test301.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test302.m =================================================================== --- /issm/trunk/test/NightlyRun/test302.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test302.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test303.m =================================================================== --- /issm/trunk/test/NightlyRun/test303.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test303.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=setelementstype(md,'hutter','all'); Index: /issm/trunk/test/NightlyRun/test304.m =================================================================== --- /issm/trunk/test/NightlyRun/test304.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test304.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=setelementstype(md,'hutter','all'); Index: /issm/trunk/test/NightlyRun/test305.m =================================================================== --- /issm/trunk/test/NightlyRun/test305.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test305.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=setelementstype(md,'hutter','../Exp/SquareHalfRight.exp','fill','macayeal'); Index: /issm/trunk/test/NightlyRun/test306.m =================================================================== --- /issm/trunk/test/NightlyRun/test306.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test306.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=setelementstype(md,'hutter','../Exp/SquareHalfRight.exp','fill','macayeal'); Index: /issm/trunk/test/NightlyRun/test307.m =================================================================== --- /issm/trunk/test/NightlyRun/test307.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test307.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,3,2); Index: /issm/trunk/test/NightlyRun/test308.m =================================================================== --- /issm/trunk/test/NightlyRun/test308.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test308.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,3,2); Index: /issm/trunk/test/NightlyRun/test309.m =================================================================== --- /issm/trunk/test/NightlyRun/test309.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test309.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,5,2); Index: /issm/trunk/test/NightlyRun/test310.m =================================================================== --- /issm/trunk/test/NightlyRun/test310.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test310.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,5,2); Index: /issm/trunk/test/NightlyRun/test311.m =================================================================== --- /issm/trunk/test/NightlyRun/test311.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test311.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,4,2); Index: /issm/trunk/test/NightlyRun/test312.m =================================================================== --- /issm/trunk/test/NightlyRun/test312.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test312.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,4,2); Index: /issm/trunk/test/NightlyRun/test313.m =================================================================== --- /issm/trunk/test/NightlyRun/test313.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test313.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test314.m =================================================================== --- /issm/trunk/test/NightlyRun/test314.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test314.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test315.m =================================================================== --- /issm/trunk/test/NightlyRun/test315.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test315.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test316.m =================================================================== --- /issm/trunk/test/NightlyRun/test316.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test316.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test317.m =================================================================== --- /issm/trunk/test/NightlyRun/test317.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test317.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test318.m =================================================================== --- /issm/trunk/test/NightlyRun/test318.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test318.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test319.m =================================================================== --- /issm/trunk/test/NightlyRun/test319.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test319.m (revision 9641) @@ -1,5 +1,5 @@ md=mesh(model,'../Exp/Square.exp',150000); md=meshconvert(md); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test320.m =================================================================== --- /issm/trunk/test/NightlyRun/test320.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test320.m (revision 9641) @@ -1,5 +1,5 @@ md=mesh(model,'../Exp/Square.exp',150000); md=meshconvert(md); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test321.m =================================================================== --- /issm/trunk/test/NightlyRun/test321.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test321.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test322.m =================================================================== --- /issm/trunk/test/NightlyRun/test322.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test322.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test323.m =================================================================== --- /issm/trunk/test/NightlyRun/test323.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test323.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test324.m =================================================================== --- /issm/trunk/test/NightlyRun/test324.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test324.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test325.m =================================================================== --- /issm/trunk/test/NightlyRun/test325.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test325.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test326.m =================================================================== --- /issm/trunk/test/NightlyRun/test326.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test326.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test327.m =================================================================== --- /issm/trunk/test/NightlyRun/test327.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test327.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=setelementstype(md,'hutter','all'); Index: /issm/trunk/test/NightlyRun/test328.m =================================================================== --- /issm/trunk/test/NightlyRun/test328.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test328.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=setelementstype(md,'hutter','all'); Index: /issm/trunk/test/NightlyRun/test329.m =================================================================== --- /issm/trunk/test/NightlyRun/test329.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test329.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,5,1.2); Index: /issm/trunk/test/NightlyRun/test330.m =================================================================== --- /issm/trunk/test/NightlyRun/test330.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test330.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,5,1.2); Index: /issm/trunk/test/NightlyRun/test331.m =================================================================== --- /issm/trunk/test/NightlyRun/test331.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test331.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test332.m =================================================================== --- /issm/trunk/test/NightlyRun/test332.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test332.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test333.m =================================================================== --- /issm/trunk/test/NightlyRun/test333.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test333.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',200000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test334.m =================================================================== --- /issm/trunk/test/NightlyRun/test334.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test334.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',200000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test335.m =================================================================== --- /issm/trunk/test/NightlyRun/test335.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test335.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,4,1); Index: /issm/trunk/test/NightlyRun/test336.m =================================================================== --- /issm/trunk/test/NightlyRun/test336.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test336.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,4,1); Index: /issm/trunk/test/NightlyRun/test337.m =================================================================== --- /issm/trunk/test/NightlyRun/test337.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test337.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',200000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test338.m =================================================================== --- /issm/trunk/test/NightlyRun/test338.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test338.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',200000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test339.m =================================================================== --- /issm/trunk/test/NightlyRun/test339.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test339.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',200000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test340.m =================================================================== --- /issm/trunk/test/NightlyRun/test340.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test340.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',200000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test341.m =================================================================== --- /issm/trunk/test/NightlyRun/test341.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test341.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',200000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test342.m =================================================================== --- /issm/trunk/test/NightlyRun/test342.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test342.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',200000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test343.m =================================================================== --- /issm/trunk/test/NightlyRun/test343.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test343.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',200000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test344.m =================================================================== --- /issm/trunk/test/NightlyRun/test344.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test344.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',200000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test345.m =================================================================== --- /issm/trunk/test/NightlyRun/test345.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test345.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test346.m =================================================================== --- /issm/trunk/test/NightlyRun/test346.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test346.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test347.m =================================================================== --- /issm/trunk/test/NightlyRun/test347.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test347.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',200000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,4,1.2); Index: /issm/trunk/test/NightlyRun/test348.m =================================================================== --- /issm/trunk/test/NightlyRun/test348.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test348.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'',''); +md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,5,1.2); Index: /issm/trunk/test/NightlyRun/test401.m =================================================================== --- /issm/trunk/test/NightlyRun/test401.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test401.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'../Exp/SquareShelf.exp',''); +md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test402.m =================================================================== --- /issm/trunk/test/NightlyRun/test402.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test402.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'../Exp/SquareShelf.exp',''); +md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test403.m =================================================================== --- /issm/trunk/test/NightlyRun/test403.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test403.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'../Exp/SquareShelf.exp',''); +md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,4,1); Index: /issm/trunk/test/NightlyRun/test404.m =================================================================== --- /issm/trunk/test/NightlyRun/test404.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test404.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'../Exp/SquareShelf.exp',''); +md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,4,1); Index: /issm/trunk/test/NightlyRun/test405.m =================================================================== --- /issm/trunk/test/NightlyRun/test405.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test405.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'../Exp/SquareShelf.exp',''); +md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,5,1); Index: /issm/trunk/test/NightlyRun/test406.m =================================================================== --- /issm/trunk/test/NightlyRun/test406.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test406.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'../Exp/SquareShelf.exp',''); +md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,5,1); Index: /issm/trunk/test/NightlyRun/test407.m =================================================================== --- /issm/trunk/test/NightlyRun/test407.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test407.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'../Exp/SquareShelf.exp',''); +md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test408.m =================================================================== --- /issm/trunk/test/NightlyRun/test408.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test408.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'../Exp/SquareShelf.exp',''); +md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test409.m =================================================================== --- /issm/trunk/test/NightlyRun/test409.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test409.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'../Exp/SquareShelf.exp',''); +md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,5,1); Index: /issm/trunk/test/NightlyRun/test410.m =================================================================== --- /issm/trunk/test/NightlyRun/test410.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test410.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'../Exp/SquareShelf.exp',''); +md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,5,1); Index: /issm/trunk/test/NightlyRun/test411.m =================================================================== --- /issm/trunk/test/NightlyRun/test411.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test411.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'../Exp/SquareShelf.exp',''); +md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,4,1); Index: /issm/trunk/test/NightlyRun/test412.m =================================================================== --- /issm/trunk/test/NightlyRun/test412.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test412.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'../Exp/SquareShelf.exp',''); +md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,4,1); Index: /issm/trunk/test/NightlyRun/test413.m =================================================================== --- /issm/trunk/test/NightlyRun/test413.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test413.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'../Exp/SquareShelf.exp',''); +md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,4,1); Index: /issm/trunk/test/NightlyRun/test414.m =================================================================== --- /issm/trunk/test/NightlyRun/test414.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test414.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'../Exp/SquareShelf.exp',''); +md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,4,1); Index: /issm/trunk/test/NightlyRun/test415.m =================================================================== --- /issm/trunk/test/NightlyRun/test415.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test415.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'../Exp/SquareShelf.exp',''); +md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test416.m =================================================================== --- /issm/trunk/test/NightlyRun/test416.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test416.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'../Exp/SquareShelf.exp',''); +md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test417.m =================================================================== --- /issm/trunk/test/NightlyRun/test417.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test417.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'../Exp/SquareShelf.exp',''); +md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test418.m =================================================================== --- /issm/trunk/test/NightlyRun/test418.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test418.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'../Exp/SquareShelf.exp',''); +md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test419.m =================================================================== --- /issm/trunk/test/NightlyRun/test419.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test419.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'../Exp/SquareShelf.exp',''); +md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,3,2); Index: /issm/trunk/test/NightlyRun/test420.m =================================================================== --- /issm/trunk/test/NightlyRun/test420.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test420.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'../Exp/SquareShelf.exp',''); +md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,3,2); Index: /issm/trunk/test/NightlyRun/test421.m =================================================================== --- /issm/trunk/test/NightlyRun/test421.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test421.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'../Exp/SquareShelf.exp',''); +md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,3,2); Index: /issm/trunk/test/NightlyRun/test422.m =================================================================== --- /issm/trunk/test/NightlyRun/test422.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test422.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'../Exp/SquareShelf.exp',''); +md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,3,2); Index: /issm/trunk/test/NightlyRun/test423.m =================================================================== --- /issm/trunk/test/NightlyRun/test423.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test423.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',300000); -md=geography(md,'../Exp/SquareShelf.exp',''); +md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test424.m =================================================================== --- /issm/trunk/test/NightlyRun/test424.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test424.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',300000); -md=geography(md,'../Exp/SquareShelf.exp',''); +md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test425.m =================================================================== --- /issm/trunk/test/NightlyRun/test425.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test425.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'../Exp/SquareShelf.exp',''); +md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test426.m =================================================================== --- /issm/trunk/test/NightlyRun/test426.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test426.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'../Exp/SquareShelf.exp',''); +md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test427.m =================================================================== --- /issm/trunk/test/NightlyRun/test427.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test427.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'../Exp/SquareShelf.exp',''); +md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test428.m =================================================================== --- /issm/trunk/test/NightlyRun/test428.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test428.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'../Exp/SquareShelf.exp',''); +md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test429.m =================================================================== --- /issm/trunk/test/NightlyRun/test429.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test429.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',170000); -md=geography(md,'../Exp/SquareShelf.exp',''); +md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test430.m =================================================================== --- /issm/trunk/test/NightlyRun/test430.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test430.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',170000); -md=geography(md,'../Exp/SquareShelf.exp',''); +md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test431.m =================================================================== --- /issm/trunk/test/NightlyRun/test431.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test431.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',170000); -md=geography(md,'../Exp/SquareShelf.exp',''); +md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test432.m =================================================================== --- /issm/trunk/test/NightlyRun/test432.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test432.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',170000); -md=geography(md,'../Exp/SquareShelf.exp',''); +md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test434.m =================================================================== --- /issm/trunk/test/NightlyRun/test434.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test434.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',150000); -md=geography(md,'../Exp/SquareShelf.exp',''); +md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test435.m =================================================================== --- /issm/trunk/test/NightlyRun/test435.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test435.m (revision 9641) @@ -1,5 +1,5 @@ %test partitioning, and partition averaging md=mesh(model,'../Exp/Square.exp',30000); -md=geography(md,'../Exp/SquareShelf.exp',''); +md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test437.m =================================================================== --- /issm/trunk/test/NightlyRun/test437.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test437.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'../Exp/SquareShelf.exp',''); +md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,5,1); Index: /issm/trunk/test/NightlyRun/test438.m =================================================================== --- /issm/trunk/test/NightlyRun/test438.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test438.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'../Exp/SquareShelf.exp',''); +md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,5,1); Index: /issm/trunk/test/NightlyRun/test439.m =================================================================== --- /issm/trunk/test/NightlyRun/test439.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test439.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',200000); -md=geography(md,'../Exp/SquareShelf.exp',''); +md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test440.m =================================================================== --- /issm/trunk/test/NightlyRun/test440.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test440.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',200000); -md=geography(md,'../Exp/SquareShelf.exp',''); +md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test441.m =================================================================== --- /issm/trunk/test/NightlyRun/test441.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test441.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'../Exp/SquareShelf.exp',''); +md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,5,1); Index: /issm/trunk/test/NightlyRun/test442.m =================================================================== --- /issm/trunk/test/NightlyRun/test442.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test442.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'../Exp/SquareShelf.exp',''); +md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,5,1); Index: /issm/trunk/test/NightlyRun/test443.m =================================================================== --- /issm/trunk/test/NightlyRun/test443.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test443.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'../Exp/SquareShelf.exp',''); +md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,5,1); Index: /issm/trunk/test/NightlyRun/test444.m =================================================================== --- /issm/trunk/test/NightlyRun/test444.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test444.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Square.exp',180000); -md=geography(md,'../Exp/SquareShelf.exp',''); +md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,5,1); Index: /issm/trunk/test/NightlyRun/test446.m =================================================================== --- /issm/trunk/test/NightlyRun/test446.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test446.m (revision 9641) @@ -17,5 +17,5 @@ flags(pos)=1; flags2=zeros(md.numberofelements,1); -md=geography(md,flags,flags2); +md=setmask(md,flags,flags2); %}}} md=parameterize(md,'../Par/RoundSheetShelf.par'); Index: /issm/trunk/test/NightlyRun/test501.m =================================================================== --- /issm/trunk/test/NightlyRun/test501.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test501.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Pig.exp',20000); -md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); +md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test502.m =================================================================== --- /issm/trunk/test/NightlyRun/test502.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test502.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Pig.exp',20000); -md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); +md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test503.m =================================================================== --- /issm/trunk/test/NightlyRun/test503.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test503.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Pig.exp',20000); -md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); +md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); md=extrude(md,3,0.9); Index: /issm/trunk/test/NightlyRun/test504.m =================================================================== --- /issm/trunk/test/NightlyRun/test504.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test504.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Pig.exp',20000); -md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); +md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); md=extrude(md,3,0.9); Index: /issm/trunk/test/NightlyRun/test505.m =================================================================== --- /issm/trunk/test/NightlyRun/test505.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test505.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Pig.exp',20000); -md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); +md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); md=extrude(md,3,0.9); Index: /issm/trunk/test/NightlyRun/test506.m =================================================================== --- /issm/trunk/test/NightlyRun/test506.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test506.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Pig.exp',20000); -md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); +md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); md=extrude(md,3,0.9); Index: /issm/trunk/test/NightlyRun/test507.m =================================================================== --- /issm/trunk/test/NightlyRun/test507.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test507.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Pig.exp',20000); -md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); +md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test508.m =================================================================== --- /issm/trunk/test/NightlyRun/test508.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test508.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Pig.exp',20000); -md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); +md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test509.m =================================================================== --- /issm/trunk/test/NightlyRun/test509.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test509.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Pig.exp',30000); -md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); +md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test510.m =================================================================== --- /issm/trunk/test/NightlyRun/test510.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test510.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Pig.exp',30000); -md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); +md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test511.m =================================================================== --- /issm/trunk/test/NightlyRun/test511.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test511.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Pig.exp',30000); -md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); +md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); md=extrude(md,2,1); Index: /issm/trunk/test/NightlyRun/test512.m =================================================================== --- /issm/trunk/test/NightlyRun/test512.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test512.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Pig.exp',30000); -md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); +md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); md=extrude(md,2,1); Index: /issm/trunk/test/NightlyRun/test513.m =================================================================== --- /issm/trunk/test/NightlyRun/test513.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test513.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Pig.exp',30000); -md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); +md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); md=extrude(md,2,1); Index: /issm/trunk/test/NightlyRun/test514.m =================================================================== --- /issm/trunk/test/NightlyRun/test514.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test514.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Pig.exp',30000); -md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); +md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); md=extrude(md,2,1); Index: /issm/trunk/test/NightlyRun/test515.m =================================================================== --- /issm/trunk/test/NightlyRun/test515.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test515.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Pig.exp',30000); -md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); +md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); md=extrude(md,4,1.1); Index: /issm/trunk/test/NightlyRun/test516.m =================================================================== --- /issm/trunk/test/NightlyRun/test516.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test516.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Pig.exp',30000); -md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); +md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); md=extrude(md,4,1.1); Index: /issm/trunk/test/NightlyRun/test517.m =================================================================== --- /issm/trunk/test/NightlyRun/test517.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test517.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Pig.exp',30000); -md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); +md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test518.m =================================================================== --- /issm/trunk/test/NightlyRun/test518.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test518.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Pig.exp',30000); -md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); +md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test519.m =================================================================== --- /issm/trunk/test/NightlyRun/test519.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test519.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Pig.exp',20000); -md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); +md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); md=extrude(md,2,1); Index: /issm/trunk/test/NightlyRun/test520.m =================================================================== --- /issm/trunk/test/NightlyRun/test520.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test520.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Pig.exp',20000); -md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); +md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); md=extrude(md,2,1); Index: /issm/trunk/test/NightlyRun/test521.m =================================================================== --- /issm/trunk/test/NightlyRun/test521.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test521.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Pig.exp',10000); -md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); +md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); @@ -8,9 +8,9 @@ md=extrude(md,3,1); md=setelementstype(md,'stokes','all'); -md=modelextract(md,md.elementoniceshelf); +md=modelextract(md,md.mask.elementonfloatingice); %control parameters md.control_analysis=1; -md.control_type={'RheologyBbar'}; +md.control_type={'MaterialsRheologyBbar'}; md.cm_min=10^6*ones(md.numberofnodes,1); md.cm_max=2*10^9*ones(md.numberofnodes,1); @@ -27,10 +27,10 @@ %Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'RheologyB' 'Pressure' 'Vel' 'Vx' 'Vy'}; +field_names ={'Gradient' 'Misfits' 'MaterialsRheologyB' 'Pressure' 'Vel' 'Vx' 'Vy'}; field_tolerances={1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10}; field_values={... PatchToVec(md.results.DiagnosticSolution.Gradient1),... md.results.DiagnosticSolution.J,... - PatchToVec(md.results.DiagnosticSolution.RheologyB),... + PatchToVec(md.results.DiagnosticSolution.MaterialsRheologyB),... PatchToVec(md.results.DiagnosticSolution.Pressure),... PatchToVec(md.results.DiagnosticSolution.Vel),... Index: /issm/trunk/test/NightlyRun/test522.m =================================================================== --- /issm/trunk/test/NightlyRun/test522.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test522.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Pig.exp',10000); -md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); +md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); @@ -8,9 +8,9 @@ md=extrude(md,3,1); md=setelementstype(md,'stokes','all'); -md=modelextract(md,md.elementoniceshelf); +md=modelextract(md,md.mask.elementonfloatingice); %control parameters md.control_analysis=1; -md.control_type={'RheologyBbar'}; +md.control_type={'MaterialsRheologyBbar'}; md.cm_min=10^6*ones(md.numberofnodes,1); md.cm_max=2*10^9*ones(md.numberofnodes,1); @@ -27,10 +27,10 @@ %Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'RheologyB' 'Pressure' 'Vel' 'Vx' 'Vy'}; +field_names ={'Gradient' 'Misfits' 'MaterialsRheologyB' 'Pressure' 'Vel' 'Vx' 'Vy'}; field_tolerances={1e-11,1e-12,1e-12,1e-09,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12}; field_values={... PatchToVec(md.results.DiagnosticSolution.Gradient1),... md.results.DiagnosticSolution.J,... - PatchToVec(md.results.DiagnosticSolution.RheologyB),... + PatchToVec(md.results.DiagnosticSolution.MaterialsRheologyB),... PatchToVec(md.results.DiagnosticSolution.Pressure),... PatchToVec(md.results.DiagnosticSolution.Vel),... Index: /issm/trunk/test/NightlyRun/test523.m =================================================================== --- /issm/trunk/test/NightlyRun/test523.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test523.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Pig.exp',20000); -md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); +md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test524.m =================================================================== --- /issm/trunk/test/NightlyRun/test524.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test524.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Pig.exp',20000); -md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); +md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test525.m =================================================================== --- /issm/trunk/test/NightlyRun/test525.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test525.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Pig.exp',30000); -md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); +md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test526.m =================================================================== --- /issm/trunk/test/NightlyRun/test526.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test526.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Pig.exp',30000); -md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); +md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test527.m =================================================================== --- /issm/trunk/test/NightlyRun/test527.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test527.m (revision 9641) @@ -8,5 +8,5 @@ %Simple mesh 2 md=bamg(model,'domain','../Exp/Pig.exp','hmax',10000); -md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); +md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); x2=md.x; Index: /issm/trunk/test/NightlyRun/test529.m =================================================================== --- /issm/trunk/test/NightlyRun/test529.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test529.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Pig.exp',30000); -md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); +md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test530.m =================================================================== --- /issm/trunk/test/NightlyRun/test530.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test530.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Pig.exp',30000); -md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); +md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test531.m =================================================================== --- /issm/trunk/test/NightlyRun/test531.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test531.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Pig.exp',30000); -md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); +md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test532.m =================================================================== --- /issm/trunk/test/NightlyRun/test532.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test532.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/Pig.exp',30000); -md=geography(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); +md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test601.m =================================================================== --- /issm/trunk/test/NightlyRun/test601.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test601.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/79North.exp',10000); -md=geography(md,'../Exp/79NorthShelf.exp',''); +md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test602.m =================================================================== --- /issm/trunk/test/NightlyRun/test602.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test602.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/79North.exp',10000); -md=geography(md,'../Exp/79NorthShelf.exp',''); +md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test603.m =================================================================== --- /issm/trunk/test/NightlyRun/test603.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test603.m (revision 9641) @@ -1,5 +1,5 @@ md=mesh(model,'../Exp/79North.exp',10000); md=meshconvert(md); -md=geography(md,'../Exp/79NorthShelf.exp',''); +md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test604.m =================================================================== --- /issm/trunk/test/NightlyRun/test604.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test604.m (revision 9641) @@ -1,5 +1,5 @@ md=mesh(model,'../Exp/79North.exp',10000); md=meshconvert(md); -md=geography(md,'../Exp/79NorthShelf.exp',''); +md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test605.m =================================================================== --- /issm/trunk/test/NightlyRun/test605.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test605.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/79North.exp',10000); -md=geography(md,'../Exp/79NorthShelf.exp',''); +md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); md=extrude(md,6,1); Index: /issm/trunk/test/NightlyRun/test606.m =================================================================== --- /issm/trunk/test/NightlyRun/test606.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test606.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/79North.exp',10000); -md=geography(md,'../Exp/79NorthShelf.exp',''); +md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); md=extrude(md,6,1); Index: /issm/trunk/test/NightlyRun/test607.m =================================================================== --- /issm/trunk/test/NightlyRun/test607.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test607.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/79North.exp',10000); -md=geography(md,'../Exp/79NorthShelf.exp',''); +md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test608.m =================================================================== --- /issm/trunk/test/NightlyRun/test608.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test608.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/79North.exp',10000); -md=geography(md,'../Exp/79NorthShelf.exp',''); +md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test609.m =================================================================== --- /issm/trunk/test/NightlyRun/test609.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test609.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/79North.exp',10000); -md=geography(md,'../Exp/79NorthShelf.exp',''); +md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); md=extrude(md,5,1.5); Index: /issm/trunk/test/NightlyRun/test610.m =================================================================== --- /issm/trunk/test/NightlyRun/test610.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test610.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/79North.exp',10000); -md=geography(md,'../Exp/79NorthShelf.exp',''); +md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); md=extrude(md,5,1.5); Index: /issm/trunk/test/NightlyRun/test611.m =================================================================== --- /issm/trunk/test/NightlyRun/test611.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test611.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/79North.exp',10000); -md=geography(md,'../Exp/79NorthShelf.exp',''); +md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test612.m =================================================================== --- /issm/trunk/test/NightlyRun/test612.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test612.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/79North.exp',10000); -md=geography(md,'../Exp/79NorthShelf.exp',''); +md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test613.m =================================================================== --- /issm/trunk/test/NightlyRun/test613.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test613.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/79North.exp',10000); -md=geography(md,'../Exp/79NorthShelf.exp',''); +md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); md=extrude(md,2,1); Index: /issm/trunk/test/NightlyRun/test614.m =================================================================== --- /issm/trunk/test/NightlyRun/test614.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test614.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/79North.exp',10000); -md=geography(md,'../Exp/79NorthShelf.exp',''); +md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); md=extrude(md,2,1); Index: /issm/trunk/test/NightlyRun/test615.m =================================================================== --- /issm/trunk/test/NightlyRun/test615.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test615.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/79North.exp',10000); -md=geography(md,'../Exp/79NorthShelf.exp',''); +md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test616.m =================================================================== --- /issm/trunk/test/NightlyRun/test616.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test616.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/79North.exp',10000); -md=geography(md,'../Exp/79NorthShelf.exp',''); +md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test617.m =================================================================== --- /issm/trunk/test/NightlyRun/test617.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test617.m (revision 9641) @@ -1,5 +1,5 @@ md=mesh(model,'../Exp/79North.exp',10000); md=meshconvert(md); -md=geography(md,'../Exp/79NorthShelf.exp',''); +md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test618.m =================================================================== --- /issm/trunk/test/NightlyRun/test618.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test618.m (revision 9641) @@ -1,5 +1,5 @@ md=mesh(model,'../Exp/79North.exp',10000); md=meshconvert(md); -md=geography(md,'../Exp/79NorthShelf.exp',''); +md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test619.m =================================================================== --- /issm/trunk/test/NightlyRun/test619.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test619.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/79North.exp',10000); -md=geography(md,'../Exp/79NorthShelf.exp',''); +md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test620.m =================================================================== --- /issm/trunk/test/NightlyRun/test620.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test620.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/79North.exp',10000); -md=geography(md,'../Exp/79NorthShelf.exp',''); +md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); md=extrude(md,3,1); Index: /issm/trunk/test/NightlyRun/test621.m =================================================================== --- /issm/trunk/test/NightlyRun/test621.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test621.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/79North.exp',10000); -md=geography(md,'../Exp/79NorthShelf.exp',''); +md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test622.m =================================================================== --- /issm/trunk/test/NightlyRun/test622.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test622.m (revision 9641) @@ -1,4 +1,4 @@ md=mesh(model,'../Exp/79North.exp',10000); -md=geography(md,'../Exp/79NorthShelf.exp',''); +md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test623.m =================================================================== --- /issm/trunk/test/NightlyRun/test623.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test623.m (revision 9641) @@ -1,5 +1,5 @@ md=mesh(model,'../Exp/79North.exp',10000); md=meshconvert(md); -md=geography(md,'../Exp/79NorthShelf.exp',''); +md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test624.m =================================================================== --- /issm/trunk/test/NightlyRun/test624.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test624.m (revision 9641) @@ -1,5 +1,5 @@ md=mesh(model,'../Exp/79North.exp',10000); md=meshconvert(md); -md=geography(md,'../Exp/79NorthShelf.exp',''); +md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); md=setelementstype(md,'macayeal','all'); Index: /issm/trunk/test/NightlyRun/test625.m =================================================================== --- /issm/trunk/test/NightlyRun/test625.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test625.m (revision 9641) @@ -1,10 +1,10 @@ md=mesh(model,'../Exp/79North.exp',10000); md=meshconvert(md); -md=geography(md,'../Exp/79NorthShelf.exp',''); +md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); md=setelementstype(md,'macayeal','all'); %Ice sheet only -md=modelextract(md,md.elementonicesheet); +md=modelextract(md,md.mask.elementongroundedice); pos=find(md.nodeonboundary); md.spcthickness(pos)=md.thickness(pos); Index: /issm/trunk/test/NightlyRun/test626.m =================================================================== --- /issm/trunk/test/NightlyRun/test626.m (revision 9640) +++ /issm/trunk/test/NightlyRun/test626.m (revision 9641) @@ -1,10 +1,10 @@ md=mesh(model,'../Exp/79North.exp',10000); md=meshconvert(md); -md=geography(md,'../Exp/79NorthShelf.exp',''); +md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); md=setelementstype(md,'macayeal','all'); %Ice sheet only -md=modelextract(md,md.elementonicesheet); +md=modelextract(md,md.mask.elementongroundedice); pos=find(md.nodeonboundary); md.spcthickness(pos)=md.thickness(pos); Index: /issm/trunk/test/Par/79North.par =================================================================== --- /issm/trunk/test/Par/79North.par (revision 9640) +++ /issm/trunk/test/Par/79North.par (revision 9641) @@ -16,5 +16,5 @@ %Friction -pos=find(md.elementoniceshelf); +pos=find(md.mask.elementonfloatingice); md.friction.coefficient=50*ones(md.numberofnodes,1); md.friction.coefficient(md.elements(pos,:))=0; @@ -25,5 +25,5 @@ md.basalforcings.melting_rate=zeros(md.numberofnodes,1); pos=zeros(md.numberofnodes,1); -pos(md.elements(find(md.elementoniceshelf),:))=1; +pos(md.elements(find(md.mask.elementonfloatingice),:))=1; md.basalforcings.melting_rate(find(pos))=10; md.surfaceforcings.mass_balance=15*ones(md.numberofnodes,1); Index: /issm/trunk/test/Par/ISMIPA.par =================================================================== --- /issm/trunk/test/Par/ISMIPA.par (revision 9640) +++ /issm/trunk/test/Par/ISMIPA.par (revision 9641) @@ -9,5 +9,5 @@ md.friction.coefficient=200*ones(md.numberofnodes,1); %q=1. %Take care of iceshelves: no basal drag -pos=find(md.elementoniceshelf); +pos=find(md.mask.elementonfloatingice); md.friction.coefficient(md.elements(pos,:))=0; md.friction.p=ones(md.numberofelements,1); Index: /issm/trunk/test/Par/ISMIPB.par =================================================================== --- /issm/trunk/test/Par/ISMIPB.par (revision 9640) +++ /issm/trunk/test/Par/ISMIPB.par (revision 9641) @@ -9,5 +9,5 @@ md.friction.coefficient=200*ones(md.numberofnodes,1); %q=1. %Take care of iceshelves: no basal drag -pos=find(md.elementoniceshelf); +pos=find(md.mask.elementonfloatingice); md.friction.coefficient(md.elements(pos,:))=0; md.friction.p=ones(md.numberofelements,1); Index: /issm/trunk/test/Par/ISMIPC.par =================================================================== --- /issm/trunk/test/Par/ISMIPC.par (revision 9640) +++ /issm/trunk/test/Par/ISMIPC.par (revision 9641) @@ -10,5 +10,5 @@ md.friction.coefficient=sqrt(md.constants.yts.*(1000+1000*sin(md.x*2*pi/max(md.x)).*sin(md.y*2*pi/max(md.x)))); %Take care of iceshelves: no basal drag -pos=find(md.elementoniceshelf); +pos=find(md.mask.elementonfloatingice); md.friction.coefficient(md.elements(pos,:))=0; md.friction.p=ones(md.numberofelements,1); Index: /issm/trunk/test/Par/ISMIPD.par =================================================================== --- /issm/trunk/test/Par/ISMIPD.par (revision 9640) +++ /issm/trunk/test/Par/ISMIPD.par (revision 9641) @@ -9,5 +9,5 @@ md.friction.coefficient=sqrt(md.constants.yts.*(1000+1000*sin(md.x*2*pi/max(md.x)))); %Take care of iceshelves: no basal drag -pos=find(md.elementoniceshelf); +pos=find(md.mask.elementonfloatingice); md.friction.coefficient(md.elements(pos,:))=0; md.friction.p=ones(md.numberofelements,1); Index: /issm/trunk/test/Par/Pig.par =================================================================== --- /issm/trunk/test/Par/Pig.par (revision 9640) +++ /issm/trunk/test/Par/Pig.par (revision 9641) @@ -21,5 +21,5 @@ %Friction -pos=find(md.elementoniceshelf); +pos=find(md.mask.elementonfloatingice); md.friction.coefficient=50*ones(md.numberofnodes,1); md.friction.coefficient(md.elements(pos,:))=0; Index: /issm/trunk/test/Par/RoundSheetShelf.par =================================================================== --- /issm/trunk/test/Par/RoundSheetShelf.par (revision 9640) +++ /issm/trunk/test/Par/RoundSheetShelf.par (revision 9641) @@ -13,5 +13,5 @@ md.bed=-md.materials.rho_ice/md.materials.rho_water*md.thickness; -pos=find(md.nodeonicesheet); +pos=find(md.mask.vertexongroundedice); md.bed(pos)=md.bed(pos)-300*(radius(pos)-(rad-shelfextent))/(rad-shelfextent); md.surface=md.bed+md.thickness; @@ -47,8 +47,8 @@ md.surfaceforcings.mass_balance=-10*ones(md.numberofnodes,1); md.basalforcings.melting_rate=zeros(md.numberofnodes,1); -pos=find(md.nodeoniceshelf);md.basalforcings.melting_rate(pos)=10; +pos=find(md.mask.vertexonfloatingice);md.basalforcings.melting_rate(pos)=10; %Friction -pos=find(md.elementoniceshelf); +pos=find(md.mask.elementonfloatingice); md.friction.coefficient=20*ones(md.numberofnodes,1); md.friction.coefficient(md.elements(pos,:))=0; @@ -59,5 +59,5 @@ md.viscosity_overshoot=0.0; md.artificial_diffusivity=1; -md.thermal.stabilisation=1; +md.thermal.stabilization=1; md.verbose=verbose(0); md.waitonlock=30; @@ -71,5 +71,5 @@ md.groundingline.migration='AgressiveMigration'; md.bathymetry=md.bed; -pos=find(md.nodeoniceshelf); md.bathymetry(pos)=md.bed(pos)-900; +pos=find(md.mask.vertexonfloatingice); md.bathymetry(pos)=md.bed(pos)-900; %Deal with boundary conditions: @@ -83,5 +83,5 @@ pressureload=md.segments; -pressureload=[pressureload 1*md.elementoniceshelf(pressureload(:,end)) + 0*md.elementonicesheet(pressureload(:,end))]; +pressureload=[pressureload 1*md.mask.elementonfloatingice(pressureload(:,end)) + 0*md.mask.elementongroundedice(pressureload(:,end))]; md.pressureload=pressureload; md.spcthickness=NaN*ones(md.numberofnodes,1); Index: /issm/trunk/test/Par/RoundSheetStaticEISMINT.par =================================================================== --- /issm/trunk/test/Par/RoundSheetStaticEISMINT.par (revision 9640) +++ /issm/trunk/test/Par/RoundSheetStaticEISMINT.par (revision 9641) @@ -11,5 +11,5 @@ md.friction.coefficient=20*ones(md.numberofnodes,1); %q=1. %no drag is specified in the analytical solution %Take care of iceshelves: no basal drag -pos=find(md.elementoniceshelf); +pos=find(md.mask.elementonfloatingice); md.friction.coefficient(md.elements(pos,:))=0; md.friction.p=ones(md.numberofelements,1); Index: /issm/trunk/test/Par/SquareEISMINT.par =================================================================== --- /issm/trunk/test/Par/SquareEISMINT.par (revision 9640) +++ /issm/trunk/test/Par/SquareEISMINT.par (revision 9641) @@ -11,5 +11,5 @@ md.friction.coefficient=200*ones(md.numberofnodes,1); %q=1. %Take care of iceshelves: no basal drag -pos=find(md.elementoniceshelf); +pos=find(md.mask.elementonfloatingice); md.friction.coefficient(md.elements(pos,:))=0; md.friction.p=ones(md.numberofelements,1); Index: /issm/trunk/test/Par/SquareSheetConstrained.par =================================================================== --- /issm/trunk/test/Par/SquareSheetConstrained.par (revision 9640) +++ /issm/trunk/test/Par/SquareSheetConstrained.par (revision 9641) @@ -24,5 +24,5 @@ %Friction -pos=find(md.elementoniceshelf); +pos=find(md.mask.elementonfloatingice); md.friction.coefficient=20*ones(md.numberofnodes,1); md.friction.coefficient(md.elements(pos,:))=0; Index: /issm/trunk/test/Par/SquareSheetShelf.par =================================================================== --- /issm/trunk/test/Par/SquareSheetShelf.par (revision 9640) +++ /issm/trunk/test/Par/SquareSheetShelf.par (revision 9641) @@ -31,5 +31,5 @@ %Friction -pos=find(md.elementoniceshelf); +pos=find(md.mask.elementonfloatingice); md.friction.coefficient=20*ones(md.numberofnodes,1); md.friction.coefficient(md.elements(pos,:))=0; Index: /issm/trunk/test/Par/SquareShelf.par =================================================================== --- /issm/trunk/test/Par/SquareShelf.par (revision 9640) +++ /issm/trunk/test/Par/SquareShelf.par (revision 9641) @@ -24,5 +24,5 @@ %Friction -pos=find(md.elementoniceshelf); +pos=find(md.mask.elementonfloatingice); md.friction.coefficient=20*ones(md.numberofnodes,1); md.friction.coefficient(md.elements(pos,:))=0; Index: /issm/trunk/test/Par/SquareShelfConstrained.par =================================================================== --- /issm/trunk/test/Par/SquareShelfConstrained.par (revision 9640) +++ /issm/trunk/test/Par/SquareShelfConstrained.par (revision 9641) @@ -28,5 +28,5 @@ %Friction -pos=find(md.elementoniceshelf); +pos=find(md.mask.elementonfloatingice); md.friction.coefficient=20*ones(md.numberofnodes,1); md.friction.coefficient(md.elements(pos,:))=0; Index: /issm/trunk/test/Par/SquareThermal.par =================================================================== --- /issm/trunk/test/Par/SquareThermal.par (revision 9640) +++ /issm/trunk/test/Par/SquareThermal.par (revision 9641) @@ -17,5 +17,5 @@ md.friction.coefficient=200*ones(md.numberofnodes,1); %q=1. %Take care of iceshelves: no basal drag -pos=find(md.elementoniceshelf); +pos=find(md.mask.elementonfloatingice); md.friction.coefficient(md.elements(pos,:))=0; md.friction.p=ones(md.numberofelements,1); @@ -41,3 +41,3 @@ md.thermal.spctemperature(:)=md.temperature; md.basalforcings.geothermalflux=zeros(md.numberofnodes,1); -pos=find(md.elementonicesheet);md.basalforcings.geothermalflux(md.elements(pos,:))=1*10^-3; %1 mW/m^2 +pos=find(md.mask.elementongroundedice);md.basalforcings.geothermalflux(md.elements(pos,:))=1*10^-3; %1 mW/m^2