Index: /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h =================================================================== --- /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h (revision 9728) +++ /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h (revision 9729) @@ -158,4 +158,8 @@ MeshLowerelementsEnum, MeshUpperelementsEnum, + MeshElementonbedEnum, + MeshElementonsurfaceEnum, + MeshVertexonbedEnum, + MeshVertexonsurfaceEnum, /*}}}*/ /*Datasets {{{1*/ @@ -308,6 +312,4 @@ ConstantEnum, ConvergedEnum, - ElementonbedEnum, - ElementonsurfaceEnum, FillEnum, FractionIncrementEnum, @@ -327,6 +329,4 @@ GroundinglineMeltingRateEnum, MisfitEnum, - NodeonbedEnum, - NodeonsurfaceEnum, NumberNodeToElementConnectivityEnum, PressureEnum, Index: /issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp =================================================================== --- /issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 9728) +++ /issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 9729) @@ -162,4 +162,8 @@ case MeshLowerelementsEnum : return "MeshLowerelements"; case MeshUpperelementsEnum : return "MeshUpperelements"; + case MeshElementonbedEnum : return "MeshElementonbed"; + case MeshElementonsurfaceEnum : return "MeshElementonsurface"; + case MeshVertexonbedEnum : return "MeshVertexonbed"; + case MeshVertexonsurfaceEnum : return "MeshVertexonsurface"; case ConstraintsEnum : return "Constraints"; case ElementsEnum : return "Elements"; @@ -275,6 +279,4 @@ case ConstantEnum : return "Constant"; case ConvergedEnum : return "Converged"; - case ElementonbedEnum : return "Elementonbed"; - case ElementonsurfaceEnum : return "Elementonsurface"; case FillEnum : return "Fill"; case FractionIncrementEnum : return "FractionIncrement"; @@ -294,6 +296,4 @@ case GroundinglineMeltingRateEnum : return "GroundinglineMeltingRate"; case MisfitEnum : return "Misfit"; - case NodeonbedEnum : return "Nodeonbed"; - case NodeonsurfaceEnum : return "Nodeonsurface"; case NumberNodeToElementConnectivityEnum : return "NumberNodeToElementConnectivity"; case PressureEnum : return "Pressure"; Index: /issm/trunk/src/c/modules/ModelProcessorx/Balancethickness/CreateNodesBalancethickness.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Balancethickness/CreateNodesBalancethickness.cpp (revision 9728) +++ /issm/trunk/src/c/modules/ModelProcessorx/Balancethickness/CreateNodesBalancethickness.cpp (revision 9729) @@ -49,5 +49,5 @@ /*First fetch data: */ - iomodel->FetchData(7,ElementsEnum,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); + iomodel->FetchData(7,ElementsEnum,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); if(continuous_galerkin){ @@ -88,5 +88,5 @@ /*Clean fetched data: */ - iomodel->DeleteData(7,ElementsEnum,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); + iomodel->DeleteData(7,ElementsEnum,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); /*Assign output pointer: */ Index: /issm/trunk/src/c/modules/ModelProcessorx/Balancethickness/UpdateElementsBalancethickness.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Balancethickness/UpdateElementsBalancethickness.cpp (revision 9728) +++ /issm/trunk/src/c/modules/ModelProcessorx/Balancethickness/UpdateElementsBalancethickness.cpp (revision 9729) @@ -48,6 +48,6 @@ if (dim==3){ - iomodel->FetchDataToInput(elements,ElementonbedEnum); - iomodel->FetchDataToInput(elements,ElementonsurfaceEnum); + iomodel->FetchDataToInput(elements,MeshElementonbedEnum); + iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); } /*Free data: */ Index: /issm/trunk/src/c/modules/ModelProcessorx/BedSlope/CreateNodesBedSlope.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/BedSlope/CreateNodesBedSlope.cpp (revision 9728) +++ /issm/trunk/src/c/modules/ModelProcessorx/BedSlope/CreateNodesBedSlope.cpp (revision 9729) @@ -36,5 +36,5 @@ /*First fetch data: */ - iomodel->FetchData(6,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); + iomodel->FetchData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); for (i=0;iDeleteData(6,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); + iomodel->DeleteData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); /*Assign output pointer: */ Index: /issm/trunk/src/c/modules/ModelProcessorx/BedSlope/UpdateElementsBedSlope.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/BedSlope/UpdateElementsBedSlope.cpp (revision 9728) +++ /issm/trunk/src/c/modules/ModelProcessorx/BedSlope/UpdateElementsBedSlope.cpp (revision 9729) @@ -39,6 +39,6 @@ if (dim==3){ - iomodel->FetchDataToInput(elements,ElementonbedEnum); - iomodel->FetchDataToInput(elements,ElementonsurfaceEnum); + iomodel->FetchDataToInput(elements,MeshElementonbedEnum); + iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); } Index: /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp (revision 9728) +++ /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp (revision 9729) @@ -124,5 +124,5 @@ /*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(&nodeonbed,NULL,NULL,MeshVertexonbedEnum); iomodel->FetchData(&nodeonicesheet,NULL,NULL,MaskVertexongroundediceEnum); iomodel->FetchData(&nodeonstokes,NULL,NULL,FlowequationBorderstokesEnum); Index: /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp (revision 9728) +++ /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp (revision 9729) @@ -45,5 +45,5 @@ /*Create nodes: */ - iomodel->FetchData(9,NodeonbedEnum,NodeonsurfaceEnum,FlowequationBordermacayealEnum,FlowequationBorderstokesEnum, + iomodel->FetchData(9,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationBordermacayealEnum,FlowequationBorderstokesEnum, MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,MaskVertexonwaterEnum,FlowequationVertexEquationEnum,DiagnosticReferentialEnum); @@ -58,5 +58,5 @@ /*Clean fetched data: */ - iomodel->DeleteData(9,NodeonbedEnum,NodeonsurfaceEnum,FlowequationBordermacayealEnum,FlowequationBorderstokesEnum, + iomodel->DeleteData(9,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationBordermacayealEnum,FlowequationBorderstokesEnum, MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,MaskVertexonwaterEnum,FlowequationVertexEquationEnum,DiagnosticReferentialEnum); Index: /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp (revision 9728) +++ /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp (revision 9729) @@ -64,6 +64,6 @@ if (dim==3){ - iomodel->FetchDataToInput(elements,ElementonbedEnum); - iomodel->FetchDataToInput(elements,ElementonsurfaceEnum); + iomodel->FetchDataToInput(elements,MeshElementonbedEnum); + iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); iomodel->FetchDataToInput(elements,VzEnum); iomodel->FetchDataToInput(elements,SurfaceforcingsAccumulationRateEnum); Index: /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp (revision 9728) +++ /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp (revision 9729) @@ -44,5 +44,5 @@ /*First fetch data: */ - iomodel->FetchData(7,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,ElementsEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); + iomodel->FetchData(7,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,ElementsEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); CreateNumberNodeToElementConnectivity(iomodel); @@ -57,5 +57,5 @@ /*Clean fetched data: */ - iomodel->DeleteData(7,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,ElementsEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); + iomodel->DeleteData(7,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,ElementsEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); /*Assign output pointer: */ Index: /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticVert/CreateNodesDiagnosticVert.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticVert/CreateNodesDiagnosticVert.cpp (revision 9728) +++ /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticVert/CreateNodesDiagnosticVert.cpp (revision 9729) @@ -44,5 +44,5 @@ /*First fetch data: */ - iomodel->FetchData(6,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); + iomodel->FetchData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); for (i=0;iDeleteData(6,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); + iomodel->DeleteData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); /*Assign output pointer: */ Index: /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticVert/UpdateElementsDiagnosticVert.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticVert/UpdateElementsDiagnosticVert.cpp (revision 9728) +++ /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticVert/UpdateElementsDiagnosticVert.cpp (revision 9729) @@ -44,6 +44,6 @@ iomodel->FetchDataToInput(elements,BedEnum); iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum); - iomodel->FetchDataToInput(elements,ElementonbedEnum); - iomodel->FetchDataToInput(elements,ElementonsurfaceEnum); + iomodel->FetchDataToInput(elements,MeshElementonbedEnum); + iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); iomodel->FetchDataToInput(elements,MaskElementonwaterEnum); iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum); Index: /issm/trunk/src/c/modules/ModelProcessorx/Enthalpy/CreateNodesEnthalpy.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Enthalpy/CreateNodesEnthalpy.cpp (revision 9728) +++ /issm/trunk/src/c/modules/ModelProcessorx/Enthalpy/CreateNodesEnthalpy.cpp (revision 9729) @@ -36,5 +36,5 @@ /*Create nodes and vertices: */ - iomodel->FetchData(6,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); + iomodel->FetchData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); for (i=0;iDeleteData(6,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); + iomodel->DeleteData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); /*Assign output pointer: */ Index: /issm/trunk/src/c/modules/ModelProcessorx/Enthalpy/UpdateElementsEnthalpy.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Enthalpy/UpdateElementsEnthalpy.cpp (revision 9728) +++ /issm/trunk/src/c/modules/ModelProcessorx/Enthalpy/UpdateElementsEnthalpy.cpp (revision 9729) @@ -46,6 +46,6 @@ iomodel->FetchDataToInput(elements,FrictionQEnum); iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum); - iomodel->FetchDataToInput(elements,ElementonbedEnum); - iomodel->FetchDataToInput(elements,ElementonsurfaceEnum); + iomodel->FetchDataToInput(elements,MeshElementonbedEnum); + iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); iomodel->FetchDataToInput(elements,MaskElementonwaterEnum); iomodel->FetchDataToInput(elements,FlowequationElementEquationEnum); Index: /issm/trunk/src/c/modules/ModelProcessorx/Hydrology/CreateNodesHydrology.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Hydrology/CreateNodesHydrology.cpp (revision 9728) +++ /issm/trunk/src/c/modules/ModelProcessorx/Hydrology/CreateNodesHydrology.cpp (revision 9729) @@ -36,5 +36,5 @@ /*Create nodes and vertices: */ - iomodel->FetchData(6,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); + iomodel->FetchData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); for (i=0;iDeleteData(6,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); + iomodel->DeleteData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); /*Assign output pointer: */ Index: /issm/trunk/src/c/modules/ModelProcessorx/Hydrology/UpdateElementsHydrology.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Hydrology/UpdateElementsHydrology.cpp (revision 9728) +++ /issm/trunk/src/c/modules/ModelProcessorx/Hydrology/UpdateElementsHydrology.cpp (revision 9729) @@ -39,6 +39,6 @@ iomodel->FetchDataToInput(elements,FrictionQEnum); iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum); - iomodel->FetchDataToInput(elements,ElementonbedEnum); - iomodel->FetchDataToInput(elements,ElementonsurfaceEnum); + iomodel->FetchDataToInput(elements,MeshElementonbedEnum); + iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); iomodel->FetchDataToInput(elements,MaskElementonwaterEnum); iomodel->FetchDataToInput(elements,FlowequationElementEquationEnum); Index: /issm/trunk/src/c/modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp (revision 9728) +++ /issm/trunk/src/c/modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp (revision 9729) @@ -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,MeshVertexonbedEnum,ElementsEnum); CreateSingleNodeToElementConnectivity(iomodel); for (i=0;imy_vertices[i]==1)){ - if (iomodel->Data(NodeonbedEnum)[i]){ + if (iomodel->Data(MeshVertexonbedEnum)[i]){ loads->AddObject(new Pengrid(iomodel->loadcounter+i+1,i,iomodel,MeltingAnalysisEnum)); } } } - iomodel->DeleteData(2,NodeonbedEnum,ElementsEnum); + iomodel->DeleteData(2,MeshVertexonbedEnum,ElementsEnum); /*Assign output pointer: */ Index: /issm/trunk/src/c/modules/ModelProcessorx/Melting/CreateNodesMelting.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Melting/CreateNodesMelting.cpp (revision 9728) +++ /issm/trunk/src/c/modules/ModelProcessorx/Melting/CreateNodesMelting.cpp (revision 9729) @@ -36,5 +36,5 @@ /*First fetch data: */ - iomodel->FetchData(6,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); + iomodel->FetchData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); for (i=0;iDeleteData(6,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); + iomodel->DeleteData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); /*Assign output pointer: */ Index: /issm/trunk/src/c/modules/ModelProcessorx/Melting/UpdateElementsMelting.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Melting/UpdateElementsMelting.cpp (revision 9728) +++ /issm/trunk/src/c/modules/ModelProcessorx/Melting/UpdateElementsMelting.cpp (revision 9729) @@ -47,6 +47,6 @@ iomodel->FetchDataToInput(elements,FrictionQEnum); iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum); - iomodel->FetchDataToInput(elements,ElementonbedEnum); - iomodel->FetchDataToInput(elements,ElementonsurfaceEnum); + iomodel->FetchDataToInput(elements,MeshElementonbedEnum); + iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); iomodel->FetchDataToInput(elements,MaskElementonwaterEnum); iomodel->FetchDataToInput(elements,FlowequationElementEquationEnum); Index: /issm/trunk/src/c/modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp (revision 9728) +++ /issm/trunk/src/c/modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp (revision 9729) @@ -64,5 +64,5 @@ double *nodeonbed=NULL; iomodel->FetchData(&vertex_pairing,&numvertex_pairing,NULL,PrognosticVertexPairingEnum); - iomodel->FetchData(&nodeonbed,NULL,NULL,NodeonbedEnum); + iomodel->FetchData(&nodeonbed,NULL,NULL,MeshVertexonbedEnum); for(i=0;iFetchData(7,ElementsEnum,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); + iomodel->FetchData(7,ElementsEnum,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); if(continuous_galerkin){ @@ -88,5 +88,5 @@ /*Clean fetched data: */ - iomodel->DeleteData(7,ElementsEnum,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); + iomodel->DeleteData(7,ElementsEnum,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); /*Assign output pointer: */ Index: /issm/trunk/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp (revision 9728) +++ /issm/trunk/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp (revision 9729) @@ -54,6 +54,6 @@ if (dim==3){ - iomodel->FetchDataToInput(elements,ElementonbedEnum); - iomodel->FetchDataToInput(elements,ElementonsurfaceEnum); + iomodel->FetchDataToInput(elements,MeshElementonbedEnum); + iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); 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 9728) +++ /issm/trunk/src/c/modules/ModelProcessorx/SurfaceSlope/CreateNodesSurfaceSlope.cpp (revision 9729) @@ -36,5 +36,5 @@ /*First fetch data: */ - iomodel->FetchData(6,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); + iomodel->FetchData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); for (i=0;iDeleteData(6,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); + iomodel->DeleteData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); /*Assign output pointer: */ Index: /issm/trunk/src/c/modules/ModelProcessorx/SurfaceSlope/UpdateElementsSurfaceSlope.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/SurfaceSlope/UpdateElementsSurfaceSlope.cpp (revision 9728) +++ /issm/trunk/src/c/modules/ModelProcessorx/SurfaceSlope/UpdateElementsSurfaceSlope.cpp (revision 9729) @@ -39,6 +39,6 @@ if (dim==3){ - iomodel->FetchDataToInput(elements,ElementonbedEnum); - iomodel->FetchDataToInput(elements,ElementonsurfaceEnum); + iomodel->FetchDataToInput(elements,MeshElementonbedEnum); + iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); } Index: /issm/trunk/src/c/modules/ModelProcessorx/Thermal/CreateNodesThermal.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Thermal/CreateNodesThermal.cpp (revision 9728) +++ /issm/trunk/src/c/modules/ModelProcessorx/Thermal/CreateNodesThermal.cpp (revision 9729) @@ -36,5 +36,5 @@ /*Create nodes and vertices: */ - iomodel->FetchData(6,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); + iomodel->FetchData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); for (i=0;iDeleteData(6,NodeonbedEnum,NodeonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); + iomodel->DeleteData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum); /*Assign output pointer: */ Index: /issm/trunk/src/c/modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp (revision 9728) +++ /issm/trunk/src/c/modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp (revision 9729) @@ -48,6 +48,6 @@ iomodel->FetchDataToInput(elements,FrictionQEnum); iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum); - iomodel->FetchDataToInput(elements,ElementonbedEnum); - iomodel->FetchDataToInput(elements,ElementonsurfaceEnum); + iomodel->FetchDataToInput(elements,MeshElementonbedEnum); + iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); iomodel->FetchDataToInput(elements,MaskElementonwaterEnum); iomodel->FetchDataToInput(elements,FlowequationElementEquationEnum); Index: /issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp =================================================================== --- /issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 9728) +++ /issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 9729) @@ -160,4 +160,8 @@ else if (strcmp(name,"MeshLowerelements")==0) return MeshLowerelementsEnum; else if (strcmp(name,"MeshUpperelements")==0) return MeshUpperelementsEnum; + else if (strcmp(name,"MeshElementonbed")==0) return MeshElementonbedEnum; + else if (strcmp(name,"MeshElementonsurface")==0) return MeshElementonsurfaceEnum; + else if (strcmp(name,"MeshVertexonbed")==0) return MeshVertexonbedEnum; + else if (strcmp(name,"MeshVertexonsurface")==0) return MeshVertexonsurfaceEnum; else if (strcmp(name,"Constraints")==0) return ConstraintsEnum; else if (strcmp(name,"Elements")==0) return ElementsEnum; @@ -273,6 +277,4 @@ else if (strcmp(name,"Constant")==0) return ConstantEnum; else if (strcmp(name,"Converged")==0) return ConvergedEnum; - 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; @@ -292,6 +294,4 @@ 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,"Nodeonsurface")==0) return NodeonsurfaceEnum; else if (strcmp(name,"NumberNodeToElementConnectivity")==0) return NumberNodeToElementConnectivityEnum; else if (strcmp(name,"Pressure")==0) return PressureEnum; Index: /issm/trunk/src/c/objects/Elements/Penta.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/Penta.cpp (revision 9728) +++ /issm/trunk/src/c/objects/Elements/Penta.cpp (revision 9729) @@ -6575,5 +6575,5 @@ bool onbed; - inputs->GetParameterValue(&onbed,ElementonbedEnum); + inputs->GetParameterValue(&onbed,MeshElementonbedEnum); return onbed; } @@ -6651,5 +6651,5 @@ bool onsurface; - inputs->GetParameterValue(&onsurface,ElementonsurfaceEnum); + inputs->GetParameterValue(&onsurface,MeshElementonsurfaceEnum); return onsurface; } Index: /issm/trunk/src/c/objects/Elements/Tria.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/Tria.cpp (revision 9728) +++ /issm/trunk/src/c/objects/Elements/Tria.cpp (revision 9729) @@ -4001,5 +4001,5 @@ bool onbed; - inputs->GetParameterValue(&onbed,ElementonbedEnum); + inputs->GetParameterValue(&onbed,MeshElementonbedEnum); return onbed; } Index: /issm/trunk/src/c/objects/Node.cpp =================================================================== --- /issm/trunk/src/c/objects/Node.cpp (revision 9728) +++ /issm/trunk/src/c/objects/Node.cpp (revision 9729) @@ -54,6 +54,6 @@ //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(MeshVertexonbedEnum)) this->inputs->AddInput(new BoolInput(MeshVertexonbedEnum,(IssmBool)iomodel->Data(MeshVertexonbedEnum)[io_index])); + if (iomodel->Data(MeshVertexonsurfaceEnum)) this->inputs->AddInput(new BoolInput(MeshVertexonsurfaceEnum,(IssmBool)iomodel->Data(MeshVertexonsurfaceEnum)[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])); @@ -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(MeshVertexonbedEnum)) _error_("iomodel->nodeonbed is NULL"); if (!iomodel->Data(FlowequationVertexEquationEnum)) _error_("iomodel->vertices_type is NULL"); - if (iomodel->Data(FlowequationVertexEquationEnum)[io_index]==MacAyealApproximationEnum && !iomodel->Data(NodeonbedEnum)[io_index]){ + if (iomodel->Data(FlowequationVertexEquationEnum)[io_index]==MacAyealApproximationEnum && !iomodel->Data(MeshVertexonbedEnum)[io_index]){ for(k=1;k<=gsize;k++) this->FreezeDof(k); } if (iomodel->Data(FlowequationVertexEquationEnum)[io_index]==MacAyealPattynApproximationEnum && iomodel->Data(FlowequationBordermacayealEnum)[io_index]){ - if(!iomodel->Data(NodeonbedEnum)[io_index]){ + if(!iomodel->Data(MeshVertexonbedEnum)[io_index]){ for(k=1;k<=gsize;k++) this->FreezeDof(k); } } if (iomodel->Data(FlowequationVertexEquationEnum)[io_index]==MacAyealStokesApproximationEnum && iomodel->Data(FlowequationBordermacayealEnum)[io_index]){ - if(!iomodel->Data(NodeonbedEnum)[io_index]){ + if(!iomodel->Data(MeshVertexonbedEnum)[io_index]){ for(k=1;k<=2;k++) this->FreezeDof(k); } @@ -121,6 +121,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(MeshVertexonbedEnum)); + if (!iomodel->Data(MeshVertexonbedEnum)[io_index]){ for(k=1;k<=gsize;k++){ this->FreezeDof(k); @@ -738,5 +738,5 @@ /*recover parameters: */ - inputs->GetParameterValue(&onbed,NodeonbedEnum); + inputs->GetParameterValue(&onbed,MeshVertexonbedEnum); return onbed; @@ -771,5 +771,5 @@ /*recover parameters: */ - inputs->GetParameterValue(&onsurface,NodeonsurfaceEnum); + inputs->GetParameterValue(&onsurface,MeshVertexonsurfaceEnum); return onsurface; Index: /issm/trunk/src/m/classes/mesh.m =================================================================== --- /issm/trunk/src/m/classes/mesh.m (revision 9728) +++ /issm/trunk/src/m/classes/mesh.m (revision 9729) @@ -22,10 +22,14 @@ numberofvertices2d = modelfield('default',0,'marshall',true,'format','Integer'); numberofelements2d = modelfield('default',0,'marshall',true,'format','Integer'); - nodeconnectivity = modelfield('default',NaN,'marshall',false); + vertexconnectivity = modelfield('default',NaN,'marshall',false); elementconnectivity = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',3); - uppernodes = modelfield('default',NaN,'marshall',false); + uppervertex = modelfield('default',NaN,'marshall',false); upperelements = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',2); lowerelements = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',2); - lowernodes = modelfield('default',NaN,'marshall',false); + lowervertex = modelfield('default',NaN,'marshall',false); + elementonbed = modelfield('default',NaN,'marshall',true,'format','BooleanMat','mattype',2); + elementonsurface = modelfield('default',NaN,'marshall',true,'format','BooleanMat','mattype',2); + vertexonbed = modelfield('default',NaN,'marshall',true,'format','BooleanMat','mattype',1); + vertexonsurface = modelfield('default',NaN,'marshall',true,'format','BooleanMat','mattype',1); end methods Index: /issm/trunk/src/m/classes/model/model.m =================================================================== --- /issm/trunk/src/m/classes/model/model.m (revision 9728) +++ /issm/trunk/src/m/classes/model/model.m (revision 9729) @@ -52,8 +52,4 @@ y2d = modelfield('default',NaN,'marshall',false); - elementonbed = modelfield('default',NaN,'marshall',true,'format','BooleanMat','mattype',2); - elementonsurface = modelfield('default',NaN,'marshall',true,'format','BooleanMat','mattype',2); - nodeonbed = modelfield('default',NaN,'marshall',true,'format','BooleanMat','mattype',1); - nodeonsurface = modelfield('default',NaN,'marshall',true,'format','BooleanMat','mattype',1); %}}} end @@ -311,10 +307,14 @@ if isfield(structmd,'numberofelements2d'), md.mesh.numberofelements2d=structmd.numberofelements2d; end if isfield(structmd,'numberofnodes2d'), md.mesh.numberofvertices2d=structmd.numberofnodes2d; end - if isfield(structmd,'nodeconnectivity'), md.mesh.nodeconnectivityension=structmd.nodeconnectivity; end - if isfield(structmd,'elementconnectivity'), md.mesh.elementconnectivityension=structmd.elementconnectivity; end - if isfield(structmd,'uppernodes'), md.mesh.uppernodesension=structmd.uppernodes; end - if isfield(structmd,'lowernodes'), md.mesh.lowernodesension=structmd.lowernodes; end - if isfield(structmd,'upperelements'), md.mesh.upperelementsension=structmd.upperelements; end - if isfield(structmd,'lowerelements'), md.mesh.lowerelementsension=structmd.lowerelements; end + if isfield(structmd,'nodeconnectivity'), md.mesh.vertexconnectivity=structmd.nodeconnectivity; end + if isfield(structmd,'elementconnectivity'), md.mesh.elementconnectivity=structmd.elementconnectivity; end + if isfield(structmd,'uppernodes'), md.mesh.uppervertex=structmd.uppernodes; end + if isfield(structmd,'lowernodes'), md.mesh.lowervertex=structmd.lowernodes; end + if isfield(structmd,'upperelements'), md.mesh.upperelements=structmd.upperelements; end + if isfield(structmd,'lowerelements'), md.mesh.lowerelements=structmd.lowerelements; end + if isfield(structmd,'elementonbed'), md.mesh.elementonbed=structmd.elementonbed; end + if isfield(structmd,'elementonsurface'), md.mesh.elementonsurface=structmd.elementonsurface; end + if isfield(structmd,'nodeonsurface'), md.mesh.vertexonsurface=structmd.nodeonsurface; end + if isfield(structmd,'nodeonbed'), md.mesh.vertexonbed=structmd.nodeonbed; end %Field changes Index: sm/trunk/src/m/enum/ElementonbedEnum.m =================================================================== --- /issm/trunk/src/m/enum/ElementonbedEnum.m (revision 9728) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=ElementonbedEnum() -%ELEMENTONBEDENUM - Enum of Elementonbed -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh -% Please read src/c/EnumDefinitions/README for more information -% -% Usage: -% macro=ElementonbedEnum() - -macro=StringToEnum('Elementonbed'); Index: sm/trunk/src/m/enum/ElementonsurfaceEnum.m =================================================================== --- /issm/trunk/src/m/enum/ElementonsurfaceEnum.m (revision 9728) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=ElementonsurfaceEnum() -%ELEMENTONSURFACEENUM - Enum of Elementonsurface -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh -% Please read src/c/EnumDefinitions/README for more information -% -% Usage: -% macro=ElementonsurfaceEnum() - -macro=StringToEnum('Elementonsurface'); Index: /issm/trunk/src/m/enum/MeshElementonbedEnum.m =================================================================== --- /issm/trunk/src/m/enum/MeshElementonbedEnum.m (revision 9729) +++ /issm/trunk/src/m/enum/MeshElementonbedEnum.m (revision 9729) @@ -0,0 +1,11 @@ +function macro=MeshElementonbedEnum() +%MESHELEMENTONBEDENUM - Enum of MeshElementonbed +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh +% Please read src/c/EnumDefinitions/README for more information +% +% Usage: +% macro=MeshElementonbedEnum() + +macro=StringToEnum('MeshElementonbed'); Index: /issm/trunk/src/m/enum/MeshElementonsurfaceEnum.m =================================================================== --- /issm/trunk/src/m/enum/MeshElementonsurfaceEnum.m (revision 9729) +++ /issm/trunk/src/m/enum/MeshElementonsurfaceEnum.m (revision 9729) @@ -0,0 +1,11 @@ +function macro=MeshElementonsurfaceEnum() +%MESHELEMENTONSURFACEENUM - Enum of MeshElementonsurface +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh +% Please read src/c/EnumDefinitions/README for more information +% +% Usage: +% macro=MeshElementonsurfaceEnum() + +macro=StringToEnum('MeshElementonsurface'); Index: /issm/trunk/src/m/enum/MeshVertexonbedEnum.m =================================================================== --- /issm/trunk/src/m/enum/MeshVertexonbedEnum.m (revision 9729) +++ /issm/trunk/src/m/enum/MeshVertexonbedEnum.m (revision 9729) @@ -0,0 +1,11 @@ +function macro=MeshVertexonbedEnum() +%MESHVERTEXONBEDENUM - Enum of MeshVertexonbed +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh +% Please read src/c/EnumDefinitions/README for more information +% +% Usage: +% macro=MeshVertexonbedEnum() + +macro=StringToEnum('MeshVertexonbed'); Index: /issm/trunk/src/m/enum/MeshVertexonsurfaceEnum.m =================================================================== --- /issm/trunk/src/m/enum/MeshVertexonsurfaceEnum.m (revision 9729) +++ /issm/trunk/src/m/enum/MeshVertexonsurfaceEnum.m (revision 9729) @@ -0,0 +1,11 @@ +function macro=MeshVertexonsurfaceEnum() +%MESHVERTEXONSURFACEENUM - Enum of MeshVertexonsurface +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh +% Please read src/c/EnumDefinitions/README for more information +% +% Usage: +% macro=MeshVertexonsurfaceEnum() + +macro=StringToEnum('MeshVertexonsurface'); Index: sm/trunk/src/m/enum/NodeonbedEnum.m =================================================================== --- /issm/trunk/src/m/enum/NodeonbedEnum.m (revision 9728) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=NodeonbedEnum() -%NODEONBEDENUM - Enum of Nodeonbed -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh -% Please read src/c/EnumDefinitions/README for more information -% -% Usage: -% macro=NodeonbedEnum() - -macro=StringToEnum('Nodeonbed'); Index: sm/trunk/src/m/enum/NodeonsurfaceEnum.m =================================================================== --- /issm/trunk/src/m/enum/NodeonsurfaceEnum.m (revision 9728) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=NodeonsurfaceEnum() -%NODEONSURFACEENUM - Enum of Nodeonsurface -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh -% Please read src/c/EnumDefinitions/README for more information -% -% Usage: -% macro=NodeonsurfaceEnum() - -macro=StringToEnum('Nodeonsurface'); Index: /issm/trunk/src/m/model/bamg.m =================================================================== --- /issm/trunk/src/m/model/bamg.m (revision 9728) +++ /issm/trunk/src/m/model/bamg.m (revision 9729) @@ -329,9 +329,9 @@ md.mesh.numberofvertices=length(md.x); md.z=zeros(md.mesh.numberofvertices,1); -md.nodeonbed=ones(md.mesh.numberofvertices,1); +md.mesh.vertexonbed=ones(md.mesh.numberofvertices,1); md.mask.vertexonwater=zeros(md.mesh.numberofvertices,1); -md.nodeonsurface=ones(md.mesh.numberofvertices,1); -md.elementonbed=ones(md.mesh.numberofelements,1); -md.elementonsurface=ones(md.mesh.numberofelements,1); +md.mesh.vertexonsurface=ones(md.mesh.numberofvertices,1); +md.mesh.elementonbed=ones(md.mesh.numberofelements,1); +md.mesh.elementonsurface=ones(md.mesh.numberofelements,1); md.mesh.vertexonboundary=zeros(md.mesh.numberofvertices,1); md.mesh.vertexonboundary(md.mesh.segments(:,1:2))=1; md.mesh.elementconnectivity=md.private.bamg.mesh.ElementConnectivity; Index: /issm/trunk/src/m/model/collapse.m =================================================================== --- /issm/trunk/src/m/model/collapse.m (revision 9728) +++ /issm/trunk/src/m/model/collapse.m (revision 9729) @@ -41,8 +41,8 @@ %bedinfo and surface info -md.elementonbed=ones(md.mesh.numberofelements2d,1); -md.elementonsurface=ones(md.mesh.numberofelements2d,1); -md.nodeonbed=ones(md.mesh.numberofvertices2d,1); -md.nodeonsurface=ones(md.mesh.numberofvertices2d,1); +md.mesh.elementonbed=ones(md.mesh.numberofelements2d,1); +md.mesh.elementonsurface=ones(md.mesh.numberofelements2d,1); +md.mesh.vertexonbed=ones(md.mesh.numberofvertices2d,1); +md.mesh.vertexonsurface=ones(md.mesh.numberofvertices2d,1); %elementstype @@ -98,6 +98,6 @@ %Keep a trace of lower and upper nodes -md.mesh.lowernodes=NaN; -md.mesh.uppernodes=NaN; +md.mesh.lowervertex=NaN; +md.mesh.uppervertex=NaN; %Remove old mesh Index: /issm/trunk/src/m/model/contourenvelope.m =================================================================== --- /issm/trunk/src/m/model/contourenvelope.m (revision 9728) +++ /issm/trunk/src/m/model/contourenvelope.m (revision 9729) @@ -35,9 +35,9 @@ %Now, build the connectivity tables for this mesh. %Computing connectivity -if size(md.mesh.nodeconnectivity,1)~=md.mesh.numberofvertices, - md.mesh.nodeconnectivity=NodeConnectivity(md.elements,md.mesh.numberofvertices); +if size(md.mesh.vertexconnectivity,1)~=md.mesh.numberofvertices, + md.mesh.vertexconnectivity=NodeConnectivity(md.elements,md.mesh.numberofvertices); end if size(md.mesh.elementconnectivity,1)~=md.mesh.numberofelements, - md.mesh.elementconnectivity=ElementConnectivity(md.elements,md.mesh.nodeconnectivity); + md.mesh.elementconnectivity=ElementConnectivity(md.elements,md.mesh.vertexconnectivity); end Index: /issm/trunk/src/m/model/display/displaymesh.m =================================================================== --- /issm/trunk/src/m/model/display/displaymesh.m (revision 9728) +++ /issm/trunk/src/m/model/display/displaymesh.m (revision 9729) @@ -38,6 +38,6 @@ fielddisplay(md,'bamg','Geometry and 2d mesh properties (if generated by Bamg)'); fielddisplay(md,'penalties','penalties list'); -fielddisplay(md,'nodeonbed','lower nodes flags list'); -fielddisplay(md,'elementonbed','lower elements flags list'); -fielddisplay(md,'nodeonsurface','upper nodes flags list'); -fielddisplay(md,'elementonsurface','upper elements flags list'); +fielddisplay(md,'mesh.vertexonbed','lower nodes flags list'); +fielddisplay(md,'mesh.elementonbed','lower elements flags list'); +fielddisplay(md,'mesh.vertexonsurface','upper nodes flags list'); +fielddisplay(md,'mesh.elementonsurface','upper elements flags list'); Index: /issm/trunk/src/m/model/display/displayparameters.m =================================================================== --- /issm/trunk/src/m/model/display/displayparameters.m (revision 9728) +++ /issm/trunk/src/m/model/display/displayparameters.m (revision 9729) @@ -17,8 +17,8 @@ fielddisplay(md,'bathymetry','bathymetry elevation (with respect to sea level) [m]'); fielddisplay(md,'firn_layer','firn layer height [m]'); -fielddisplay(md,'elementonbed','element on bed flags list'); -fielddisplay(md,'elementonsurface','element on surface flags list'); -fielddisplay(md,'nodeonbed','node on bed flags list'); -fielddisplay(md,'nodeonsurface','node on surface flags list'); +fielddisplay(md,'mesh.elementonbed','element on bed flags list'); +fielddisplay(md,'mesh.elementonsurface','element on surface flags list'); +fielddisplay(md,'mesh.vertexonbed','node on bed flags list'); +fielddisplay(md,'mesh.vertexonsurface','node on surface flags list'); disp(sprintf('\n physical parameters:')); Index: /issm/trunk/src/m/model/extrude.m =================================================================== --- /issm/trunk/src/m/model/extrude.m (revision 9728) +++ /issm/trunk/src/m/model/extrude.m (revision 9729) @@ -87,10 +87,10 @@ %Keep a trace of lower and upper nodes -mesh.lowernodes=NaN*ones(number_nodes3d,1); -mesh.uppernodes=NaN*ones(number_nodes3d,1); -mesh.lowernodes(md.mesh.numberofvertices+1:end)=1:(numlayers-1)*md.mesh.numberofvertices; -mesh.uppernodes(1:(numlayers-1)*md.mesh.numberofvertices)=md.mesh.numberofvertices+1:number_nodes3d; -md.mesh.lowernodes=mesh.lowernodes; -md.mesh.uppernodes=mesh.uppernodes; +mesh.lowervertex=NaN*ones(number_nodes3d,1); +mesh.uppervertex=NaN*ones(number_nodes3d,1); +mesh.lowervertex(md.mesh.numberofvertices+1:end)=1:(numlayers-1)*md.mesh.numberofvertices; +mesh.uppervertex(1:(numlayers-1)*md.mesh.numberofvertices)=md.mesh.numberofvertices+1:number_nodes3d; +md.mesh.lowervertex=mesh.lowervertex; +md.mesh.uppervertex=mesh.uppervertex; %same for lower and upper elements @@ -148,8 +148,8 @@ %bedinfo and surface info -md.elementonbed=project3d(md,'vector',ones(md.mesh.numberofelements2d,1),'type','element','layer',1); -md.elementonsurface=project3d(md,'vector',ones(md.mesh.numberofelements2d,1),'type','element','layer',md.mesh.numberoflayers-1); -md.nodeonbed=project3d(md,'vector',ones(md.mesh.numberofvertices2d,1),'type','node','layer',1); -md.nodeonsurface=project3d(md,'vector',ones(md.mesh.numberofvertices2d,1),'type','node','layer',md.mesh.numberoflayers); +md.mesh.elementonbed=project3d(md,'vector',ones(md.mesh.numberofelements2d,1),'type','element','layer',1); +md.mesh.elementonsurface=project3d(md,'vector',ones(md.mesh.numberofelements2d,1),'type','element','layer',md.mesh.numberoflayers-1); +md.mesh.vertexonbed=project3d(md,'vector',ones(md.mesh.numberofvertices2d,1),'type','node','layer',1); +md.mesh.vertexonsurface=project3d(md,'vector',ones(md.mesh.numberofvertices2d,1),'type','node','layer',md.mesh.numberoflayers); %elementstype Index: /issm/trunk/src/m/model/mesh/findsegments.m =================================================================== --- /issm/trunk/src/m/model/mesh/findsegments.m (revision 9728) +++ /issm/trunk/src/m/model/mesh/findsegments.m (revision 9729) @@ -19,5 +19,5 @@ error(' ''mesh.elementconnectivity'' option does not have thge right size.'); else - mesh.elementconnectivity=ElementConnectivity(md.elements,md.mesh.nodeconnectivity); + mesh.elementconnectivity=ElementConnectivity(md.elements,md.mesh.vertexconnectivity); end end Index: /issm/trunk/src/m/model/mesh/meshconvert.m =================================================================== --- /issm/trunk/src/m/model/mesh/meshconvert.m (revision 9728) +++ /issm/trunk/src/m/model/mesh/meshconvert.m (revision 9729) @@ -40,8 +40,8 @@ md.mesh.numberofvertices=length(md.x); md.z=zeros(md.mesh.numberofvertices,1); -md.nodeonbed=ones(md.mesh.numberofvertices,1); +md.mesh.vertexonbed=ones(md.mesh.numberofvertices,1); md.mask.vertexonwater=zeros(md.mesh.numberofvertices,1); -md.nodeonsurface=ones(md.mesh.numberofvertices,1); -md.elementonbed=ones(md.mesh.numberofelements,1); -md.elementonsurface=ones(md.mesh.numberofelements,1); +md.mesh.vertexonsurface=ones(md.mesh.numberofvertices,1); +md.mesh.elementonbed=ones(md.mesh.numberofelements,1); +md.mesh.elementonsurface=ones(md.mesh.numberofelements,1); md.mesh.vertexonboundary=zeros(md.mesh.numberofvertices,1); md.mesh.vertexonboundary(md.mesh.segments(:,1:2))=1; Index: /issm/trunk/src/m/model/mesh/meshnodensity.m =================================================================== --- /issm/trunk/src/m/model/mesh/meshnodensity.m (revision 9728) +++ /issm/trunk/src/m/model/mesh/meshnodensity.m (revision 9729) @@ -59,12 +59,12 @@ md.z=zeros(md.mesh.numberofvertices,1); md.mesh.vertexonboundary=zeros(md.mesh.numberofvertices,1); md.mesh.vertexonboundary(md.mesh.segments(:,1:2))=1; -md.nodeonbed=ones(md.mesh.numberofvertices,1); -md.nodeonsurface=ones(md.mesh.numberofvertices,1); -md.elementonbed=ones(md.mesh.numberofelements,1); -md.elementonsurface=ones(md.mesh.numberofelements,1); +md.mesh.vertexonbed=ones(md.mesh.numberofvertices,1); +md.mesh.vertexonsurface=ones(md.mesh.numberofvertices,1); +md.mesh.elementonbed=ones(md.mesh.numberofelements,1); +md.mesh.elementonsurface=ones(md.mesh.numberofelements,1); %Now, build the connectivity tables for this mesh. -md.mesh.nodeconnectivity=NodeConnectivity(md.elements,md.mesh.numberofvertices); -md.mesh.elementconnectivity=ElementConnectivity(md.elements,md.mesh.nodeconnectivity); +md.mesh.vertexconnectivity=NodeConnectivity(md.elements,md.mesh.numberofvertices); +md.mesh.elementconnectivity=ElementConnectivity(md.elements,md.mesh.vertexconnectivity); %type of model Index: /issm/trunk/src/m/model/mesh/meshrefine.m =================================================================== --- /issm/trunk/src/m/model/mesh/meshrefine.m (revision 9728) +++ /issm/trunk/src/m/model/mesh/meshrefine.m (revision 9729) @@ -23,12 +23,12 @@ md.z=zeros(md.mesh.numberofvertices,1); md.mesh.vertexonboundary=zeros(md.mesh.numberofvertices,1); md.mesh.vertexonboundary(md.mesh.segments(:,1:2))=1; -md.nodeonbed=ones(md.mesh.numberofvertices,1); -md.nodeonsurface=ones(md.mesh.numberofvertices,1); -md.elementonbed=ones(md.mesh.numberofelements,1); -md.elementonsurface=ones(md.mesh.numberofelements,1); +md.mesh.vertexonbed=ones(md.mesh.numberofvertices,1); +md.mesh.vertexonsurface=ones(md.mesh.numberofvertices,1); +md.mesh.elementonbed=ones(md.mesh.numberofelements,1); +md.mesh.elementonsurface=ones(md.mesh.numberofelements,1); %Now, build the connectivity tables for this mesh. -md.mesh.nodeconnectivity=NodeConnectivity(md.elements,md.mesh.numberofvertices); -md.mesh.elementconnectivity=ElementConnectivity(md.elements,md.mesh.nodeconnectivity); +md.mesh.vertexconnectivity=NodeConnectivity(md.elements,md.mesh.numberofvertices); +md.mesh.elementconnectivity=ElementConnectivity(md.elements,md.mesh.vertexconnectivity); %type of model Index: /issm/trunk/src/m/model/mesh/meshyams.m =================================================================== --- /issm/trunk/src/m/model/mesh/meshyams.m (revision 9728) +++ /issm/trunk/src/m/model/mesh/meshyams.m (revision 9729) @@ -95,6 +95,6 @@ %rifts, because the segments are used in YamsCall to freeze the rifts elements during refinement. if md.rifts.numrifts, - md.mesh.nodeconnectivity=NodeConnectivity(md.elements,md.mesh.numberofvertices); - md.mesh.elementconnectivity=ElementConnectivity(md.elements,md.mesh.nodeconnectivity); + md.mesh.vertexconnectivity=NodeConnectivity(md.elements,md.mesh.numberofvertices); + md.mesh.elementconnectivity=ElementConnectivity(md.elements,md.mesh.vertexconnectivity); md.mesh.segments=findsegments(md); md=meshyamsrecreateriftsegments(md); @@ -106,6 +106,6 @@ %Now, build the connectivity tables for this mesh. -md.mesh.nodeconnectivity=NodeConnectivity(md.elements,md.mesh.numberofvertices); -md.mesh.elementconnectivity=ElementConnectivity(md.elements,md.mesh.nodeconnectivity); +md.mesh.vertexconnectivity=NodeConnectivity(md.elements,md.mesh.numberofvertices); +md.mesh.elementconnectivity=ElementConnectivity(md.elements,md.mesh.vertexconnectivity); %recreate segments @@ -115,8 +115,8 @@ %Fill in rest of fields: md.z=zeros(md.mesh.numberofvertices,1); -md.nodeonbed=ones(md.mesh.numberofvertices,1); -md.nodeonsurface=ones(md.mesh.numberofvertices,1); -md.elementonbed=ones(md.mesh.numberofelements,1); -md.elementonsurface=ones(md.mesh.numberofelements,1); +md.mesh.vertexonbed=ones(md.mesh.numberofvertices,1); +md.mesh.vertexonsurface=ones(md.mesh.numberofvertices,1); +md.mesh.elementonbed=ones(md.mesh.numberofelements,1); +md.mesh.elementonsurface=ones(md.mesh.numberofelements,1); if ~strcmp(groundeddomain,'N/A'), nodeground=ContourToMesh(md.elements,md.x,md.y,groundeddomain,'node',2); Index: /issm/trunk/src/m/model/mesh/rifts/meshaddrifts.m =================================================================== --- /issm/trunk/src/m/model/mesh/rifts/meshaddrifts.m (revision 9728) +++ /issm/trunk/src/m/model/mesh/rifts/meshaddrifts.m (revision 9729) @@ -81,12 +81,12 @@ %finish up "a la" mesh.h md.mesh.vertexonboundary=zeros(md.mesh.numberofvertices,1); md.mesh.vertexonboundary(md.mesh.segments(:,1:2))=1; -md.nodeonbed=ones(md.mesh.numberofvertices,1); -md.nodeonsurface=ones(md.mesh.numberofvertices,1); -md.elementonbed=ones(md.mesh.numberofelements,1); -md.elementonsurface=ones(md.mesh.numberofelements,1); +md.mesh.vertexonbed=ones(md.mesh.numberofvertices,1); +md.mesh.vertexonsurface=ones(md.mesh.numberofvertices,1); +md.mesh.elementonbed=ones(md.mesh.numberofelements,1); +md.mesh.elementonsurface=ones(md.mesh.numberofelements,1); %Now, build the connectivity tables for this mesh. -md.mesh.nodeconnectivity=NodeConnectivity(md.elements,md.mesh.numberofvertices); -md.mesh.elementconnectivity=ElementConnectivity(md.elements,md.mesh.nodeconnectivity); +md.mesh.vertexconnectivity=NodeConnectivity(md.elements,md.mesh.numberofvertices); +md.mesh.elementconnectivity=ElementConnectivity(md.elements,md.mesh.vertexconnectivity); %type of model Index: /issm/trunk/src/m/model/mesh/rifts/meshprocessoutsiderifts.m =================================================================== --- /issm/trunk/src/m/model/mesh/rifts/meshprocessoutsiderifts.m (revision 9728) +++ /issm/trunk/src/m/model/mesh/rifts/meshprocessoutsiderifts.m (revision 9729) @@ -89,6 +89,6 @@ md.rifts.numrifts=length(md.rifts.riftstruct); md.flowequation.element_equation=3*ones(md.mesh.numberofelements,1); -md.nodeonbed=ones(md.mesh.numberofvertices,1); -md.nodeonsurface=ones(md.mesh.numberofvertices,1); -md.elementonbed=ones(md.mesh.numberofelements,1); -md.elementonsurface=ones(md.mesh.numberofelements,1); +md.mesh.vertexonbed=ones(md.mesh.numberofvertices,1); +md.mesh.vertexonsurface=ones(md.mesh.numberofvertices,1); +md.mesh.elementonbed=ones(md.mesh.numberofelements,1); +md.mesh.elementonsurface=ones(md.mesh.numberofelements,1); Index: /issm/trunk/src/m/model/mesh/rifts/meshprocessrifts.m =================================================================== --- /issm/trunk/src/m/model/mesh/rifts/meshprocessrifts.m (revision 9728) +++ /issm/trunk/src/m/model/mesh/rifts/meshprocessrifts.m (revision 9729) @@ -39,8 +39,8 @@ md.rifts.numrifts=length(md.rifts.riftstruct); md.flowequation.element_equation=3*ones(md.mesh.numberofelements,1); -md.nodeonbed=ones(md.mesh.numberofvertices,1); -md.nodeonsurface=ones(md.mesh.numberofvertices,1); -md.elementonbed=ones(md.mesh.numberofelements,1); -md.elementonsurface=ones(md.mesh.numberofelements,1); +md.mesh.vertexonbed=ones(md.mesh.numberofvertices,1); +md.mesh.vertexonsurface=ones(md.mesh.numberofvertices,1); +md.mesh.elementonbed=ones(md.mesh.numberofelements,1); +md.mesh.elementonsurface=ones(md.mesh.numberofelements,1); %get coordinates of rift tips Index: /issm/trunk/src/m/model/mesh/setmesh.m =================================================================== --- /issm/trunk/src/m/model/mesh/setmesh.m (revision 9728) +++ /issm/trunk/src/m/model/mesh/setmesh.m (revision 9729) @@ -73,12 +73,12 @@ md.z=zeros(md.mesh.numberofvertices,1); md.mesh.vertexonboundary=zeros(md.mesh.numberofvertices,1); md.mesh.vertexonboundary(md.mesh.segments(:,1:2))=1; -md.nodeonbed=ones(md.mesh.numberofvertices,1); -md.nodeonsurface=ones(md.mesh.numberofvertices,1); -md.elementonbed=ones(md.mesh.numberofelements,1); -md.elementonsurface=ones(md.mesh.numberofelements,1); +md.mesh.vertexonbed=ones(md.mesh.numberofvertices,1); +md.mesh.vertexonsurface=ones(md.mesh.numberofvertices,1); +md.mesh.elementonbed=ones(md.mesh.numberofelements,1); +md.mesh.elementonsurface=ones(md.mesh.numberofelements,1); %Now, build the connectivity tables for this mesh. -md.mesh.nodeconnectivity=NodeConnectivity(md.elements,md.mesh.numberofvertices); -md.mesh.elementconnectivity=ElementConnectivity(md.elements,md.mesh.nodeconnectivity); +md.mesh.vertexconnectivity=NodeConnectivity(md.elements,md.mesh.numberofvertices); +md.mesh.elementconnectivity=ElementConnectivity(md.elements,md.mesh.vertexconnectivity); %type of model Index: /issm/trunk/src/m/model/modelextract.m =================================================================== --- /issm/trunk/src/m/model/modelextract.m (revision 9728) +++ /issm/trunk/src/m/model/modelextract.m (revision 9729) @@ -123,13 +123,13 @@ md2.elements=elements_2; - %mesh.uppernodes mesh.lowernodes + %mesh.uppervertex mesh.lowervertex if md1.dim==3 - md2.mesh.uppernodes=md1.mesh.uppernodes(pos_node); - pos=find(~isnan(md2.mesh.uppernodes)); - md2.mesh.uppernodes(pos)=Pnode(md2.mesh.uppernodes(pos)); - - md2.mesh.lowernodes=md1.mesh.lowernodes(pos_node); - pos=find(~isnan(md2.mesh.lowernodes)); - md2.mesh.lowernodes(pos)=Pnode(md2.mesh.lowernodes(pos)); + md2.mesh.uppervertex=md1.mesh.uppervertex(pos_node); + pos=find(~isnan(md2.mesh.uppervertex)); + md2.mesh.uppervertex(pos)=Pnode(md2.mesh.uppervertex(pos)); + + md2.mesh.lowervertex=md1.mesh.lowervertex(pos_node); + pos=find(~isnan(md2.mesh.lowervertex)); + md2.mesh.lowervertex(pos)=Pnode(md2.mesh.lowervertex(pos)); md2.mesh.upperelements=md1.mesh.upperelements(pos_elem); @@ -203,6 +203,6 @@ %recreate segments if md1.dim==2 - md2.mesh.nodeconnectivity=NodeConnectivity(md2.elements,md2.numberofnodes); - md2.mesh.elementconnectivity=ElementConnectivity(md2.elements,md2.mesh.nodeconnectivity); + md2.mesh.vertexconnectivity=NodeConnectivity(md2.elements,md2.numberofnodes); + md2.mesh.elementconnectivity=ElementConnectivity(md2.elements,md2.mesh.vertexconnectivity); md2.segments=contourenvelope(md2); md2.mesh.vertexonboundary=zeros(numberofnodes2,1); md2.nodeonboundary(md2.segments(:,1:2))=1; Index: /issm/trunk/src/m/model/partition/AreaAverageOntoPartition.m =================================================================== --- /issm/trunk/src/m/model/partition/AreaAverageOntoPartition.m (revision 9728) +++ /issm/trunk/src/m/model/partition/AreaAverageOntoPartition.m (revision 9729) @@ -22,5 +22,5 @@ md.mesh.numberofelements=md.mesh.numberofelements2d; md.vertex_weight=[]; - md.mesh.nodeconnectivity=[]; + md.mesh.vertexconnectivity=[]; %run connectivity routine Index: /issm/trunk/src/m/model/partition/adjacency.m =================================================================== --- /issm/trunk/src/m/model/partition/adjacency.m (revision 9728) +++ /issm/trunk/src/m/model/partition/adjacency.m (revision 9729) @@ -19,7 +19,7 @@ %get node connectivity -md.mesh.nodeconnectivity=NodeConnectivity(md.elements,md.mesh.numberofvertices); +md.mesh.vertexconnectivity=NodeConnectivity(md.elements,md.mesh.numberofvertices); -connectivity=md.mesh.nodeconnectivity(:,1:end-1); +connectivity=md.mesh.vertexconnectivity(:,1:end-1); pos=find(connectivity); connectivity(pos)=areas(connectivity(pos))/3; Index: /issm/trunk/src/m/model/partition/partitioner.m =================================================================== --- /issm/trunk/src/m/model/partition/partitioner.m (revision 9728) +++ /issm/trunk/src/m/model/partition/partitioner.m (revision 9729) @@ -40,5 +40,5 @@ md.mesh.numberofelements=md.mesh.numberofelements2d; md.qmu.vertex_weight=[]; - md.mesh.nodeconnectivity=[]; + md.mesh.vertexconnectivity=[]; end Index: /issm/trunk/src/m/model/setmask2.m =================================================================== --- /issm/trunk/src/m/model/setmask2.m (revision 9728) +++ /issm/trunk/src/m/model/setmask2.m (revision 9729) @@ -28,9 +28,9 @@ %Now, build the connectivity tables for this mesh. -if size(md.mesh.nodeconnectivity,1)~=md.mesh.numberofvertices, - md.mesh.nodeconnectivity=NodeConnectivity(md.elements,md.mesh.numberofvertices); +if size(md.mesh.vertexconnectivity,1)~=md.mesh.numberofvertices, + md.mesh.vertexconnectivity=NodeConnectivity(md.elements,md.mesh.numberofvertices); end if size(md.mesh.elementconnectivity,1)~=md.mesh.numberofelements, - md.mesh.elementconnectivity=ElementConnectivity(md.elements,md.mesh.nodeconnectivity); + md.mesh.elementconnectivity=ElementConnectivity(md.elements,md.mesh.vertexconnectivity); end @@ -125,7 +125,7 @@ %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.mesh.nodeconnectivity,2); -groundedcounters=md.mesh.nodeconnectivity(nodesgrounded,lengthconnectivity); -groundedconnectivity=md.mesh.nodeconnectivity(nodesgrounded,1:lengthconnectivity-1); +lengthconnectivity=size(md.mesh.vertexconnectivity,2); +groundedcounters=md.mesh.vertexconnectivity(nodesgrounded,lengthconnectivity); +groundedconnectivity=md.mesh.vertexconnectivity(nodesgrounded,1:lengthconnectivity-1); pos=find(groundedconnectivity); groundedconnectivity(pos)=elementonwater(groundedconnectivity(pos)); Index: /issm/trunk/src/m/utils/BC/SetIceSheetBC.m =================================================================== --- /issm/trunk/src/m/utils/BC/SetIceSheetBC.m (revision 9728) +++ /issm/trunk/src/m/utils/BC/SetIceSheetBC.m (revision 9729) @@ -60,5 +60,5 @@ if (length(md.initialization.temperature)==md.mesh.numberofvertices), md.thermal.spctemperature=NaN*ones(md.mesh.numberofvertices,1); - pos=find(md.nodeonsurface); md.thermal.spctemperature(pos)=md.initialization.temperature(pos); %impose observed temperature on surface + pos=find(md.mesh.vertexonsurface); md.thermal.spctemperature(pos)=md.initialization.temperature(pos); %impose observed temperature on surface if (length(md.basalforcings.geothermalflux)~=md.mesh.numberofvertices), md.basalforcings.geothermalflux=50*10^-3*ones(md.mesh.numberofvertices,1); %50 mW/m^2 Index: /issm/trunk/src/m/utils/BC/SetIceShelfBC.m =================================================================== --- /issm/trunk/src/m/utils/BC/SetIceShelfBC.m (revision 9728) +++ /issm/trunk/src/m/utils/BC/SetIceShelfBC.m (revision 9729) @@ -92,5 +92,5 @@ if (length(md.initialization.temperature)==md.mesh.numberofvertices), md.thermal.spctemperature=NaN*ones(md.mesh.numberofvertices,1); - pos=find(md.nodeonsurface); md.thermal.spctemperature(pos)=md.initialization.temperature(pos); %impose observed temperature on surface + pos=find(md.mesh.vertexonsurface); md.thermal.spctemperature(pos)=md.initialization.temperature(pos); %impose observed temperature on surface if (length(md.basalforcings.geothermalflux)~=md.mesh.numberofvertices), md.basalforcings.geothermalflux=zeros(md.mesh.numberofvertices,1); Index: /issm/trunk/src/m/utils/BC/SetMarineIceSheetBC.m =================================================================== --- /issm/trunk/src/m/utils/BC/SetMarineIceSheetBC.m (revision 9728) +++ /issm/trunk/src/m/utils/BC/SetMarineIceSheetBC.m (revision 9729) @@ -103,5 +103,5 @@ if (length(md.initialization.temperature)==md.mesh.numberofvertices), md.thermal.spctemperature=NaN*ones(md.mesh.numberofvertices,1); - pos=find(md.nodeonsurface); md.thermal.spctemperature(pos)=md.initialization.temperature(pos); %impose observed temperature on surface + pos=find(md.mesh.vertexonsurface); md.thermal.spctemperature(pos)=md.initialization.temperature(pos); %impose observed temperature on surface if (length(md.basalforcings.geothermalflux)~=md.mesh.numberofvertices), md.basalforcings.geothermalflux=zeros(md.mesh.numberofvertices,1); Index: /issm/trunk/src/m/utils/Mesh/NodeInElement.m =================================================================== --- /issm/trunk/src/m/utils/Mesh/NodeInElement.m (revision 9728) +++ /issm/trunk/src/m/utils/Mesh/NodeInElement.m (revision 9729) @@ -2,5 +2,5 @@ %NODEINELEMENT: find for a list of nodes (in newx,newy), which elements in the mesh (elements,x,y) they belong to. % -% Usage: node_in_element=NodeInElement(newx,newy,elements,x,y,md.nodeconnectivity); +% Usage: node_in_element=NodeInElement(newx,newy,elements,x,y,md.mesh.vertexconnectivity); % % See also Nodeconnectivity Index: /issm/trunk/src/m/utils/Mesh/ProfileProjectOntoMesh.m =================================================================== --- /issm/trunk/src/m/utils/Mesh/ProfileProjectOntoMesh.m (revision 9728) +++ /issm/trunk/src/m/utils/Mesh/ProfileProjectOntoMesh.m (revision 9729) @@ -48,5 +48,5 @@ %now, for each node, figure out which element it belongs to. -node_in_element=NodeInElement(newx,newy,md.elements,md.x,md.y,md.mesh.nodeconnectivity); +node_in_element=NodeInElement(newx,newy,md.elements,md.x,md.y,md.mesh.vertexconnectivity); % eliminate nodes that don't fall in any element Index: /issm/trunk/src/m/utils/Mesh/argusmesh.m =================================================================== --- /issm/trunk/src/m/utils/Mesh/argusmesh.m (revision 9728) +++ /issm/trunk/src/m/utils/Mesh/argusmesh.m (revision 9729) @@ -83,8 +83,8 @@ md.mesh.numberofvertices=size(md.x,1); md.mesh.numberofelements=size(md.elements,1); -md.nodeonbed=ones(md.mesh.numberofvertices,1); -md.nodeonsurface=ones(md.mesh.numberofvertices,1); -md.elementonbed=ones(md.mesh.numberofelements,1); -md.elementonsurface=ones(md.mesh.numberofelements,1); +md.mesh.vertexonbed=ones(md.mesh.numberofvertices,1); +md.mesh.vertexonsurface=ones(md.mesh.numberofvertices,1); +md.mesh.elementonbed=ones(md.mesh.numberofelements,1); +md.mesh.elementonsurface=ones(md.mesh.numberofelements,1); md.mesh.dimension=2; md=addnote(md,notes); Index: /issm/trunk/src/m/utils/Mesh/squaremesh.m =================================================================== --- /issm/trunk/src/m/utils/Mesh/squaremesh.m (revision 9728) +++ /issm/trunk/src/m/utils/Mesh/squaremesh.m (revision 9729) @@ -61,6 +61,6 @@ md.mesh.numberofvertices=nods; md.mesh.vertexonboundary=zeros(nods,1);md.mesh.vertexonboundary(segments(:,1:2))=1; -md.nodeonbed=ones(nods,1); -md.nodeonsurface=ones(nods,1); +md.mesh.vertexonbed=ones(nods,1); +md.mesh.vertexonsurface=ones(nods,1); %plug elements @@ -68,10 +68,10 @@ md.mesh.segments=segments; md.mesh.numberofelements=nel; -md.elementonbed=ones(nel,1); -md.elementonsurface=ones(nel,1); +md.mesh.elementonbed=ones(nel,1); +md.mesh.elementonsurface=ones(nel,1); %Now, build the connectivity tables for this mesh. -md.mesh.nodeconnectivity=NodeConnectivity(md.elements,md.mesh.numberofvertices); -md.mesh.elementconnectivity=ElementConnectivity(md.elements,md.mesh.nodeconnectivity); +md.mesh.vertexconnectivity=NodeConnectivity(md.elements,md.mesh.numberofvertices); +md.mesh.elementconnectivity=ElementConnectivity(md.elements,md.mesh.vertexconnectivity); %plug other field Index: /issm/trunk/template =================================================================== --- /issm/trunk/template (revision 9728) +++ /issm/trunk/template (revision 9729) @@ -11,9 +11,4 @@ x2d y2d - - elementonbed - elementonsurface - nodeonbed - nodeonsurface }}} Index: /issm/trunk/test/NightlyRun/test1101.m =================================================================== --- /issm/trunk/test/NightlyRun/test1101.m (revision 9728) +++ /issm/trunk/test/NightlyRun/test1101.m (revision 9729) @@ -25,5 +25,5 @@ md.diagnostic.spcvz=NaN*ones(md.mesh.numberofvertices,1); - pos=find(md.nodeonbed); + pos=find(md.mesh.vertexonbed); md.diagnostic.spcvx(pos)=0; md.diagnostic.spcvy(pos)=0; Index: /issm/trunk/test/NightlyRun/test1102.m =================================================================== --- /issm/trunk/test/NightlyRun/test1102.m (revision 9728) +++ /issm/trunk/test/NightlyRun/test1102.m (revision 9729) @@ -28,5 +28,5 @@ %Create dirichlet on the bed only - pos=find(md.nodeonbed); + pos=find(md.mesh.vertexonbed); md.diagnostic.spcvx(pos)=0; md.diagnostic.spcvy(pos)=0; @@ -36,9 +36,9 @@ %posx=find(md.x==0); %posx2=find(md.x==max(md.x)); - %posx=find(md.x==0 & md.y~=0 & md.y~=max(md.y) & ~md.nodeonbed); - %posx2=find(md.x==max(md.x) & md.y~=0 & md.y~=max(md.y) & ~md.nodeonbed); + %posx=find(md.x==0 & md.y~=0 & md.y~=max(md.y) & ~md.mesh.vertexonbed); + %posx2=find(md.x==max(md.x) & md.y~=0 & md.y~=max(md.y) & ~md.mesh.vertexonbed); - %posy=find(md.y==0 & md.x~=0 & md.x~=max(md.x) & ~md.nodeonbed); %Don't take the same nodes two times - %posy2=find(md.y==max(md.y) & md.x~=0 & md.x~=max(md.x) & ~md.nodeonbed); + %posy=find(md.y==0 & md.x~=0 & md.x~=max(md.x) & ~md.mesh.vertexonbed); %Don't take the same nodes two times + %posy2=find(md.y==max(md.y) & md.x~=0 & md.x~=max(md.x) & ~md.mesh.vertexonbed); %md.diagnostic.vertex_pairing=[posx,posx2;posy,posy2]; Index: /issm/trunk/test/NightlyRun/test1103.m =================================================================== --- /issm/trunk/test/NightlyRun/test1103.m (revision 9728) +++ /issm/trunk/test/NightlyRun/test1103.m (revision 9729) @@ -22,5 +22,5 @@ md.diagnostic.spcvy=NaN*ones(md.mesh.numberofvertices,1); md.diagnostic.spcvz=NaN*ones(md.mesh.numberofvertices,1); - pos=find(md.nodeonbed); + pos=find(md.mesh.vertexonbed); md.diagnostic.spcvx(pos)=0; md.diagnostic.spcvy(pos)=0; Index: /issm/trunk/test/NightlyRun/test1104.m =================================================================== --- /issm/trunk/test/NightlyRun/test1104.m (revision 9728) +++ /issm/trunk/test/NightlyRun/test1104.m (revision 9729) @@ -22,5 +22,5 @@ md.diagnostic.spcvz=NaN*ones(md.mesh.numberofvertices,1); - pos=find(md.nodeonbed); + pos=find(md.mesh.vertexonbed); md.diagnostic.spcvx(pos)=0; md.diagnostic.spcvy(pos)=0; Index: /issm/trunk/test/NightlyRun/test1105.m =================================================================== --- /issm/trunk/test/NightlyRun/test1105.m (revision 9728) +++ /issm/trunk/test/NightlyRun/test1105.m (revision 9729) @@ -34,5 +34,5 @@ %Add spc on the corners - pos=find((md.x==0 | md.x==L) & (md.y==0 | md.y==L) & md.nodeonbed); + pos=find((md.x==0 | md.x==L) & (md.y==0 | md.y==L) & md.mesh.vertexonbed); md.diagnostic.spcvx(pos)=0; md.diagnostic.spcvy(pos)=0; @@ -58,5 +58,5 @@ %Spc the bed at zero for vz - pos=find(md.nodeonbed); + pos=find(md.mesh.vertexonbed); md.diagnostic.spcvz(pos)=0; Index: /issm/trunk/test/NightlyRun/test1107.m =================================================================== --- /issm/trunk/test/NightlyRun/test1107.m (revision 9728) +++ /issm/trunk/test/NightlyRun/test1107.m (revision 9729) @@ -26,6 +26,6 @@ %Create MPCs to have periodic boundary conditions - posx=find(md.x==0 & ~(md.y==0 & md.nodeonbed) & ~(md.y==L & md.nodeonbed)); - posx2=find(md.x==max(md.x) & ~(md.y==0 & md.nodeonbed) & ~(md.y==L & md.nodeonbed)); + posx=find(md.x==0 & ~(md.y==0 & md.mesh.vertexonbed) & ~(md.y==L & md.mesh.vertexonbed)); + posx2=find(md.x==max(md.x) & ~(md.y==0 & md.mesh.vertexonbed) & ~(md.y==L & md.mesh.vertexonbed)); posy=find(md.y==0 & md.x~=0 & md.x~=max(md.x)); %Don't take the same nodes two times @@ -35,5 +35,5 @@ %Add spc on the corners - pos=find((md.x==0 | md.x==L) & (md.y==0 | md.y==L) & md.nodeonbed); + pos=find((md.x==0 | md.x==L) & (md.y==0 | md.y==L) & md.mesh.vertexonbed); md.diagnostic.spcvy(:)=0; md.diagnostic.spcvx(pos)=0; @@ -53,5 +53,5 @@ %Spc the bed at zero for vz - pos=find(md.nodeonbed); + pos=find(md.mesh.vertexonbed); md.diagnostic.spcvz(pos)=0; Index: /issm/trunk/test/NightlyRun/test1109.m =================================================================== --- /issm/trunk/test/NightlyRun/test1109.m (revision 9728) +++ /issm/trunk/test/NightlyRun/test1109.m (revision 9729) @@ -31,5 +31,5 @@ %Create spcs on the bed - pos=find(md.nodeonbed); + pos=find(md.mesh.vertexonbed); md.diagnostic.spcvx=NaN*ones(md.mesh.numberofvertices,1); md.diagnostic.spcvy=NaN*ones(md.mesh.numberofvertices,1); Index: /issm/trunk/test/NightlyRun/test1110.m =================================================================== --- /issm/trunk/test/NightlyRun/test1110.m (revision 9728) +++ /issm/trunk/test/NightlyRun/test1110.m (revision 9729) @@ -25,15 +25,15 @@ if (i==1 | i==3), %Create dirichlet on the bed if no slip - pos=find(md.nodeonbed); + pos=find(md.mesh.vertexonbed); md.diagnostic.spcvx(pos)=0; md.diagnostic.spcvy(pos)=0; md.diagnostic.spcvz(pos)=0; else - pos=find(md.nodeonbed & (md.x==0 | md.x==max(md.x)) & (md.y==0 | md.y==max(md.y))); + pos=find(md.mesh.vertexonbed & (md.x==0 | md.x==max(md.x)) & (md.y==0 | md.y==max(md.y))); md.diagnostic.spcvx(pos)=100; %because we need a dirichlet somewhere md.diagnostic.spcvy(pos)=0; md.diagnostic.spcvz(pos)=0; end - pos=find(~md.nodeonbed); + pos=find(~md.mesh.vertexonbed); md.thermal.spctemperature(pos)=255; Index: /issm/trunk/test/NightlyRun/test1205.m =================================================================== --- /issm/trunk/test/NightlyRun/test1205.m (revision 9728) +++ /issm/trunk/test/NightlyRun/test1205.m (revision 9729) @@ -22,5 +22,5 @@ %Spc the nodes on the bed -pos=find(md.nodeonbed); +pos=find(md.mesh.vertexonbed); md.diagnostic.spcvx(pos)=0; md.diagnostic.spcvy(pos)=0; Index: /issm/trunk/test/NightlyRun/test1206.m =================================================================== --- /issm/trunk/test/NightlyRun/test1206.m (revision 9728) +++ /issm/trunk/test/NightlyRun/test1206.m (revision 9729) @@ -22,5 +22,5 @@ %Spc the nodes on the bed -pos=find(md.nodeonbed); +pos=find(md.mesh.vertexonbed); md.diagnostic.spcvx(pos)=0; md.diagnostic.spcvy(pos)=0; Index: /issm/trunk/test/NightlyRun/test1207.m =================================================================== --- /issm/trunk/test/NightlyRun/test1207.m (revision 9728) +++ /issm/trunk/test/NightlyRun/test1207.m (revision 9729) @@ -22,5 +22,5 @@ %Spc the nodes on the bed -pos=find(md.nodeonbed); +pos=find(md.mesh.vertexonbed); md.diagnostic.spcvx(pos)=0; md.diagnostic.spcvy(pos)=0; Index: /issm/trunk/test/NightlyRun/test1208.m =================================================================== --- /issm/trunk/test/NightlyRun/test1208.m (revision 9728) +++ /issm/trunk/test/NightlyRun/test1208.m (revision 9729) @@ -13,5 +13,5 @@ %Spc the nodes on the bed -pos=find(md.nodeonbed); +pos=find(md.mesh.vertexonbed); md.diagnostic.spcvx(pos)=0; md.diagnostic.spcvy(pos)=0; Index: /issm/trunk/test/NightlyRun/test1301.m =================================================================== --- /issm/trunk/test/NightlyRun/test1301.m (revision 9728) +++ /issm/trunk/test/NightlyRun/test1301.m (revision 9729) @@ -15,5 +15,5 @@ md.initialization.pressure=zeros(md.mesh.numberofvertices,1); md.initialization.temperature=273.15*ones(md.mesh.numberofvertices,1); -pos=find(md.nodeonsurface); +pos=find(md.mesh.vertexonsurface); md.thermal.spctemperature(pos)=md.initialization.temperature(pos); md.materials.rheology_B=paterson(md.initialization.temperature); Index: /issm/trunk/test/NightlyRun/test1302.m =================================================================== --- /issm/trunk/test/NightlyRun/test1302.m (revision 9728) +++ /issm/trunk/test/NightlyRun/test1302.m (revision 9729) @@ -12,6 +12,6 @@ %Thermal boundary conditions -pos1=find(md.elementonbed); md.thermal.spctemperature(md.elements(pos1,1:3))=10; -pos2=find(md.elementonsurface); md.thermal.spctemperature(md.elements(pos2,4:6))=0; +pos1=find(md.mesh.elementonbed); md.thermal.spctemperature(md.elements(pos1,1:3))=10; +pos2=find(md.mesh.elementonsurface); md.thermal.spctemperature(md.elements(pos2,4:6))=0; md.initialization.vz=0.1*ones(md.mesh.numberofvertices,1); md.initialization.vel=sqrt( md.initialization.vx.^2+ md.initialization.vy.^2+ md.initialization.vz.^2); Index: /issm/trunk/test/NightlyRun/test1303.m =================================================================== --- /issm/trunk/test/NightlyRun/test1303.m (revision 9728) +++ /issm/trunk/test/NightlyRun/test1303.m (revision 9729) @@ -11,6 +11,6 @@ md=extrude(md,11,2); md=setflowequation(md,'Pattyn','all'); -pos1=find(md.elementonbed); md.thermal.spctemperature(md.elements(pos1,1:3))=10; -pos2=find(md.elementonsurface); md.thermal.spctemperature(md.elements(pos2,4:6))=0; +pos1=find(md.mesh.elementonbed); md.thermal.spctemperature(md.elements(pos1,1:3))=10; +pos2=find(md.mesh.elementonsurface); md.thermal.spctemperature(md.elements(pos2,4:6))=0; md.initialization.pressure=zeros(md.mesh.numberofvertices,1); Index: /issm/trunk/test/NightlyRun/test1304.m =================================================================== --- /issm/trunk/test/NightlyRun/test1304.m (revision 9728) +++ /issm/trunk/test/NightlyRun/test1304.m (revision 9729) @@ -12,5 +12,5 @@ md=setflowequation(md,'Pattyn','all'); -pos2=find(md.elementonsurface); md.thermal.spctemperature(md.elements(pos2,4:6))=0; +pos2=find(md.mesh.elementonsurface); md.thermal.spctemperature(md.elements(pos2,4:6))=0; md.initialization.pressure=zeros(md.mesh.numberofvertices,1); md.basalforcings.geothermalflux(:)=0.1; %100mW/m^2