Index: /issm/trunk-jpl/src/c/analyses/BalancethicknessAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/BalancethicknessAnalysis.cpp (revision 17609) +++ /issm/trunk-jpl/src/c/analyses/BalancethicknessAnalysis.cpp (revision 17610) @@ -45,5 +45,5 @@ if(iomodel->meshtype==Mesh3DEnum){ - iomodel->FetchDataToInput(elements,MeshElementonbedEnum); + iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); } @@ -58,5 +58,5 @@ /*First fetch data: */ - if(iomodel->meshtype==Mesh3DEnum) iomodel->FetchData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + if(iomodel->meshtype==Mesh3DEnum) iomodel->FetchData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); if(stabilization!=3){ ::CreateNodes(nodes,iomodel,BalancethicknessAnalysisEnum,P1Enum); @@ -65,5 +65,5 @@ ::CreateNodes(nodes,iomodel,BalancethicknessAnalysisEnum,P1DGEnum); } - iomodel->DeleteData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + iomodel->DeleteData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); }/*}}}*/ void BalancethicknessAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/ Index: /issm/trunk-jpl/src/c/analyses/BalancevelocityAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/BalancevelocityAnalysis.cpp (revision 17609) +++ /issm/trunk-jpl/src/c/analyses/BalancevelocityAnalysis.cpp (revision 17610) @@ -34,5 +34,5 @@ if(iomodel->meshtype==Mesh3DEnum){ - iomodel->FetchDataToInput(elements,MeshElementonbedEnum); + iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); } Index: /issm/trunk-jpl/src/c/analyses/DamageEvolutionAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/DamageEvolutionAnalysis.cpp (revision 17609) +++ /issm/trunk-jpl/src/c/analyses/DamageEvolutionAnalysis.cpp (revision 17610) @@ -73,7 +73,7 @@ void DamageEvolutionAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/ - if(iomodel->meshtype!=Mesh2DhorizontalEnum) iomodel->FetchData(1,MeshVertexonbedEnum); + if(iomodel->meshtype!=Mesh2DhorizontalEnum) iomodel->FetchData(1,MeshVertexonbaseEnum); ::CreateNodes(nodes,iomodel,DamageEvolutionAnalysisEnum,P1Enum); - iomodel->DeleteData(1,MeshVertexonbedEnum); + iomodel->DeleteData(1,MeshVertexonbaseEnum); }/*}}}*/ void DamageEvolutionAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/ Index: /issm/trunk-jpl/src/c/analyses/DepthAverageAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/DepthAverageAnalysis.cpp (revision 17609) +++ /issm/trunk-jpl/src/c/analyses/DepthAverageAnalysis.cpp (revision 17610) @@ -23,5 +23,5 @@ if(iomodel->meshtype==Mesh2DverticalEnum){ - iomodel->FetchDataToInput(elements,MeshVertexonbedEnum); + iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); } }/*}}}*/ Index: /issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp (revision 17609) +++ /issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp (revision 17610) @@ -59,5 +59,5 @@ iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); iomodel->FetchDataToInput(elements,MaskGroundediceLevelsetEnum); - iomodel->FetchDataToInput(elements,MeshElementonbedEnum); + iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); iomodel->FetchDataToInput(elements,FlowequationElementEquationEnum); @@ -86,5 +86,5 @@ if(islevelset){ iomodel->FetchDataToInput(elements,IceMaskNodeActivationEnum); - iomodel->FetchDataToInput(elements,MeshVertexonbedEnum); // required for updating active nodes + iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); // required for updating active nodes } @@ -94,7 +94,7 @@ void EnthalpyAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/ - if(iomodel->meshtype==Mesh3DEnum) iomodel->FetchData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + if(iomodel->meshtype==Mesh3DEnum) iomodel->FetchData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); ::CreateNodes(nodes,iomodel,EnthalpyAnalysisEnum,P1Enum); - iomodel->DeleteData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + iomodel->DeleteData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); }/*}}}*/ void EnthalpyAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/ Index: /issm/trunk-jpl/src/c/analyses/ExtrapolationAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/ExtrapolationAnalysis.cpp (revision 17609) +++ /issm/trunk-jpl/src/c/analyses/ExtrapolationAnalysis.cpp (revision 17610) @@ -31,5 +31,5 @@ } if(iomodel->meshtype==Mesh3DEnum){ - iomodel->FetchDataToInput(elements,MeshElementonbedEnum); + iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); } @@ -38,7 +38,7 @@ void ExtrapolationAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/ int finiteelement=P1Enum; - if(iomodel->meshtype!=Mesh2DhorizontalEnum) iomodel->FetchData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + if(iomodel->meshtype!=Mesh2DhorizontalEnum) iomodel->FetchData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); ::CreateNodes(nodes,iomodel,ExtrapolationAnalysisEnum,finiteelement); - iomodel->DeleteData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + iomodel->DeleteData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); } /*}}}*/ Index: /issm/trunk-jpl/src/c/analyses/ExtrudeFromBaseAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/ExtrudeFromBaseAnalysis.cpp (revision 17609) +++ /issm/trunk-jpl/src/c/analyses/ExtrudeFromBaseAnalysis.cpp (revision 17610) @@ -23,5 +23,5 @@ if(iomodel->meshtype==Mesh2DverticalEnum){ - iomodel->FetchDataToInput(elements,MeshVertexonbedEnum); + iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); } }/*}}}*/ Index: /issm/trunk-jpl/src/c/analyses/ExtrudeFromTopAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/ExtrudeFromTopAnalysis.cpp (revision 17609) +++ /issm/trunk-jpl/src/c/analyses/ExtrudeFromTopAnalysis.cpp (revision 17610) @@ -23,5 +23,5 @@ if(iomodel->meshtype==Mesh2DverticalEnum){ - iomodel->FetchDataToInput(elements,MeshVertexonbedEnum); + iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); } }/*}}}*/ Index: /issm/trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.cpp (revision 17609) +++ /issm/trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.cpp (revision 17610) @@ -37,5 +37,5 @@ if(iomodel->meshtype==Mesh3DEnum){ iomodel->FetchDataToInput(elements,VzEnum); - iomodel->FetchDataToInput(elements,MeshElementonbedEnum); + iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); } @@ -43,7 +43,7 @@ void FreeSurfaceBaseAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/ - if(iomodel->meshtype!=Mesh2DhorizontalEnum) iomodel->FetchData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + if(iomodel->meshtype!=Mesh2DhorizontalEnum) iomodel->FetchData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); ::CreateNodes(nodes,iomodel,FreeSurfaceBaseAnalysisEnum,P1Enum); - iomodel->DeleteData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + iomodel->DeleteData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); }/*}}}*/ void FreeSurfaceBaseAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/ @@ -58,7 +58,7 @@ /*Create Penpair for vertex_pairing: */ IssmDouble *vertex_pairing=NULL; - IssmDouble *nodeonbed=NULL; + IssmDouble *nodeonbase=NULL; iomodel->FetchData(&vertex_pairing,&numvertex_pairing,NULL,MasstransportVertexPairingEnum); - if(iomodel->meshtype!=Mesh2DhorizontalEnum) iomodel->FetchData(&nodeonbed,NULL,NULL,MeshVertexonbedEnum); + if(iomodel->meshtype!=Mesh2DhorizontalEnum) iomodel->FetchData(&nodeonbase,NULL,NULL,MeshVertexonbaseEnum); for(int i=0;imeshtype!=Mesh2DhorizontalEnum){ - if(!(reCast(nodeonbed[reCast(vertex_pairing[2*i+0])-1])) || !(reCast(nodeonbed[reCast(vertex_pairing[2*i+1])-1]))) continue; + if(!(reCast(nodeonbase[reCast(vertex_pairing[2*i+0])-1])) || !(reCast(nodeonbase[reCast(vertex_pairing[2*i+1])-1]))) continue; } @@ -88,5 +88,5 @@ /*free ressources: */ iomodel->DeleteData(vertex_pairing,MasstransportVertexPairingEnum); - iomodel->DeleteData(nodeonbed,MeshVertexonbedEnum); + iomodel->DeleteData(nodeonbase,MeshVertexonbaseEnum); }/*}}}*/ @@ -368,5 +368,5 @@ /*Intermediary*/ - IssmDouble phi,isonbed,base; + IssmDouble phi,isonbase,base; for(int i=0;ielements->Size();i++){ @@ -377,5 +377,5 @@ int numnodes = element->GetNumberOfNodes(); Input* groundedice_input = element->GetInput(MaskGroundediceLevelsetEnum); _assert_(groundedice_input); - Input* onbed_input = element->GetInput(MeshVertexonbedEnum); _assert_(onbed_input); + Input* onbase_input = element->GetInput(MeshVertexonbaseEnum); _assert_(onbase_input); Input* base_input = element->GetInput(BaseEnum); _assert_(base_input); @@ -383,6 +383,6 @@ for(int iv=0;ivGaussNode(element->GetElementType(),iv); - onbed_input->GetInputValue(&isonbed,gauss); - if(isonbed==1.){ + onbase_input->GetInputValue(&isonbase,gauss); + if(isonbase==1.){ groundedice_input->GetInputValue(&phi,gauss); if(phi>=0.){ Index: /issm/trunk-jpl/src/c/analyses/FreeSurfaceTopAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/FreeSurfaceTopAnalysis.cpp (revision 17609) +++ /issm/trunk-jpl/src/c/analyses/FreeSurfaceTopAnalysis.cpp (revision 17610) @@ -38,5 +38,5 @@ if(iomodel->meshtype==Mesh3DEnum){ iomodel->FetchDataToInput(elements,VzEnum); - iomodel->FetchDataToInput(elements,MeshElementonbedEnum); + iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); } @@ -52,7 +52,7 @@ void FreeSurfaceTopAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/ - if(iomodel->meshtype!=Mesh2DhorizontalEnum) iomodel->FetchData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + if(iomodel->meshtype!=Mesh2DhorizontalEnum) iomodel->FetchData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); ::CreateNodes(nodes,iomodel,FreeSurfaceTopAnalysisEnum,P1Enum); - iomodel->DeleteData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + iomodel->DeleteData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); }/*}}}*/ void FreeSurfaceTopAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/ Index: /issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp (revision 17609) +++ /issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp (revision 17610) @@ -56,5 +56,5 @@ iomodel->FetchDataToInput(elements,HydrologydcSedimentTransmitivityEnum); iomodel->FetchDataToInput(elements,HydrologydcEplThicknessEnum); - if(iomodel->meshtype==Mesh3DEnum) iomodel->FetchDataToInput(elements,MeshElementonbedEnum); + if(iomodel->meshtype==Mesh3DEnum) iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); // elements->InputDuplicate(HydrologydcEplInitialThicknessEnum,HydrologydcEplThicknessEnum); @@ -73,7 +73,7 @@ if(!isefficientlayer) return; - if(iomodel->meshtype!=Mesh2DhorizontalEnum) iomodel->FetchData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + if(iomodel->meshtype!=Mesh2DhorizontalEnum) iomodel->FetchData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); ::CreateNodes(nodes,iomodel,HydrologyDCEfficientAnalysisEnum,P1Enum); - iomodel->DeleteData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + iomodel->DeleteData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); }/*}}}*/ void HydrologyDCEfficientAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/ Index: /issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp (revision 17609) +++ /issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp (revision 17610) @@ -88,5 +88,5 @@ iomodel->FetchDataToInput(elements,SedimentHeadEnum); iomodel->FetchDataToInput(elements,HydrologydcSedimentTransmitivityEnum); - if(iomodel->meshtype==Mesh3DEnum) iomodel->FetchDataToInput(elements,MeshElementonbedEnum); + if(iomodel->meshtype==Mesh3DEnum) iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); if(isefficientlayer)iomodel->FetchDataToInput(elements,HydrologydcMaskEplactiveNodeEnum); @@ -101,7 +101,7 @@ if(hydrology_model!=HydrologydcEnum) return; - if(iomodel->meshtype!=Mesh2DhorizontalEnum) iomodel->FetchData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + if(iomodel->meshtype!=Mesh2DhorizontalEnum) iomodel->FetchData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); ::CreateNodes(nodes,iomodel,HydrologyDCInefficientAnalysisEnum,P1Enum); - iomodel->DeleteData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + iomodel->DeleteData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); }/*}}}*/ void HydrologyDCInefficientAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/ @@ -121,5 +121,5 @@ if(hydrology_model!=HydrologydcEnum) return; - if(iomodel->meshtype==Mesh3DEnum) iomodel->FetchData(1,MeshVertexonbedEnum); + if(iomodel->meshtype==Mesh3DEnum) iomodel->FetchData(1,MeshVertexonbaseEnum); //create penalties for nodes: no node can have water above the max @@ -132,5 +132,5 @@ } } - else if(reCast(iomodel->Data(MeshVertexonbedEnum)[i])){ + else if(reCast(iomodel->Data(MeshVertexonbaseEnum)[i])){ if(iomodel->my_vertices[i]){ loads->AddObject(new Pengrid(iomodel->loadcounter+i+1,i,iomodel,HydrologyDCInefficientAnalysisEnum)); @@ -138,5 +138,5 @@ } } - iomodel->DeleteData(1,MeshVertexonbedEnum); + iomodel->DeleteData(1,MeshVertexonbaseEnum); }/*}}}*/ Index: /issm/trunk-jpl/src/c/analyses/HydrologyShreveAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/HydrologyShreveAnalysis.cpp (revision 17609) +++ /issm/trunk-jpl/src/c/analyses/HydrologyShreveAnalysis.cpp (revision 17610) @@ -44,5 +44,5 @@ iomodel->FetchDataToInput(elements,SurfaceEnum); iomodel->FetchDataToInput(elements,BaseEnum); - iomodel->FetchDataToInput(elements,MeshElementonbedEnum); + iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); @@ -62,7 +62,7 @@ if(hydrology_model!=HydrologyshreveEnum) return; - if(iomodel->meshtype==Mesh3DEnum) iomodel->FetchData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + if(iomodel->meshtype==Mesh3DEnum) iomodel->FetchData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); ::CreateNodes(nodes,iomodel,HydrologyShreveAnalysisEnum,P1Enum); - iomodel->DeleteData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + iomodel->DeleteData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); }/*}}}*/ void HydrologyShreveAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/ Index: /issm/trunk-jpl/src/c/analyses/L2ProjectionBaseAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/L2ProjectionBaseAnalysis.cpp (revision 17609) +++ /issm/trunk-jpl/src/c/analyses/L2ProjectionBaseAnalysis.cpp (revision 17610) @@ -27,9 +27,9 @@ iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); if(iomodel->meshtype==Mesh3DEnum){ - iomodel->FetchDataToInput(elements,MeshElementonbedEnum); + iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); } if(iomodel->meshtype==Mesh2DverticalEnum){ - iomodel->FetchDataToInput(elements,MeshVertexonbedEnum); + iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); } }/*}}}*/ @@ -37,11 +37,11 @@ if(iomodel->meshtype==Mesh3DEnum || iomodel->meshtype==Mesh3DtetrasEnum){ - iomodel->FetchData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + iomodel->FetchData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); } else if(iomodel->meshtype==Mesh2DverticalEnum){ - iomodel->FetchData(1,MeshVertexonbedEnum); + iomodel->FetchData(1,MeshVertexonbaseEnum); } ::CreateNodes(nodes,iomodel,L2ProjectionBaseAnalysisEnum,P1Enum); - iomodel->DeleteData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + iomodel->DeleteData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); }/*}}}*/ void L2ProjectionBaseAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/ Index: /issm/trunk-jpl/src/c/analyses/L2ProjectionEPLAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/L2ProjectionEPLAnalysis.cpp (revision 17609) +++ /issm/trunk-jpl/src/c/analyses/L2ProjectionEPLAnalysis.cpp (revision 17610) @@ -37,5 +37,5 @@ iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); if(iomodel->meshtype==Mesh3DEnum){ - iomodel->FetchDataToInput(elements,MeshElementonbedEnum); + iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); } }/*}}}*/ @@ -52,11 +52,11 @@ if(iomodel->meshtype==Mesh3DEnum){ - iomodel->FetchData(1,MeshVertexonbedEnum); + iomodel->FetchData(1,MeshVertexonbaseEnum); } else if(iomodel->meshtype==Mesh2DverticalEnum){ - iomodel->FetchData(1,MeshVertexonbedEnum); + iomodel->FetchData(1,MeshVertexonbaseEnum); } ::CreateNodes(nodes,iomodel,L2ProjectionEPLAnalysisEnum,P1Enum); - iomodel->DeleteData(1,MeshVertexonbedEnum); + iomodel->DeleteData(1,MeshVertexonbaseEnum); }/*}}}*/ void L2ProjectionEPLAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/ Index: /issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp (revision 17609) +++ /issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp (revision 17610) @@ -38,7 +38,7 @@ void LevelsetAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/ int finiteelement=P1Enum; - if(iomodel->meshtype!=Mesh2DhorizontalEnum) iomodel->FetchData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + if(iomodel->meshtype!=Mesh2DhorizontalEnum) iomodel->FetchData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); ::CreateNodes(nodes,iomodel,LevelsetAnalysisEnum,finiteelement); - iomodel->DeleteData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + iomodel->DeleteData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); } /*}}}*/ Index: /issm/trunk-jpl/src/c/analyses/LsfReinitializationAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/LsfReinitializationAnalysis.cpp (revision 17609) +++ /issm/trunk-jpl/src/c/analyses/LsfReinitializationAnalysis.cpp (revision 17610) @@ -36,7 +36,7 @@ void LsfReinitializationAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/ int finiteelement=P1Enum; - if(iomodel->meshtype!=Mesh2DhorizontalEnum) iomodel->FetchData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + if(iomodel->meshtype!=Mesh2DhorizontalEnum) iomodel->FetchData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); ::CreateNodes(nodes,iomodel,LsfReinitializationAnalysisEnum,finiteelement); - iomodel->DeleteData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + iomodel->DeleteData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); }/*}}}*/ void LsfReinitializationAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/ Index: /issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp (revision 17609) +++ /issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp (revision 17610) @@ -84,5 +84,5 @@ if(iomodel->meshtype==Mesh3DEnum){ - iomodel->FetchDataToInput(elements,MeshElementonbedEnum); + iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); } @@ -91,5 +91,5 @@ iomodel->FetchDataToInput(elements,IceMaskNodeActivationEnum); if(iomodel->meshtype!=Mesh2DhorizontalEnum) - iomodel->FetchDataToInput(elements,MeshVertexonbedEnum); // required for updating active nodes + iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); // required for updating active nodes } @@ -135,5 +135,5 @@ /*Create Nodes either DG or CG depending on stabilization*/ - if(iomodel->meshtype!=Mesh2DhorizontalEnum) iomodel->FetchData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + if(iomodel->meshtype!=Mesh2DhorizontalEnum) iomodel->FetchData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); if(stabilization!=3){ ::CreateNodes(nodes,iomodel,MasstransportAnalysisEnum,P1Enum); @@ -142,5 +142,5 @@ ::CreateNodes(nodes,iomodel,MasstransportAnalysisEnum,P1DGEnum); } - iomodel->DeleteData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + iomodel->DeleteData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); }/*}}}*/ void MasstransportAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/ @@ -193,7 +193,7 @@ /*Create Penpair for vertex_pairing: */ IssmDouble *vertex_pairing=NULL; - IssmDouble *nodeonbed=NULL; + IssmDouble *nodeonbase=NULL; iomodel->FetchData(&vertex_pairing,&numvertex_pairing,NULL,MasstransportVertexPairingEnum); - if(iomodel->meshtype!=Mesh2DhorizontalEnum) iomodel->FetchData(&nodeonbed,NULL,NULL,MeshVertexonbedEnum); + if(iomodel->meshtype!=Mesh2DhorizontalEnum) iomodel->FetchData(&nodeonbase,NULL,NULL,MeshVertexonbaseEnum); for(int i=0;imeshtype!=Mesh2DhorizontalEnum){ - if(!(reCast(nodeonbed[reCast(vertex_pairing[2*i+0])-1])) || !(reCast(nodeonbed[reCast(vertex_pairing[2*i+1])-1]))) continue; + if(!(reCast(nodeonbase[reCast(vertex_pairing[2*i+0])-1])) || !(reCast(nodeonbase[reCast(vertex_pairing[2*i+1])-1]))) continue; } @@ -224,5 +224,5 @@ /*free ressources: */ iomodel->DeleteData(vertex_pairing,MasstransportVertexPairingEnum); - iomodel->DeleteData(nodeonbed,MeshVertexonbedEnum); + iomodel->DeleteData(nodeonbase,MeshVertexonbaseEnum); }/*}}}*/ Index: /issm/trunk-jpl/src/c/analyses/MeltingAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/MeltingAnalysis.cpp (revision 17609) +++ /issm/trunk-jpl/src/c/analyses/MeltingAnalysis.cpp (revision 17610) @@ -34,5 +34,5 @@ iomodel->FetchDataToInput(elements,FrictionQEnum); iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); - iomodel->FetchDataToInput(elements,MeshElementonbedEnum); + iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); iomodel->FetchDataToInput(elements,FlowequationElementEquationEnum); @@ -44,7 +44,7 @@ void MeltingAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/ - if(iomodel->meshtype==Mesh3DEnum) iomodel->FetchData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + if(iomodel->meshtype==Mesh3DEnum) iomodel->FetchData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); ::CreateNodes(nodes,iomodel,MeltingAnalysisEnum,P1Enum); - iomodel->DeleteData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + iomodel->DeleteData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); }/*}}}*/ void MeltingAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/ @@ -57,15 +57,15 @@ //create penalties for nodes: no node can have a temperature over the melting point - iomodel->FetchData(1,MeshVertexonbedEnum); + iomodel->FetchData(1,MeshVertexonbaseEnum); CreateSingleNodeToElementConnectivity(iomodel); for(int i=0;inumberofvertices;i++){ if(iomodel->my_vertices[i]){ - if (reCast(iomodel->Data(MeshVertexonbedEnum)[i])){ + if (reCast(iomodel->Data(MeshVertexonbaseEnum)[i])){ loads->AddObject(new Pengrid(iomodel->loadcounter+i+1,i,iomodel,MeltingAnalysisEnum)); } } } - iomodel->DeleteData(1,MeshVertexonbedEnum); + iomodel->DeleteData(1,MeshVertexonbaseEnum); }/*}}}*/ Index: /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeXAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeXAnalysis.cpp (revision 17609) +++ /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeXAnalysis.cpp (revision 17610) @@ -27,15 +27,15 @@ iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); if(iomodel->meshtype==Mesh3DEnum){ - iomodel->FetchDataToInput(elements,MeshElementonbedEnum); + iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); } if(iomodel->meshtype==Mesh2DverticalEnum){ - iomodel->FetchDataToInput(elements,MeshVertexonbedEnum); + iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); } }/*}}}*/ void SmoothedSurfaceSlopeXAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/ - if(iomodel->meshtype==Mesh3DEnum) iomodel->FetchData(1,MeshVertexonbedEnum); + if(iomodel->meshtype==Mesh3DEnum) iomodel->FetchData(1,MeshVertexonbaseEnum); ::CreateNodes(nodes,iomodel,SmoothedSurfaceSlopeXAnalysisEnum,P1Enum); - if(iomodel->meshtype==Mesh3DEnum) iomodel->DeleteData(1,MeshVertexonbedEnum); + if(iomodel->meshtype==Mesh3DEnum) iomodel->DeleteData(1,MeshVertexonbaseEnum); }/*}}}*/ void SmoothedSurfaceSlopeXAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/ Index: /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeYAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeYAnalysis.cpp (revision 17609) +++ /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeYAnalysis.cpp (revision 17610) @@ -27,15 +27,15 @@ iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); if(iomodel->meshtype==Mesh3DEnum){ - iomodel->FetchDataToInput(elements,MeshElementonbedEnum); + iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); } if(iomodel->meshtype==Mesh2DverticalEnum){ - iomodel->FetchDataToInput(elements,MeshVertexonbedEnum); + iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); } }/*}}}*/ void SmoothedSurfaceSlopeYAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/ - if(iomodel->meshtype==Mesh3DEnum) iomodel->FetchData(1,MeshVertexonbedEnum); + if(iomodel->meshtype==Mesh3DEnum) iomodel->FetchData(1,MeshVertexonbaseEnum); ::CreateNodes(nodes,iomodel,SmoothedSurfaceSlopeYAnalysisEnum,P1Enum); - if(iomodel->meshtype==Mesh3DEnum) iomodel->DeleteData(1,MeshVertexonbedEnum); + if(iomodel->meshtype==Mesh3DEnum) iomodel->DeleteData(1,MeshVertexonbaseEnum); }/*}}}*/ void SmoothedSurfaceSlopeYAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/ Index: /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (revision 17609) +++ /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (revision 17610) @@ -211,5 +211,5 @@ if(iomodel->meshtype==Mesh3DEnum){ - iomodel->FetchDataToInput(elements,MeshElementonbedEnum); + iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum); @@ -220,5 +220,5 @@ } if(iomodel->meshtype==Mesh3DtetrasEnum){ - iomodel->FetchDataToInput(elements,MeshVertexonbedEnum); + iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); iomodel->FetchDataToInput(elements,MeshVertexonsurfaceEnum); iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum); @@ -231,5 +231,5 @@ } if(isFS){ - iomodel->FetchDataToInput(elements,MeshVertexonbedEnum); + iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); iomodel->FetchDataToInput(elements,PressureEnum,0.); if(dakota_analysis)elements->InputDuplicate(PressureEnum,QmuPressureEnum); @@ -238,5 +238,5 @@ iomodel->FetchDataToInput(elements,IceMaskNodeActivationEnum); if(iomodel->meshtype!=Mesh2DhorizontalEnum) - iomodel->FetchDataToInput(elements,MeshVertexonbedEnum); // required for updating active nodes + iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); // required for updating active nodes } @@ -291,7 +291,7 @@ } iomodel->FetchData(3,FlowequationBorderSSAEnum,FlowequationVertexEquationEnum,StressbalanceReferentialEnum); - if(iomodel->meshtype!=Mesh2DhorizontalEnum) iomodel->FetchData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationBorderFSEnum); + if(iomodel->meshtype!=Mesh2DhorizontalEnum) iomodel->FetchData(3,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum,FlowequationBorderFSEnum); ::CreateNodes(nodes,iomodel,StressbalanceAnalysisEnum,finiteelement,approximation); - iomodel->DeleteData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationBorderSSAEnum,FlowequationBorderFSEnum, + iomodel->DeleteData(6,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum,FlowequationBorderSSAEnum,FlowequationBorderFSEnum, FlowequationVertexEquationEnum,StressbalanceReferentialEnum); } @@ -303,5 +303,5 @@ if(!nodes) nodes = new Nodes(); - iomodel->FetchData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationBorderSSAEnum,FlowequationBorderFSEnum, + iomodel->FetchData(6,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum,FlowequationBorderSSAEnum,FlowequationBorderFSEnum, FlowequationVertexEquationEnum,StressbalanceReferentialEnum); if(isFS){ @@ -340,5 +340,5 @@ } } - iomodel->DeleteData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationBorderSSAEnum,FlowequationBorderFSEnum, + iomodel->DeleteData(6,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum,FlowequationBorderSSAEnum,FlowequationBorderFSEnum, FlowequationVertexEquationEnum,StressbalanceReferentialEnum); } @@ -363,5 +363,5 @@ IssmDouble *nodeonHO = NULL; IssmDouble *nodeonFS = NULL; - IssmDouble *nodeonbed = NULL; + IssmDouble *nodeonbase = NULL; IssmDouble *groundedice_ls = NULL; IssmDouble *vertices_type = NULL; @@ -421,5 +421,5 @@ iomodel->FetchData(&vertices_type,NULL,NULL,FlowequationVertexEquationEnum); iomodel->FetchData(&nodeonFS,NULL,NULL,FlowequationBorderFSEnum); - iomodel->FetchData(&nodeonbed,NULL,NULL,MeshVertexonbedEnum); + iomodel->FetchData(&nodeonbase,NULL,NULL,MeshVertexonbaseEnum); iomodel->FetchData(&groundedice_ls,NULL,NULL,MaskGroundediceLevelsetEnum); if(iomodel->meshtype==Mesh3DEnum || iomodel->meshtype==Mesh3DtetrasEnum){ @@ -448,5 +448,5 @@ iomodel->DeleteData(vertices_type,FlowequationVertexEquationEnum); iomodel->DeleteData(nodeonFS,FlowequationBorderFSEnum); - iomodel->DeleteData(nodeonbed,MeshVertexonbedEnum); + iomodel->DeleteData(nodeonbase,MeshVertexonbaseEnum); iomodel->DeleteData(groundedice_ls,MaskGroundediceLevelsetEnum); @@ -514,5 +514,5 @@ if(iomodel->meshtype==Mesh3DEnum || iomodel->meshtype==Mesh3DtetrasEnum)iomodel->FetchData(&nodeonHO,NULL,NULL,FlowequationBorderHOEnum); if(iomodel->meshtype==Mesh3DEnum || iomodel->meshtype==Mesh3DtetrasEnum)iomodel->FetchData(&nodeonFS,NULL,NULL,FlowequationBorderFSEnum); - if(iomodel->meshtype==Mesh3DEnum || iomodel->meshtype==Mesh3DtetrasEnum)iomodel->FetchData(&nodeonbed,NULL,NULL,MeshVertexonbedEnum); + if(iomodel->meshtype==Mesh3DEnum || iomodel->meshtype==Mesh3DtetrasEnum)iomodel->FetchData(&nodeonbase,NULL,NULL,MeshVertexonbaseEnum); if(iomodel->meshtype==Mesh3DEnum || iomodel->meshtype==Mesh3DtetrasEnum)iomodel->FetchData(&groundedice_ls,NULL,NULL,MaskGroundediceLevelsetEnum); iomodel->FetchData(&vertices_type,NULL,NULL,FlowequationVertexEquationEnum); @@ -744,5 +744,5 @@ if(iomodel->meshtype==Mesh3DEnum || iomodel->meshtype==Mesh3DtetrasEnum)iomodel->DeleteData(nodeonHO,FlowequationBorderHOEnum); if(iomodel->meshtype==Mesh3DEnum || iomodel->meshtype==Mesh3DtetrasEnum)iomodel->DeleteData(nodeonFS,FlowequationBorderFSEnum); - if(iomodel->meshtype==Mesh3DEnum || iomodel->meshtype==Mesh3DtetrasEnum)iomodel->DeleteData(nodeonbed,MeshVertexonbedEnum); + if(iomodel->meshtype==Mesh3DEnum || iomodel->meshtype==Mesh3DtetrasEnum)iomodel->DeleteData(nodeonbase,MeshVertexonbaseEnum); if(iomodel->meshtype==Mesh3DEnum || iomodel->meshtype==Mesh3DtetrasEnum)iomodel->DeleteData(groundedice_ls,MaskGroundediceLevelsetEnum); iomodel->DeleteData(vertices_type,FlowequationVertexEquationEnum); Index: /issm/trunk-jpl/src/c/analyses/StressbalanceSIAAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/StressbalanceSIAAnalysis.cpp (revision 17609) +++ /issm/trunk-jpl/src/c/analyses/StressbalanceSIAAnalysis.cpp (revision 17610) @@ -43,5 +43,5 @@ iomodel->FetchDataToInput(elements,IceMaskNodeActivationEnum); if(iomodel->meshtype!=Mesh2DhorizontalEnum) - iomodel->FetchDataToInput(elements,MeshVertexonbedEnum); // required for updating active nodes + iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); // required for updating active nodes } @@ -65,5 +65,5 @@ iomodel->FetchData(4,FlowequationBorderSSAEnum,FlowequationBorderFSEnum,FlowequationVertexEquationEnum,StressbalanceReferentialEnum); if(iomodel->meshtype!=Mesh2DhorizontalEnum){ - iomodel->FetchData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + iomodel->FetchData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); } @@ -84,5 +84,5 @@ } - iomodel->DeleteData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationBorderSSAEnum,FlowequationBorderFSEnum, + iomodel->DeleteData(6,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum,FlowequationBorderSSAEnum,FlowequationBorderFSEnum, FlowequationVertexEquationEnum,StressbalanceReferentialEnum); Index: /issm/trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.cpp (revision 17609) +++ /issm/trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.cpp (revision 17610) @@ -34,5 +34,5 @@ iomodel->FetchDataToInput(elements,BaseEnum); iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); - iomodel->FetchDataToInput(elements,MeshElementonbedEnum); + iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum); @@ -45,7 +45,7 @@ if(iomodel->meshtype!=Mesh3DEnum) return; - iomodel->FetchData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum); + iomodel->FetchData(3,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum); ::CreateNodes(nodes,iomodel,StressbalanceVerticalAnalysisEnum,P1Enum); - iomodel->DeleteData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum); + iomodel->DeleteData(3,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum); }/*}}}*/ void StressbalanceVerticalAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/ Index: /issm/trunk-jpl/src/c/analyses/ThermalAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/ThermalAnalysis.cpp (revision 17609) +++ /issm/trunk-jpl/src/c/analyses/ThermalAnalysis.cpp (revision 17610) @@ -55,5 +55,5 @@ iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); iomodel->FetchDataToInput(elements,MaskGroundediceLevelsetEnum); - iomodel->FetchDataToInput(elements,MeshElementonbedEnum); + iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); iomodel->FetchDataToInput(elements,FlowequationElementEquationEnum); @@ -78,12 +78,12 @@ if(islevelset){ iomodel->FetchDataToInput(elements,IceMaskNodeActivationEnum); - iomodel->FetchDataToInput(elements,MeshVertexonbedEnum); // required for updating active nodes + iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); // required for updating active nodes } }/*}}}*/ void ThermalAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/ - if(iomodel->meshtype==Mesh3DEnum) iomodel->FetchData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + if(iomodel->meshtype==Mesh3DEnum) iomodel->FetchData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); ::CreateNodes(nodes,iomodel,ThermalAnalysisEnum,P1Enum); - iomodel->DeleteData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum); + iomodel->DeleteData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum); }/*}}}*/ void ThermalAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/ Index: /issm/trunk-jpl/src/c/classes/Elements/Element.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Element.cpp (revision 17609) +++ /issm/trunk-jpl/src/c/classes/Elements/Element.cpp (revision 17610) @@ -550,5 +550,5 @@ /*}}}*/ bool Element::HasNodeOnBase(){/*{{{*/ - return (this->inputs->Max(MeshVertexonbedEnum)>0.); + return (this->inputs->Max(MeshVertexonbaseEnum)>0.); }/*}}}*/ bool Element::HasNodeOnSurface(){/*{{{*/ @@ -750,5 +750,5 @@ name==HydrologydcEplThicknessEnum || name==HydrologydcMaskEplactiveNodeEnum || - name==MeshVertexonbedEnum + name==MeshVertexonbaseEnum ) { Index: /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 17609) +++ /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 17610) @@ -1507,7 +1507,7 @@ bool Penta::IsOnBase(void){ - bool onbed; - inputs->GetInputValue(&onbed,MeshElementonbedEnum); - return onbed; + bool onbase; + inputs->GetInputValue(&onbase,MeshElementonbaseEnum); + return onbase; } /*}}}*/ @@ -2493,15 +2493,15 @@ int extrusioninput; - IssmDouble value,isonbed; + IssmDouble value,isonbase; this->parameters->FindParam(&extrusioninput,InputToExtrudeEnum); Input* input = inputs->GetInput(extrusioninput); _assert_(extrusioninput); - Input* onbed = inputs->GetInput(MeshVertexonbedEnum); _assert_(onbed); + Input* onbase = inputs->GetInput(MeshVertexonbaseEnum); _assert_(onbase); GaussPenta* gauss=new GaussPenta(); for(int iv=0;ivNumberofNodes();iv++){ gauss->GaussNode(this->element_type,iv); - onbed->GetInputValue(&isonbed,gauss); - if(isonbed==1.){ + onbase->GetInputValue(&isonbase,gauss); + if(isonbase==1.){ input->GetInputValue(&value,gauss); this->nodes[iv]->ApplyConstraint(0,value); Index: /issm/trunk-jpl/src/c/classes/Elements/Tetra.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tetra.cpp (revision 17609) +++ /issm/trunk-jpl/src/c/classes/Elements/Tetra.cpp (revision 17610) @@ -110,5 +110,5 @@ /*Retrieve all inputs and parameters*/ - GetInputListOnVertices(&values[0],MeshVertexonbedEnum); + GetInputListOnVertices(&values[0],MeshVertexonbaseEnum); for(int i=0;i<4;i++){ @@ -234,5 +234,5 @@ /*Retrieve all inputs and parameters*/ - GetInputListOnVertices(&values[0],MeshVertexonbedEnum); + GetInputListOnVertices(&values[0],MeshVertexonbaseEnum); sum = values[0]+values[1]+values[2]+values[3]; @@ -654,5 +654,5 @@ int approximation; - IssmDouble* vertexonbed= NULL; + IssmDouble* vertexonbase= NULL; IssmDouble slopex,slopey,groundedice; IssmDouble xz_plane[6]; @@ -667,6 +667,6 @@ Input* slopey_input=inputs->GetInput(BedSlopeYEnum); _assert_(slopey_input); Input* groundedicelevelset_input=inputs->GetInput(MaskGroundediceLevelsetEnum); _assert_(groundedicelevelset_input); - vertexonbed = xNew(numnodes); - this->GetInputListOnNodesVelocity(&vertexonbed[0],MeshVertexonbedEnum); + vertexonbase = xNew(numnodes); + this->GetInputListOnNodesVelocity(&vertexonbase[0],MeshVertexonbaseEnum); /*Loop over basal nodes and update their CS*/ @@ -674,5 +674,5 @@ for(int i=0;iNumberofNodesVelocity();i++){ - if(vertexonbed[i]==1){ + if(vertexonbase[i]==1){ gauss->GaussNode(this->VelocityInterpolation(),i); @@ -704,5 +704,5 @@ /*cleanup*/ - xDelete(vertexonbed); + xDelete(vertexonbase); delete gauss; } Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 17609) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 17610) @@ -1199,5 +1199,5 @@ /*Retrieve all inputs and parameters*/ - GetInputListOnVertices(&values[0],MeshVertexonbedEnum); + GetInputListOnVertices(&values[0],MeshVertexonbaseEnum); sum = values[0]+values[1]+values[2]; @@ -1243,5 +1243,5 @@ /*Retrieve all inputs and parameters*/ - GetInputListOnVertices(&values[0],MeshVertexonbedEnum); + GetInputListOnVertices(&values[0],MeshVertexonbaseEnum); for(int i=0;i<3;i++){ @@ -1285,5 +1285,5 @@ /*Retrieve all inputs and parameters*/ - GetInputListOnVertices(&values[0],MeshVertexonbedEnum); + GetInputListOnVertices(&values[0],MeshVertexonbaseEnum); for(int i=0;i<3;i++){ @@ -1638,5 +1638,5 @@ int approximation; - IssmDouble* vertexonbed= NULL; + IssmDouble* vertexonbase= NULL; IssmDouble slope,groundedice; IssmDouble xz_plane[6]; @@ -1650,6 +1650,6 @@ Input* slope_input=inputs->GetInput(BedSlopeXEnum); _assert_(slope_input); Input* groundedicelevelset_input=inputs->GetInput(MaskGroundediceLevelsetEnum); _assert_(groundedicelevelset_input); - vertexonbed = xNew(numnodes); - this->GetInputListOnNodesVelocity(&vertexonbed[0],MeshVertexonbedEnum); + vertexonbase = xNew(numnodes); + this->GetInputListOnNodesVelocity(&vertexonbase[0],MeshVertexonbaseEnum); /*Loop over basal nodes and update their CS*/ @@ -1657,5 +1657,5 @@ for(int i=0;iNumberofNodesVelocity();i++){ - if(vertexonbed[i]==1){ + if(vertexonbase[i]==1){ gauss->GaussNode(this->VelocityInterpolation(),i); slope_input->GetInputValue(&slope,gauss); @@ -1679,5 +1679,5 @@ /*cleanup*/ - xDelete(vertexonbed); + xDelete(vertexonbase); delete gauss; } @@ -1990,15 +1990,15 @@ int extrusioninput; - IssmDouble value,isonbed; + IssmDouble value,isonbase; this->parameters->FindParam(&extrusioninput,InputToExtrudeEnum); Input* input = inputs->GetInput(extrusioninput); _assert_(input); - Input* onbed = inputs->GetInput(MeshVertexonbedEnum); _assert_(onbed); + Input* onbase = inputs->GetInput(MeshVertexonbaseEnum); _assert_(onbase); GaussTria* gauss=new GaussTria(); for(int iv=0;ivNumberofNodes();iv++){ gauss->GaussNode(this->element_type,iv); - onbed->GetInputValue(&isonbed,gauss); - if(isonbed==1.){ + onbase->GetInputValue(&isonbase,gauss); + if(isonbase==1.){ input->GetInputValue(&value,gauss); this->nodes[iv]->ApplyConstraint(0,value); Index: /issm/trunk-jpl/src/c/classes/Node.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Node.cpp (revision 17609) +++ /issm/trunk-jpl/src/c/classes/Node.cpp (revision 17610) @@ -63,19 +63,19 @@ if(iomodel->meshtype!=Mesh2DhorizontalEnum){ /*We have a 3d mesh, we may have collapsed elements, hence dead nodes. Freeze them out: */ - _assert_(iomodel->Data(MeshVertexonbedEnum)); + _assert_(iomodel->Data(MeshVertexonbaseEnum)); _assert_(iomodel->Data(FlowequationVertexEquationEnum)); - if(in_approximation==SSAApproximationEnum && !reCast(iomodel->Data(MeshVertexonbedEnum)[io_index])){ + if(in_approximation==SSAApproximationEnum && !reCast(iomodel->Data(MeshVertexonbaseEnum)[io_index])){ this->Deactivate(); } - if(in_approximation==L1L2ApproximationEnum && !reCast(iomodel->Data(MeshVertexonbedEnum)[io_index])){ + if(in_approximation==L1L2ApproximationEnum && !reCast(iomodel->Data(MeshVertexonbaseEnum)[io_index])){ this->Deactivate(); } if(in_approximation==SSAHOApproximationEnum && reCast(iomodel->Data(FlowequationBorderSSAEnum)[io_index])){ - if(!reCast(iomodel->Data(MeshVertexonbedEnum)[io_index])){ + if(!reCast(iomodel->Data(MeshVertexonbaseEnum)[io_index])){ this->Deactivate(); } } if(in_approximation==SSAFSApproximationEnum && reCast(iomodel->Data(FlowequationBorderSSAEnum)[io_index])){ - if(!reCast(iomodel->Data(MeshVertexonbedEnum)[io_index])){ + if(!reCast(iomodel->Data(MeshVertexonbaseEnum)[io_index])){ for(k=0;k<=1;k++) this->FreezeDof(k); } @@ -103,6 +103,6 @@ if(iomodel->meshtype!=Mesh2DhorizontalEnum){ /*On a 3d mesh, we may have collapsed elements, hence dead nodes. Freeze them out: */ - _assert_(iomodel->Data(MeshVertexonbedEnum)); - if(!(reCast(iomodel->Data(MeshVertexonbedEnum)[io_index]))){ + _assert_(iomodel->Data(MeshVertexonbaseEnum)); + if(!(reCast(iomodel->Data(MeshVertexonbaseEnum)[io_index]))){ this->Deactivate(); } Index: /issm/trunk-jpl/src/c/modules/SetActiveNodesLSMx/SetActiveNodesLSMx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/SetActiveNodesLSMx/SetActiveNodesLSMx.cpp (revision 17609) +++ /issm/trunk-jpl/src/c/modules/SetActiveNodesLSMx/SetActiveNodesLSMx.cpp (revision 17610) @@ -74,8 +74,8 @@ if(solvein2d){ - IssmDouble *mask_isonbed = xNew(numnodes); - element->GetInputListOnNodes(&mask_isonbed[0],MeshVertexonbedEnum); - for(in=0;in(mask_isonbed); + IssmDouble *mask_isonbase = xNew(numnodes); + element->GetInputListOnNodes(&mask_isonbase[0],MeshVertexonbaseEnum); + for(in=0;in(mask_isonbase); } } Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 17609) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 17610) @@ -195,5 +195,5 @@ MaterialsMantleDensityEnum, MeshAverageVertexConnectivityEnum, - MeshElementonbedEnum, + MeshElementonbaseEnum, MeshElementonsurfaceEnum, MeshElements2dEnum, @@ -206,5 +206,5 @@ MeshNumberofverticesEnum, MeshUpperelementsEnum, - MeshVertexonbedEnum, + MeshVertexonbaseEnum, MeshVertexonsurfaceEnum, MeshXEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 17609) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 17610) @@ -203,5 +203,5 @@ case MaterialsMantleDensityEnum : return "MaterialsMantleDensity"; case MeshAverageVertexConnectivityEnum : return "MeshAverageVertexConnectivity"; - case MeshElementonbedEnum : return "MeshElementonbed"; + case MeshElementonbaseEnum : return "MeshElementonbase"; case MeshElementonsurfaceEnum : return "MeshElementonsurface"; case MeshElements2dEnum : return "MeshElements2d"; @@ -214,5 +214,5 @@ case MeshNumberofverticesEnum : return "MeshNumberofvertices"; case MeshUpperelementsEnum : return "MeshUpperelements"; - case MeshVertexonbedEnum : return "MeshVertexonbed"; + case MeshVertexonbaseEnum : return "MeshVertexonbase"; case MeshVertexonsurfaceEnum : return "MeshVertexonsurface"; case MeshXEnum : return "MeshX"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 17609) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 17610) @@ -206,5 +206,5 @@ else if (strcmp(name,"MaterialsMantleDensity")==0) return MaterialsMantleDensityEnum; else if (strcmp(name,"MeshAverageVertexConnectivity")==0) return MeshAverageVertexConnectivityEnum; - else if (strcmp(name,"MeshElementonbed")==0) return MeshElementonbedEnum; + else if (strcmp(name,"MeshElementonbase")==0) return MeshElementonbaseEnum; else if (strcmp(name,"MeshElementonsurface")==0) return MeshElementonsurfaceEnum; else if (strcmp(name,"MeshElements2d")==0) return MeshElements2dEnum; @@ -217,5 +217,5 @@ else if (strcmp(name,"MeshNumberofvertices")==0) return MeshNumberofverticesEnum; else if (strcmp(name,"MeshUpperelements")==0) return MeshUpperelementsEnum; - else if (strcmp(name,"MeshVertexonbed")==0) return MeshVertexonbedEnum; + else if (strcmp(name,"MeshVertexonbase")==0) return MeshVertexonbaseEnum; else if (strcmp(name,"MeshVertexonsurface")==0) return MeshVertexonsurfaceEnum; else if (strcmp(name,"MeshX")==0) return MeshXEnum; Index: /issm/trunk-jpl/src/m/classes/mesh2dvertical.m =================================================================== --- /issm/trunk-jpl/src/m/classes/mesh2dvertical.m (revision 17609) +++ /issm/trunk-jpl/src/m/classes/mesh2dvertical.m (revision 17610) @@ -18,5 +18,5 @@ vertexonboundary = NaN - vertexonbed = NaN + vertexonbase = NaN vertexonsurface = NaN @@ -67,5 +67,5 @@ md = checkfield(md,'fieldname','mesh.numberofelements','>',0); md = checkfield(md,'fieldname','mesh.numberofvertices','>',0); - md = checkfield(md,'fieldname','mesh.vertexonbed','size',[md.mesh.numberofvertices 1],'values',[0 1]); + md = checkfield(md,'fieldname','mesh.vertexonbase','size',[md.mesh.numberofvertices 1],'values',[0 1]); md = checkfield(md,'fieldname','mesh.vertexonsurface','size',[md.mesh.numberofvertices 1],'values',[0 1]); md = checkfield(md,'fieldname','mesh.average_vertex_connectivity','>=',9,'message','''mesh.average_vertex_connectivity'' should be at least 9 in 2d'); @@ -90,5 +90,5 @@ disp(sprintf('\n Properties:')); fielddisplay(obj,'vertexonboundary','vertices on the boundary of the domain flag list'); - fielddisplay(obj,'vertexonbed','vertices on the bed of the domain flag list'); + fielddisplay(obj,'vertexonbase','vertices on the bed of the domain flag list'); fielddisplay(obj,'vertexonsurface','vertices on the surface of the domain flag list'); fielddisplay(obj,'segments','edges on domain boundary (vertex1 vertex2 element)'); @@ -111,5 +111,5 @@ WriteData(fid,'object',obj,'class','mesh','fieldname','numberofelements','format','Integer'); WriteData(fid,'object',obj,'class','mesh','fieldname','numberofvertices','format','Integer'); - WriteData(fid,'object',obj,'class','mesh','fieldname','vertexonbed','format','BooleanMat','mattype',1); + WriteData(fid,'object',obj,'class','mesh','fieldname','vertexonbase','format','BooleanMat','mattype',1); WriteData(fid,'object',obj,'class','mesh','fieldname','vertexonsurface','format','BooleanMat','mattype',1); WriteData(fid,'object',obj,'class','mesh','fieldname','average_vertex_connectivity','format','Integer'); Index: /issm/trunk-jpl/src/m/classes/mesh3dprisms.m =================================================================== --- /issm/trunk-jpl/src/m/classes/mesh3dprisms.m (revision 17609) +++ /issm/trunk-jpl/src/m/classes/mesh3dprisms.m (revision 17610) @@ -18,7 +18,7 @@ hemisphere = NaN - elementonbed = NaN + elementonbase = NaN elementonsurface = NaN - vertexonbed = NaN + vertexonbase = NaN vertexonsurface = NaN lowerelements = NaN @@ -83,7 +83,7 @@ md = checkfield(md,'fieldname','mesh.numberofvertices','>',0); %no checks for numberofedges lat long and hemisphere - md = checkfield(md,'fieldname','mesh.elementonbed','size',[md.mesh.numberofelements 1],'values',[0 1]); + md = checkfield(md,'fieldname','mesh.elementonbase','size',[md.mesh.numberofelements 1],'values',[0 1]); md = checkfield(md,'fieldname','mesh.elementonsurface','size',[md.mesh.numberofelements 1],'values',[0 1]); - md = checkfield(md,'fieldname','mesh.vertexonbed','size',[md.mesh.numberofvertices 1],'values',[0 1]); + md = checkfield(md,'fieldname','mesh.vertexonbase','size',[md.mesh.numberofvertices 1],'values',[0 1]); md = checkfield(md,'fieldname','mesh.vertexonsurface','size',[md.mesh.numberofvertices 1],'values',[0 1]); md = checkfield(md,'fieldname','mesh.z','>=',md.geometry.base-10^-10,'message','''mesh.z'' lower than bedrock'); @@ -111,6 +111,6 @@ disp(sprintf('\n Properties:')); fielddisplay(obj,'numberoflayers','number of extrusion layers'); - fielddisplay(obj,'vertexonbed','lower vertices flags list'); - fielddisplay(obj,'elementonbed','lower elements flags list'); + fielddisplay(obj,'vertexonbase','lower vertices flags list'); + fielddisplay(obj,'elementonbase','lower elements flags list'); fielddisplay(obj,'vertexonsurface','upper vertices flags list'); fielddisplay(obj,'elementonsurface','upper elements flags list'); @@ -143,7 +143,7 @@ WriteData(fid,'object',obj,'class','mesh','fieldname','numberofelements','format','Integer'); WriteData(fid,'object',obj,'class','mesh','fieldname','numberofvertices','format','Integer'); - WriteData(fid,'object',obj,'class','mesh','fieldname','elementonbed','format','BooleanMat','mattype',2); + WriteData(fid,'object',obj,'class','mesh','fieldname','elementonbase','format','BooleanMat','mattype',2); WriteData(fid,'object',obj,'class','mesh','fieldname','elementonsurface','format','BooleanMat','mattype',2); - WriteData(fid,'object',obj,'class','mesh','fieldname','vertexonbed','format','BooleanMat','mattype',1); + WriteData(fid,'object',obj,'class','mesh','fieldname','vertexonbase','format','BooleanMat','mattype',1); WriteData(fid,'object',obj,'class','mesh','fieldname','vertexonsurface','format','BooleanMat','mattype',1); WriteData(fid,'object',obj,'class','mesh','fieldname','lowerelements','format','DoubleMat','mattype',2); Index: /issm/trunk-jpl/src/m/classes/mesh3dprisms.py =================================================================== --- /issm/trunk-jpl/src/m/classes/mesh3dprisms.py (revision 17609) +++ /issm/trunk-jpl/src/m/classes/mesh3dprisms.py (revision 17610) @@ -28,7 +28,7 @@ self.hemisphere = float('NaN'); - self.elementonbed = float('NaN'); + self.elementonbase = float('NaN'); self.elementonsurface = float('NaN'); - self.vertexonbed = float('NaN'); + self.vertexonbase = float('NaN'); self.vertexonsurface = float('NaN'); self.lowerelements = float('NaN'); @@ -75,6 +75,6 @@ string="%s%s"%(string,"\n\n Properties:") string="%s\n%s"%(string,fielddisplay(self,"numberoflayers","number of extrusion layers")) - string="%s\n%s"%(string,fielddisplay(self,"vertexonbed","lower vertices flags list")) - string="%s\n%s"%(string,fielddisplay(self,"elementonbed","lower elements flags list")) + string="%s\n%s"%(string,fielddisplay(self,"vertexonbase","lower vertices flags list")) + string="%s\n%s"%(string,fielddisplay(self,"elementonbase","lower elements flags list")) string="%s\n%s"%(string,fielddisplay(self,"vertexonsurface","upper vertices flags list")) string="%s\n%s"%(string,fielddisplay(self,"elementonsurface","upper elements flags list")) @@ -122,7 +122,7 @@ md = checkfield(md,'fieldname','mesh.numberofvertices','>',0) #no checks for numberofedges lat long and hemisphere - md = checkfield(md,'fieldname','mesh.elementonbed','size',[md.mesh.numberofelements],'values',[0,1]) + md = checkfield(md,'fieldname','mesh.elementonbase','size',[md.mesh.numberofelements],'values',[0,1]) md = checkfield(md,'fieldname','mesh.elementonsurface','size',[md.mesh.numberofelements],'values',[0,1]) - md = checkfield(md,'fieldname','mesh.vertexonbed','size',[md.mesh.numberofvertices],'values',[0,1]) + md = checkfield(md,'fieldname','mesh.vertexonbase','size',[md.mesh.numberofvertices],'values',[0,1]) md = checkfield(md,'fieldname','mesh.vertexonsurface','size',[md.mesh.numberofvertices],'values',[0,1]) md = checkfield(md,'fieldname','mesh.average_vertex_connectivity','>=',24,'message',"'mesh.average_vertex_connectivity' should be at least 24 in 3d") @@ -142,7 +142,7 @@ WriteData(fid,'object',self,'class','mesh','fieldname','numberofelements','format','Integer') WriteData(fid,'object',self,'class','mesh','fieldname','numberofvertices','format','Integer') - WriteData(fid,'object',self,'class','mesh','fieldname','elementonbed','format','BooleanMat','mattype',2) + WriteData(fid,'object',self,'class','mesh','fieldname','elementonbase','format','BooleanMat','mattype',2) WriteData(fid,'object',self,'class','mesh','fieldname','elementonsurface','format','BooleanMat','mattype',2) - WriteData(fid,'object',self,'class','mesh','fieldname','vertexonbed','format','BooleanMat','mattype',1) + WriteData(fid,'object',self,'class','mesh','fieldname','vertexonbase','format','BooleanMat','mattype',1) WriteData(fid,'object',self,'class','mesh','fieldname','vertexonsurface','format','BooleanMat','mattype',1) WriteData(fid,'object',self,'class','mesh','fieldname','lowerelements','format','DoubleMat','mattype',2) Index: /issm/trunk-jpl/src/m/classes/mesh3dtetras.m =================================================================== --- /issm/trunk-jpl/src/m/classes/mesh3dtetras.m (revision 17609) +++ /issm/trunk-jpl/src/m/classes/mesh3dtetras.m (revision 17610) @@ -18,5 +18,5 @@ hemisphere = NaN - vertexonbed = NaN + vertexonbase = NaN vertexonsurface = NaN lowerelements = NaN @@ -81,5 +81,5 @@ md = checkfield(md,'fieldname','mesh.numberofvertices','>',0); %no checks for numberofedges lat long and hemisphere - md = checkfield(md,'fieldname','mesh.vertexonbed','size',[md.mesh.numberofvertices 1],'values',[0 1]); + md = checkfield(md,'fieldname','mesh.vertexonbase','size',[md.mesh.numberofvertices 1],'values',[0 1]); md = checkfield(md,'fieldname','mesh.vertexonsurface','size',[md.mesh.numberofvertices 1],'values',[0 1]); md = checkfield(md,'fieldname','mesh.z','>=',md.geometry.base-10^-10,'message','''mesh.z'' lower than bedrock'); @@ -107,5 +107,5 @@ disp(sprintf('\n Properties:')); fielddisplay(obj,'numberoflayers','number of extrusion layers'); - fielddisplay(obj,'vertexonbed','lower vertices flags list'); + fielddisplay(obj,'vertexonbase','lower vertices flags list'); fielddisplay(obj,'vertexonsurface','upper vertices flags list'); fielddisplay(obj,'uppervertex','upper vertex list (NaN for vertex on the upper surface)'); @@ -137,5 +137,5 @@ WriteData(fid,'object',obj,'class','mesh','fieldname','numberofelements','format','Integer'); WriteData(fid,'object',obj,'class','mesh','fieldname','numberofvertices','format','Integer'); - WriteData(fid,'object',obj,'class','mesh','fieldname','vertexonbed','format','BooleanMat','mattype',1); + WriteData(fid,'object',obj,'class','mesh','fieldname','vertexonbase','format','BooleanMat','mattype',1); WriteData(fid,'object',obj,'class','mesh','fieldname','vertexonsurface','format','BooleanMat','mattype',1); WriteData(fid,'object',obj,'class','mesh','fieldname','lowerelements','format','DoubleMat','mattype',2); Index: /issm/trunk-jpl/src/m/classes/model.m =================================================================== --- /issm/trunk-jpl/src/m/classes/model.m (revision 17609) +++ /issm/trunk-jpl/src/m/classes/model.m (revision 17610) @@ -721,7 +721,7 @@ %bedinfo and surface info - md.mesh.elementonbed=project3d(md,'vector',ones(md.mesh.numberofelements2d,1),'type','element','layer',1); + md.mesh.elementonbase=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.vertexonbase=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); @@ -841,5 +841,5 @@ if isfield(structmd,'uppergrids'), md.mesh.uppervertex=structmd.uppergrids; end if isfield(structmd,'lowergrids'), md.mesh.lowervertex=structmd.lowergrids; end - if isfield(structmd,'gridonbed'), md.mesh.vertexonbed=structmd.gridonbed; end + if isfield(structmd,'gridonbase'), md.mesh.vertexonbase=structmd.gridonbase; end if isfield(structmd,'gridonsurface'), md.mesh.vertexonsurface=structmd.gridonsurface; end if isfield(structmd,'extractedgrids'), md.mesh.extractedvertices=structmd.extractedgrids; end @@ -951,8 +951,8 @@ 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,'elementonbase'), md.mesh.elementonbase=structmd.elementonbase; 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 + if isfield(structmd,'nodeonbase'), md.mesh.vertexonbase=structmd.nodeonbase; end if isfield(structmd,'elements2d'), md.mesh.elements2d=structmd.elements2d; end if isfield(structmd,'y2d'), md.mesh.y2d=structmd.y2d; end Index: /issm/trunk-jpl/src/m/classes/model.py =================================================================== --- /issm/trunk-jpl/src/m/classes/model.py (revision 17609) +++ /issm/trunk-jpl/src/m/classes/model.py (revision 17610) @@ -615,7 +615,7 @@ #bedinfo and surface info - md.mesh.elementonbed=project3d(md,'vector',numpy.ones(md.mesh.numberofelements2d,bool),'type','element','layer',1) + md.mesh.elementonbase=project3d(md,'vector',numpy.ones(md.mesh.numberofelements2d,bool),'type','element','layer',1) md.mesh.elementonsurface=project3d(md,'vector',numpy.ones(md.mesh.numberofelements2d,bool),'type','element','layer',md.mesh.numberoflayers-1) - md.mesh.vertexonbed=project3d(md,'vector',numpy.ones(md.mesh.numberofvertices2d,bool),'type','node','layer',1) + md.mesh.vertexonbase=project3d(md,'vector',numpy.ones(md.mesh.numberofvertices2d,bool),'type','node','layer',1) md.mesh.vertexonsurface=project3d(md,'vector',numpy.ones(md.mesh.numberofvertices2d,bool),'type','node','layer',md.mesh.numberoflayers) Index: /issm/trunk-jpl/src/m/classes/oldclasses/mesh.m =================================================================== --- /issm/trunk-jpl/src/m/classes/oldclasses/mesh.m (revision 17609) +++ /issm/trunk-jpl/src/m/classes/oldclasses/mesh.m (revision 17610) @@ -15,7 +15,7 @@ hemisphere = NaN - elementonbed = NaN + elementonbase = NaN elementonsurface = NaN - vertexonbed = NaN + vertexonbase = NaN vertexonsurface = NaN lowerelements = NaN Index: /issm/trunk-jpl/src/m/classes/stressbalance.m =================================================================== --- /issm/trunk-jpl/src/m/classes/stressbalance.m (revision 17609) +++ /issm/trunk-jpl/src/m/classes/stressbalance.m (revision 17610) @@ -113,5 +113,5 @@ %CHECK THAT NO rotation specified for FS Grounded ice at base if strcmp(meshtype(md.mesh),'3D') & md.flowequation.isFS, - pos=find(md.mask.groundedice_levelset>0. & md.mesh.vertexonbed); + pos=find(md.mask.groundedice_levelset>0. & md.mesh.vertexonbase); if any(~isnan(md.stressbalance.referential(pos,:))), md = checkmessage(md,['no referential should be specified for basal vertices of grounded ice']); Index: /issm/trunk-jpl/src/m/classes/stressbalance.py =================================================================== --- /issm/trunk-jpl/src/m/classes/stressbalance.py (revision 17609) +++ /issm/trunk-jpl/src/m/classes/stressbalance.py (revision 17610) @@ -162,5 +162,5 @@ #CHECK THAT NO rotation specified for FS Grounded ice at base if m.strcmp(md.mesh.meshtype(),'3D') and md.flowequation.isFS: - pos=numpy.nonzero(numpy.logical_and(md.mask.groundedice_levelset,md.mesh.vertexonbed)) + pos=numpy.nonzero(numpy.logical_and(md.mask.groundedice_levelset,md.mesh.vertexonbase)) if numpy.any(numpy.logical_not(numpy.isnan(md.stressbalance.referential[pos,:]))): md.checkmessage("no referential should be specified for basal vertices of grounded ice") Index: /issm/trunk-jpl/src/m/consistency/checkfield.m =================================================================== --- /issm/trunk-jpl/src/m/consistency/checkfield.m (revision 17609) +++ /issm/trunk-jpl/src/m/consistency/checkfield.m (revision 17610) @@ -25,5 +25,5 @@ % % Example: -% md = checkfield(md,'mesh.elementonbed','size',[md.mesh.numberofelements 1],'values',[0 1]); +% md = checkfield(md,'mesh.elementonbase','size',[md.mesh.numberofelements 1],'values',[0 1]); %get options Index: /issm/trunk-jpl/src/m/consistency/checkfield.py =================================================================== --- /issm/trunk-jpl/src/m/consistency/checkfield.py (revision 17609) +++ /issm/trunk-jpl/src/m/consistency/checkfield.py (revision 17610) @@ -32,5 +32,5 @@ Example: - md = checkfield(md,'mesh.elementonbed','size',[md.mesh.numberofelements 1],'values',[0 1]); + md = checkfield(md,'mesh.elementonbase','size',[md.mesh.numberofelements 1],'values',[0 1]); """ Index: /issm/trunk-jpl/src/m/contrib/bamg/yams.m =================================================================== --- /issm/trunk-jpl/src/m/contrib/bamg/yams.m (revision 17609) +++ /issm/trunk-jpl/src/m/contrib/bamg/yams.m (revision 17610) @@ -106,7 +106,7 @@ %Fill in rest of fields: md.mesh.z=zeros(md.mesh.numberofvertices,1); -md.mesh.vertexonbed=ones(md.mesh.numberofvertices,1); +md.mesh.vertexonbase=ones(md.mesh.numberofvertices,1); md.mesh.vertexonsurface=ones(md.mesh.numberofvertices,1); -md.mesh.elementonbed=ones(md.mesh.numberofelements,1); +md.mesh.elementonbase=ones(md.mesh.numberofelements,1); md.mesh.elementonsurface=ones(md.mesh.numberofelements,1); if strcmpi(Names.interp,'node'), Index: /issm/trunk-jpl/src/m/contrib/dassflow/importgmsh.m =================================================================== --- /issm/trunk-jpl/src/m/contrib/dassflow/importgmsh.m (revision 17609) +++ /issm/trunk-jpl/src/m/contrib/dassflow/importgmsh.m (revision 17610) @@ -85,6 +85,6 @@ md.mesh.segmentmarkers=segmentmarkers; md.mesh.segments=segments; -md.mesh.vertexonbed=zeros(md.mesh.numberofvertices,1); -md.mesh.vertexonbed(find(vertexflags(md.mesh,1)))=1; +md.mesh.vertexonbase=zeros(md.mesh.numberofvertices,1); +md.mesh.vertexonbase(find(vertexflags(md.mesh,1)))=1; md.mesh.vertexonsurface=zeros(md.mesh.numberofvertices,1); md.mesh.vertexonsurface(find(vertexflags(md.mesh,3)))=1; Index: /issm/trunk-jpl/src/m/enum/EnumDefinitions.py =================================================================== --- /issm/trunk-jpl/src/m/enum/EnumDefinitions.py (revision 17609) +++ /issm/trunk-jpl/src/m/enum/EnumDefinitions.py (revision 17610) @@ -195,5 +195,5 @@ def MaterialsMantleDensityEnum(): return StringToEnum("MaterialsMantleDensity")[0] def MeshAverageVertexConnectivityEnum(): return StringToEnum("MeshAverageVertexConnectivity")[0] -def MeshElementonbedEnum(): return StringToEnum("MeshElementonbed")[0] +def MeshElementonbaseEnum(): return StringToEnum("MeshElementonbase")[0] def MeshElementonsurfaceEnum(): return StringToEnum("MeshElementonsurface")[0] def MeshElements2dEnum(): return StringToEnum("MeshElements2d")[0] @@ -206,5 +206,5 @@ def MeshNumberofverticesEnum(): return StringToEnum("MeshNumberofvertices")[0] def MeshUpperelementsEnum(): return StringToEnum("MeshUpperelements")[0] -def MeshVertexonbedEnum(): return StringToEnum("MeshVertexonbed")[0] +def MeshVertexonbaseEnum(): return StringToEnum("MeshVertexonbase")[0] def MeshVertexonsurfaceEnum(): return StringToEnum("MeshVertexonsurface")[0] def MeshXEnum(): return StringToEnum("MeshX")[0] Index: /issm/trunk-jpl/src/m/enum/MeshElementonbaseEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/MeshElementonbaseEnum.m (revision 17610) +++ /issm/trunk-jpl/src/m/enum/MeshElementonbaseEnum.m (revision 17610) @@ -0,0 +1,11 @@ +function macro=MeshElementonbaseEnum() +%MESHELEMENTONBASEENUM - Enum of MeshElementonbase +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh +% Please read src/c/shared/Enum/README for more information +% +% Usage: +% macro=MeshElementonbaseEnum() + +macro=StringToEnum('MeshElementonbase'); Index: sm/trunk-jpl/src/m/enum/MeshElementonbedEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/MeshElementonbedEnum.m (revision 17609) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=MeshElementonbedEnum() -%MESHELEMENTONBEDENUM - Enum of MeshElementonbed -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh -% Please read src/c/shared/Enum/README for more information -% -% Usage: -% macro=MeshElementonbedEnum() - -macro=StringToEnum('MeshElementonbed'); Index: /issm/trunk-jpl/src/m/enum/MeshVertexonbaseEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/MeshVertexonbaseEnum.m (revision 17610) +++ /issm/trunk-jpl/src/m/enum/MeshVertexonbaseEnum.m (revision 17610) @@ -0,0 +1,11 @@ +function macro=MeshVertexonbaseEnum() +%MESHVERTEXONBASEENUM - Enum of MeshVertexonbase +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh +% Please read src/c/shared/Enum/README for more information +% +% Usage: +% macro=MeshVertexonbaseEnum() + +macro=StringToEnum('MeshVertexonbase'); Index: sm/trunk-jpl/src/m/enum/MeshVertexonbedEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/MeshVertexonbedEnum.m (revision 17609) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=MeshVertexonbedEnum() -%MESHVERTEXONBEDENUM - Enum of MeshVertexonbed -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh -% Please read src/c/shared/Enum/README for more information -% -% Usage: -% macro=MeshVertexonbedEnum() - -macro=StringToEnum('MeshVertexonbed'); Index: /issm/trunk-jpl/src/m/mesh/bamgflowband.m =================================================================== --- /issm/trunk-jpl/src/m/mesh/bamgflowband.m (revision 17609) +++ /issm/trunk-jpl/src/m/mesh/bamgflowband.m (revision 17610) @@ -31,6 +31,6 @@ %Deal with vertices on bed -md.mesh.vertexonbed=zeros(md.mesh.numberofvertices,1); -md.mesh.vertexonbed(find(vertexflags(md.mesh,1)))=1; +md.mesh.vertexonbase=zeros(md.mesh.numberofvertices,1); +md.mesh.vertexonbase(find(vertexflags(md.mesh,1)))=1; md.mesh.vertexonsurface=zeros(md.mesh.numberofvertices,1); md.mesh.vertexonsurface(find(vertexflags(md.mesh,3)))=1; Index: /issm/trunk-jpl/test/NightlyRun/test1101.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1101.m (revision 17609) +++ /issm/trunk-jpl/test/NightlyRun/test1101.m (revision 17610) @@ -25,5 +25,5 @@ md.stressbalance.spcvz=NaN*ones(md.mesh.numberofvertices,1); - pos=find(md.mesh.vertexonbed); + pos=find(md.mesh.vertexonbase); md.stressbalance.spcvx(pos)=0.; md.stressbalance.spcvy(pos)=0.; Index: /issm/trunk-jpl/test/NightlyRun/test1101.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1101.py (revision 17609) +++ /issm/trunk-jpl/test/NightlyRun/test1101.py (revision 17610) @@ -39,5 +39,5 @@ md.stressbalance.spcvz=float('NaN')*numpy.ones((md.mesh.numberofvertices,1)) - pos=numpy.nonzero(md.mesh.vertexonbed) + pos=numpy.nonzero(md.mesh.vertexonbase) md.stressbalance.spcvx[pos]=0. md.stressbalance.spcvy[pos]=0. Index: /issm/trunk-jpl/test/NightlyRun/test1102.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1102.m (revision 17609) +++ /issm/trunk-jpl/test/NightlyRun/test1102.m (revision 17610) @@ -28,5 +28,5 @@ %Create dirichlet on the bed only - pos=find(md.mesh.vertexonbed); + pos=find(md.mesh.vertexonbase); md.stressbalance.spcvx(pos)=0.; md.stressbalance.spcvy(pos)=0.; @@ -36,9 +36,9 @@ % posx=find(md.mesh.x==0.); % posx2=find(md.mesh.x==max(md.mesh.x)); -% posx=find(md.mesh.x==0. & md.mesh.y~=0. & md.mesh.y~=max(md.mesh.y) & ~md.mesh.vertexonbed); -% posx2=find(md.mesh.x==max(md.mesh.x) & md.mesh.y~=0. & md.mesh.y~=max(md.mesh.y) & ~md.mesh.vertexonbed); +% posx=find(md.mesh.x==0. & md.mesh.y~=0. & md.mesh.y~=max(md.mesh.y) & ~md.mesh.vertexonbase); +% posx2=find(md.mesh.x==max(md.mesh.x) & md.mesh.y~=0. & md.mesh.y~=max(md.mesh.y) & ~md.mesh.vertexonbase); -% posy=find(md.mesh.y==0. & md.mesh.x~=0. & md.mesh.x~=max(md.mesh.x) & ~md.mesh.vertexonbed); %Don't take the same nodes two times -% posy2=find(md.mesh.y==max(md.mesh.y) & md.mesh.x~=0. & md.mesh.x~=max(md.mesh.x) & ~md.mesh.vertexonbed); +% posy=find(md.mesh.y==0. & md.mesh.x~=0. & md.mesh.x~=max(md.mesh.x) & ~md.mesh.vertexonbase); %Don't take the same nodes two times +% posy2=find(md.mesh.y==max(md.mesh.y) & md.mesh.x~=0. & md.mesh.x~=max(md.mesh.x) & ~md.mesh.vertexonbase); % md.stressbalance.vertex_pairing=[posx,posx2;posy,posy2]; Index: /issm/trunk-jpl/test/NightlyRun/test1102.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1102.py (revision 17609) +++ /issm/trunk-jpl/test/NightlyRun/test1102.py (revision 17610) @@ -42,5 +42,5 @@ #Create dirichlet on the bed only - pos=numpy.nonzero(md.mesh.vertexonbed) + pos=numpy.nonzero(md.mesh.vertexonbase) md.stressbalance.spcvx[pos]=0. md.stressbalance.spcvy[pos]=0. @@ -50,9 +50,9 @@ # posx=numpy.nonzero(md.mesh.x==0.)[0] # posx2=numpy.nonzero(md.mesh.x==numpy.max(md.mesh.x))[0] -# posx=numpy.nonzero(logical_and_n(md.mesh.x==0.,md.mesh.y!=0.,md.mesh.y!=numpy.max(md.mesh.y),numpy.logical_not(md.mesh.vertexonbed)))[0] -# posx2=numpy.nonzero(logical_and_n(md.mesh.x==numpy.max(md.mesh.x),md.mesh.y!=0.,md.mesh.y!=numpy.max(md.mesh.y),numpy.logical_not(md.mesh.vertexonbed)))[0] +# posx=numpy.nonzero(logical_and_n(md.mesh.x==0.,md.mesh.y!=0.,md.mesh.y!=numpy.max(md.mesh.y),numpy.logical_not(md.mesh.vertexonbase)))[0] +# posx2=numpy.nonzero(logical_and_n(md.mesh.x==numpy.max(md.mesh.x),md.mesh.y!=0.,md.mesh.y!=numpy.max(md.mesh.y),numpy.logical_not(md.mesh.vertexonbase)))[0] -# posy=numpy.nonzero(logical_and_n(md.mesh.y==0.,md.mesh.x!=0.,md.mesh.x!=numpy.max(md.mesh.x),numpy.logical_not(md.mesh.vertexonbed)))[0] #Don't take the same nodes two times -# posy2=numpy.nonzero(logical_and_n(md.mesh.y==numpy.max(md.mesh.y),md.mesh.x!=0.,md.mesh.x!=numpy.max(md.mesh.x),numpy.logical_not(md.mesh.vertexonbed)))[0] +# posy=numpy.nonzero(logical_and_n(md.mesh.y==0.,md.mesh.x!=0.,md.mesh.x!=numpy.max(md.mesh.x),numpy.logical_not(md.mesh.vertexonbase)))[0] #Don't take the same nodes two times +# posy2=numpy.nonzero(logical_and_n(md.mesh.y==numpy.max(md.mesh.y),md.mesh.x!=0.,md.mesh.x!=numpy.max(md.mesh.x),numpy.logical_not(md.mesh.vertexonbase)))[0] # md.stressbalance.vertex_pairing=numpy.vstack((numpy.hstack((posx.reshape(-1,1)+1,posx2.reshape(-1,1)+1)),numpy.hstack((posy.reshape(-1,1)+1,posy2.reshape(-1,1)+1)))) Index: /issm/trunk-jpl/test/NightlyRun/test1103.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1103.m (revision 17609) +++ /issm/trunk-jpl/test/NightlyRun/test1103.m (revision 17610) @@ -24,5 +24,5 @@ md.stressbalance.spcvy=NaN*ones(md.mesh.numberofvertices,1); md.stressbalance.spcvz=NaN*ones(md.mesh.numberofvertices,1); - pos=find(md.mesh.vertexonbed); + pos=find(md.mesh.vertexonbase); md.stressbalance.spcvx(pos)=0.; md.stressbalance.spcvy(pos)=0.; Index: /issm/trunk-jpl/test/NightlyRun/test1103.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1103.py (revision 17609) +++ /issm/trunk-jpl/test/NightlyRun/test1103.py (revision 17610) @@ -38,5 +38,5 @@ md.stressbalance.spcvy=float('NaN')*numpy.ones((md.mesh.numberofvertices,1)) md.stressbalance.spcvz=float('NaN')*numpy.ones((md.mesh.numberofvertices,1)) - pos=numpy.nonzero(md.mesh.vertexonbed) + pos=numpy.nonzero(md.mesh.vertexonbase) md.stressbalance.spcvx[pos]=0. md.stressbalance.spcvy[pos]=0. Index: /issm/trunk-jpl/test/NightlyRun/test1104.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1104.m (revision 17609) +++ /issm/trunk-jpl/test/NightlyRun/test1104.m (revision 17610) @@ -21,5 +21,5 @@ md.stressbalance.spcvz=NaN*ones(md.mesh.numberofvertices,1); - pos=find(md.mesh.vertexonbed); + pos=find(md.mesh.vertexonbase); md.stressbalance.spcvx(pos)=0.; md.stressbalance.spcvy(pos)=0.; Index: /issm/trunk-jpl/test/NightlyRun/test1104.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1104.py (revision 17609) +++ /issm/trunk-jpl/test/NightlyRun/test1104.py (revision 17610) @@ -33,5 +33,5 @@ md.stressbalance.spcvz=float('NaN')*numpy.ones((md.mesh.numberofvertices,1)) - pos=numpy.nonzero(md.mesh.vertexonbed) + pos=numpy.nonzero(md.mesh.vertexonbase) md.stressbalance.spcvx[pos]=0. md.stressbalance.spcvy[pos]=0. Index: /issm/trunk-jpl/test/NightlyRun/test1105.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1105.m (revision 17609) +++ /issm/trunk-jpl/test/NightlyRun/test1105.m (revision 17610) @@ -34,5 +34,5 @@ %Add spc on the corners - pos=find((md.mesh.x==0. | md.mesh.x==L) & (md.mesh.y==0. | md.mesh.y==L) & md.mesh.vertexonbed); + pos=find((md.mesh.x==0. | md.mesh.x==L) & (md.mesh.y==0. | md.mesh.y==L) & md.mesh.vertexonbase); md.stressbalance.spcvx(pos)=0.; md.stressbalance.spcvy(pos)=0.; @@ -58,5 +58,5 @@ %Spc the bed at zero for vz - pos=find(md.mesh.vertexonbed); + pos=find(md.mesh.vertexonbase); md.stressbalance.spcvz(pos)=0.; Index: /issm/trunk-jpl/test/NightlyRun/test1105.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1105.py (revision 17609) +++ /issm/trunk-jpl/test/NightlyRun/test1105.py (revision 17610) @@ -48,5 +48,5 @@ #Add spc on the corners - pos=numpy.nonzero(logical_and_n(numpy.logical_or(md.mesh.x==0.,md.mesh.x==L),numpy.logical_or(md.mesh.y==0.,md.mesh.y==L),md.mesh.vertexonbed)) + pos=numpy.nonzero(logical_and_n(numpy.logical_or(md.mesh.x==0.,md.mesh.x==L),numpy.logical_or(md.mesh.y==0.,md.mesh.y==L),md.mesh.vertexonbase)) md.stressbalance.spcvx[pos]=0. md.stressbalance.spcvy[pos]=0. @@ -71,5 +71,5 @@ #Spc the bed at zero for vz - pos=numpy.nonzero(md.mesh.vertexonbed) + pos=numpy.nonzero(md.mesh.vertexonbase) md.stressbalance.spcvz[pos]=0. Index: /issm/trunk-jpl/test/NightlyRun/test1107.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1107.m (revision 17609) +++ /issm/trunk-jpl/test/NightlyRun/test1107.m (revision 17610) @@ -26,6 +26,6 @@ %Create MPCs to have periodic boundary conditions - posx=find(md.mesh.x==0. & ~(md.mesh.y==0. & md.mesh.vertexonbed) & ~(md.mesh.y==L & md.mesh.vertexonbed)); - posx2=find(md.mesh.x==max(md.mesh.x) & ~(md.mesh.y==0. & md.mesh.vertexonbed) & ~(md.mesh.y==L & md.mesh.vertexonbed)); + posx=find(md.mesh.x==0. & ~(md.mesh.y==0. & md.mesh.vertexonbase) & ~(md.mesh.y==L & md.mesh.vertexonbase)); + posx2=find(md.mesh.x==max(md.mesh.x) & ~(md.mesh.y==0. & md.mesh.vertexonbase) & ~(md.mesh.y==L & md.mesh.vertexonbase)); posy=find(md.mesh.y==0. & md.mesh.x~=0. & md.mesh.x~=max(md.mesh.x)); %Don't take the same nodes two times @@ -35,5 +35,5 @@ %Add spc on the corners - pos=find((md.mesh.x==0. | md.mesh.x==L) & (md.mesh.y==0. | md.mesh.y==L) & md.mesh.vertexonbed); + pos=find((md.mesh.x==0. | md.mesh.x==L) & (md.mesh.y==0. | md.mesh.y==L) & md.mesh.vertexonbase); md.stressbalance.spcvy(:)=0.; md.stressbalance.spcvx(pos)=0.; @@ -53,5 +53,5 @@ %Spc the bed at zero for vz - pos=find(md.mesh.vertexonbed); + pos=find(md.mesh.vertexonbase); md.stressbalance.spcvz(pos)=0.; Index: /issm/trunk-jpl/test/NightlyRun/test1107.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1107.py (revision 17609) +++ /issm/trunk-jpl/test/NightlyRun/test1107.py (revision 17610) @@ -40,8 +40,8 @@ #Create MPCs to have periodic boundary conditions -# posx=find(md.mesh.x==0. & ~(md.mesh.y==0. & md.mesh.vertexonbed) & ~(md.mesh.y==L & md.mesh.vertexonbed)); - posx=numpy.nonzero(logical_and_n(md.mesh.x==0.,numpy.logical_not(numpy.logical_and(md.mesh.y==0.,md.mesh.vertexonbed)),numpy.logical_not(numpy.logical_and(md.mesh.y==L,md.mesh.vertexonbed))))[0] -# posx2=find(md.mesh.x==max(md.mesh.x) & ~(md.mesh.y==0. & md.mesh.vertexonbed) & ~(md.mesh.y==L & md.mesh.vertexonbed)); - posx2=numpy.nonzero(logical_and_n(md.mesh.x==numpy.max(md.mesh.x),numpy.logical_not(numpy.logical_and(md.mesh.y==0.,md.mesh.vertexonbed)),numpy.logical_not(numpy.logical_and(md.mesh.y==L,md.mesh.vertexonbed))))[0] +# posx=find(md.mesh.x==0. & ~(md.mesh.y==0. & md.mesh.vertexonbase) & ~(md.mesh.y==L & md.mesh.vertexonbase)); + posx=numpy.nonzero(logical_and_n(md.mesh.x==0.,numpy.logical_not(numpy.logical_and(md.mesh.y==0.,md.mesh.vertexonbase)),numpy.logical_not(numpy.logical_and(md.mesh.y==L,md.mesh.vertexonbase))))[0] +# posx2=find(md.mesh.x==max(md.mesh.x) & ~(md.mesh.y==0. & md.mesh.vertexonbase) & ~(md.mesh.y==L & md.mesh.vertexonbase)); + posx2=numpy.nonzero(logical_and_n(md.mesh.x==numpy.max(md.mesh.x),numpy.logical_not(numpy.logical_and(md.mesh.y==0.,md.mesh.vertexonbase)),numpy.logical_not(numpy.logical_and(md.mesh.y==L,md.mesh.vertexonbase))))[0] posy=numpy.nonzero(logical_and_n(md.mesh.y==0.,md.mesh.x!=0.,md.mesh.x!=numpy.max(md.mesh.x)))[0] #Don't take the same nodes two times @@ -51,5 +51,5 @@ #Add spc on the corners - pos=numpy.nonzero(logical_and_n(numpy.logical_or(md.mesh.x==0.,md.mesh.x==L),numpy.logical_or(md.mesh.y==0.,md.mesh.y==L),md.mesh.vertexonbed)) + pos=numpy.nonzero(logical_and_n(numpy.logical_or(md.mesh.x==0.,md.mesh.x==L),numpy.logical_or(md.mesh.y==0.,md.mesh.y==L),md.mesh.vertexonbase)) md.stressbalance.spcvy[:]=0. md.stressbalance.spcvx[pos]=0. @@ -68,5 +68,5 @@ #Spc the bed at zero for vz - pos=numpy.nonzero(md.mesh.vertexonbed) + pos=numpy.nonzero(md.mesh.vertexonbase) md.stressbalance.spcvz[pos]=0. Index: /issm/trunk-jpl/test/NightlyRun/test1108.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1108.m (revision 17609) +++ /issm/trunk-jpl/test/NightlyRun/test1108.m (revision 17610) @@ -22,5 +22,5 @@ md.stressbalance.spcvz=NaN*ones(md.mesh.numberofvertices,1); - pos=find(md.mesh.vertexonbed & (md.mesh.x==0. | md.mesh.x==max(md.mesh.x)) & (md.mesh.y==0. | md.mesh.y==max(md.mesh.y))); + pos=find(md.mesh.vertexonbase & (md.mesh.x==0. | md.mesh.x==max(md.mesh.x)) & (md.mesh.y==0. | md.mesh.y==max(md.mesh.y))); md.stressbalance.spcvx(pos)=0.; md.stressbalance.spcvy(pos)=0.; Index: /issm/trunk-jpl/test/NightlyRun/test1108.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1108.py (revision 17609) +++ /issm/trunk-jpl/test/NightlyRun/test1108.py (revision 17610) @@ -34,5 +34,5 @@ md.stressbalance.spcvz=float('NaN')*numpy.ones((md.mesh.numberofvertices,1)) - pos=numpy.nonzero(logical_and_n(md.mesh.vertexonbed,numpy.logical_or(md.mesh.x==0.,md.mesh.x==numpy.max(md.mesh.x)),numpy.logical_or(md.mesh.y==0.,md.mesh.y==numpy.max(md.mesh.y)))) + pos=numpy.nonzero(logical_and_n(md.mesh.vertexonbase,numpy.logical_or(md.mesh.x==0.,md.mesh.x==numpy.max(md.mesh.x)),numpy.logical_or(md.mesh.y==0.,md.mesh.y==numpy.max(md.mesh.y)))) md.stressbalance.spcvx[pos]=0. md.stressbalance.spcvy[pos]=0. Index: /issm/trunk-jpl/test/NightlyRun/test1109.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1109.m (revision 17609) +++ /issm/trunk-jpl/test/NightlyRun/test1109.m (revision 17610) @@ -31,5 +31,5 @@ %Create spcs on the bed - pos=find(md.mesh.vertexonbed); + pos=find(md.mesh.vertexonbase); md.stressbalance.spcvx=NaN*ones(md.mesh.numberofvertices,1); md.stressbalance.spcvy=NaN*ones(md.mesh.numberofvertices,1); Index: /issm/trunk-jpl/test/NightlyRun/test1110.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1110.m (revision 17609) +++ /issm/trunk-jpl/test/NightlyRun/test1110.m (revision 17610) @@ -26,15 +26,15 @@ if (i==1 | i==3), %Create dirichlet on the bed if no slip - pos=find(md.mesh.vertexonbed); + pos=find(md.mesh.vertexonbase); md.stressbalance.spcvx(pos)=0.; md.stressbalance.spcvy(pos)=0.; md.stressbalance.spcvz(pos)=0.; else - pos=find(md.mesh.vertexonbed & (md.mesh.x==0. | md.mesh.x==max(md.mesh.x)) & (md.mesh.y==0. | md.mesh.y==max(md.mesh.y))); + pos=find(md.mesh.vertexonbase & (md.mesh.x==0. | md.mesh.x==max(md.mesh.x)) & (md.mesh.y==0. | md.mesh.y==max(md.mesh.y))); md.stressbalance.spcvx(pos)=100.; %because we need a dirichlet somewhere md.stressbalance.spcvy(pos)=0.; md.stressbalance.spcvz(pos)=0.; end - pos=find(~md.mesh.vertexonbed); + pos=find(~md.mesh.vertexonbase); md.thermal.spctemperature(pos)=255.; Index: /issm/trunk-jpl/test/NightlyRun/test1205.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1205.m (revision 17609) +++ /issm/trunk-jpl/test/NightlyRun/test1205.m (revision 17610) @@ -22,5 +22,5 @@ %Spc the nodes on the bed -pos=find(md.mesh.vertexonbed); +pos=find(md.mesh.vertexonbase); md.stressbalance.spcvx(pos)=0.; md.stressbalance.spcvy(pos)=0.; Index: /issm/trunk-jpl/test/NightlyRun/test1205.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1205.py (revision 17609) +++ /issm/trunk-jpl/test/NightlyRun/test1205.py (revision 17610) @@ -35,5 +35,5 @@ #Spc the nodes on the bed -pos=numpy.nonzero(md.mesh.vertexonbed) +pos=numpy.nonzero(md.mesh.vertexonbase) md.stressbalance.spcvx[pos]=0. md.stressbalance.spcvy[pos]=0. Index: /issm/trunk-jpl/test/NightlyRun/test1206.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1206.m (revision 17609) +++ /issm/trunk-jpl/test/NightlyRun/test1206.m (revision 17610) @@ -22,5 +22,5 @@ %Spc the nodes on the bed -pos=find(md.mesh.vertexonbed); +pos=find(md.mesh.vertexonbase); md.stressbalance.spcvx(pos)=0.; md.stressbalance.spcvy(pos)=0.; Index: /issm/trunk-jpl/test/NightlyRun/test1206.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1206.py (revision 17609) +++ /issm/trunk-jpl/test/NightlyRun/test1206.py (revision 17610) @@ -35,5 +35,5 @@ #Spc the nodes on the bed -pos=numpy.nonzero(md.mesh.vertexonbed) +pos=numpy.nonzero(md.mesh.vertexonbase) md.stressbalance.spcvx[pos]=0. md.stressbalance.spcvy[pos]=0. Index: /issm/trunk-jpl/test/NightlyRun/test1207.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1207.m (revision 17609) +++ /issm/trunk-jpl/test/NightlyRun/test1207.m (revision 17610) @@ -22,5 +22,5 @@ %Spc the nodes on the bed -pos=find(md.mesh.vertexonbed); +pos=find(md.mesh.vertexonbase); md.stressbalance.spcvx(pos)=0.; md.stressbalance.spcvy(pos)=0.; Index: /issm/trunk-jpl/test/NightlyRun/test1207.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1207.py (revision 17609) +++ /issm/trunk-jpl/test/NightlyRun/test1207.py (revision 17610) @@ -35,5 +35,5 @@ #Spc the nodes on the bed -pos=numpy.nonzero(md.mesh.vertexonbed) +pos=numpy.nonzero(md.mesh.vertexonbase) md.stressbalance.spcvx[pos]=0. md.stressbalance.spcvy[pos]=0. Index: /issm/trunk-jpl/test/NightlyRun/test1208.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1208.m (revision 17609) +++ /issm/trunk-jpl/test/NightlyRun/test1208.m (revision 17610) @@ -13,5 +13,5 @@ %Spc the nodes on the bed -pos=find(md.mesh.vertexonbed); +pos=find(md.mesh.vertexonbase); md.stressbalance.spcvx(pos)=0.; md.stressbalance.spcvy(pos)=0.; Index: /issm/trunk-jpl/test/NightlyRun/test1208.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1208.py (revision 17609) +++ /issm/trunk-jpl/test/NightlyRun/test1208.py (revision 17610) @@ -26,5 +26,5 @@ #Spc the nodes on the bed -pos=numpy.nonzero(md.mesh.vertexonbed) +pos=numpy.nonzero(md.mesh.vertexonbase) md.stressbalance.spcvx[pos]=0. md.stressbalance.spcvy[pos]=0. Index: /issm/trunk-jpl/test/NightlyRun/test1302.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1302.m (revision 17609) +++ /issm/trunk-jpl/test/NightlyRun/test1302.m (revision 17610) @@ -12,5 +12,5 @@ %Thermal boundary conditions -pos1=find(md.mesh.elementonbed); md.thermal.spctemperature(md.mesh.elements(pos1,1:3))=10.; +pos1=find(md.mesh.elementonbase); md.thermal.spctemperature(md.mesh.elements(pos1,1:3))=10.; pos2=find(md.mesh.elementonsurface); md.thermal.spctemperature(md.mesh.elements(pos2,4:6))=0.; md.initialization.vz=0.1*ones(md.mesh.numberofvertices,1); Index: /issm/trunk-jpl/test/NightlyRun/test1302.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1302.py (revision 17609) +++ /issm/trunk-jpl/test/NightlyRun/test1302.py (revision 17610) @@ -26,5 +26,5 @@ #Thermal boundary conditions -pos1=numpy.nonzero(md.mesh.elementonbed)[0] +pos1=numpy.nonzero(md.mesh.elementonbase)[0] md.thermal.spctemperature[md.mesh.elements[pos1,0:3]-1]=10. pos2=numpy.nonzero(md.mesh.elementonsurface)[0] Index: /issm/trunk-jpl/test/NightlyRun/test1303.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1303.m (revision 17609) +++ /issm/trunk-jpl/test/NightlyRun/test1303.m (revision 17610) @@ -12,5 +12,5 @@ md=setflowequation(md,'HO','all'); -pos1=find(md.mesh.elementonbed); md.thermal.spctemperature(md.mesh.elements(pos1,1:3))=10.; +pos1=find(md.mesh.elementonbase); md.thermal.spctemperature(md.mesh.elements(pos1,1:3))=10.; pos2=find(md.mesh.elementonsurface); md.thermal.spctemperature(md.mesh.elements(pos2,4:6))=0.; md.initialization.pressure=zeros(md.mesh.numberofvertices,1); Index: /issm/trunk-jpl/test/NightlyRun/test1303.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1303.py (revision 17609) +++ /issm/trunk-jpl/test/NightlyRun/test1303.py (revision 17610) @@ -26,5 +26,5 @@ md=setflowequation(md,'HO','all') -pos1=numpy.nonzero(md.mesh.elementonbed)[0] +pos1=numpy.nonzero(md.mesh.elementonbase)[0] md.thermal.spctemperature[md.mesh.elements[pos1,0:3]-1]=10. pos2=numpy.nonzero(md.mesh.elementonsurface)[0] Index: /issm/trunk-jpl/test/NightlyRun/test703.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test703.m (revision 17609) +++ /issm/trunk-jpl/test/NightlyRun/test703.m (revision 17610) @@ -47,5 +47,5 @@ md.basalforcings.melting_rate=zeros(md.mesh.numberofvertices,1); md.basalforcings.geothermalflux=zeros(md.mesh.numberofvertices,1); -posb=find((md.mesh.x>0) & md.mesh.vertexonbed); +posb=find((md.mesh.x>0) & md.mesh.vertexonbase); md.basalforcings.melting_rate(posb)=18; md.initialization.vx=zeros(md.mesh.numberofvertices,1);