Index: ../trunk-jpl/src/c/analyses/BalancethicknessAnalysis.cpp =================================================================== --- ../trunk-jpl/src/c/analyses/BalancethicknessAnalysis.cpp (revision 17584) +++ ../trunk-jpl/src/c/analyses/BalancethicknessAnalysis.cpp (revision 17585) @@ -125,7 +125,7 @@ }/*}}}*/ ElementMatrix* BalancethicknessAnalysis::CreateKMatrix(Element* element){/*{{{*/ - if(!element->IsOnBed()) return NULL; + if(!element->IsOnBase()) return NULL; Element* basalelement = element->SpawnBasalElement(); ElementMatrix* Ke = NULL; @@ -317,7 +317,7 @@ }/*}}}*/ ElementVector* BalancethicknessAnalysis::CreatePVector(Element* element){/*{{{*/ - if(!element->IsOnBed()) return NULL; + if(!element->IsOnBase()) return NULL; Element* basalelement = element->SpawnBasalElement(); ElementVector* pe = NULL; Index: ../trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp =================================================================== --- ../trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp (revision 17584) +++ ../trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp (revision 17585) @@ -120,7 +120,7 @@ basalelement = element; break; case Mesh3DEnum: - if(!element->IsOnBed()) return NULL; + if(!element->IsOnBase()) return NULL; basalelement = element->SpawnBasalElement(); break; default: _error_("mesh "<IsOnBed()) return NULL; + if(!element->IsOnBase()) return NULL; basalelement = element->SpawnBasalElement(); break; default: _error_("mesh "<FindParam(&meshtype,MeshTypeEnum); if(meshtype!=Mesh2DhorizontalEnum){ - if(!element->IsOnBed()) return; + if(!element->IsOnBase()) return; basalelement=element->SpawnBasalElement(); } else{ @@ -493,7 +493,7 @@ switch(meshtype){ case Mesh2DhorizontalEnum: - if(!element->IsOnBed()) return; + if(!element->IsOnBase()) return; B = element->GetMaterialParameter(MaterialsRheologyBbarEnum); break; case Mesh3DEnum: @@ -613,7 +613,7 @@ basalelement = element; break; case Mesh3DEnum: - if(!element->IsOnBed()) return; + if(!element->IsOnBase()) return; basalelement = element->SpawnBasalElement(); break; default: _error_("mesh "<IsOnBed()) return; + if(!element->IsOnBase()) return; basalelement = element->SpawnBasalElement(); break; default: _error_("mesh "<IsOnBed()) return NULL; + if(!element->IsOnBase()) return NULL; basalelement = element->SpawnBasalElement(); break; default: _error_("mesh "<IsOnBed()) return NULL; + if(!element->IsOnBase()) return NULL; basalelement = element->SpawnBasalElement(); break; default: _error_("mesh "<IsOnBed()) return NULL; + if(!element->IsOnBase()) return NULL; Element* basalelement = element->SpawnBasalElement(); /*Intermediaries */ @@ -252,7 +252,7 @@ }/*}}}*/ ElementVector* LevelsetAnalysis::CreatePVector(Element* element){/*{{{*/ - if(!element->IsOnBed()) return NULL; + if(!element->IsOnBase()) return NULL; Element* basalelement = element->SpawnBasalElement(); /*Intermediaries */ Index: ../trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.cpp =================================================================== --- ../trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.cpp (revision 17584) +++ ../trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.cpp (revision 17585) @@ -277,7 +277,7 @@ IssmDouble Jdet,slope[3]; IssmDouble vx,vy,vz=0.,dbdx,dbdy,basalmeltingvalue; - if(!element->IsOnBed()) return NULL; + if(!element->IsOnBase()) return NULL; /*Fetch number of nodes for this finite element*/ int numnodes = element->GetNumberOfNodes(); Index: ../trunk-jpl/src/c/analyses/MeltingAnalysis.cpp =================================================================== --- ../trunk-jpl/src/c/analyses/MeltingAnalysis.cpp (revision 17584) +++ ../trunk-jpl/src/c/analyses/MeltingAnalysis.cpp (revision 17585) @@ -84,7 +84,7 @@ ElementMatrix* MeltingAnalysis::CreateKMatrix(Element* element){/*{{{*/ /*Get basal element*/ - if(!element->IsOnBed()) return NULL; + if(!element->IsOnBase()) return NULL; Element* basalelement = element->SpawnBasalElement(); /*Intermediaries */ Index: ../trunk-jpl/src/c/analyses/ExtrudeFromBaseAnalysis.cpp =================================================================== --- ../trunk-jpl/src/c/analyses/ExtrudeFromBaseAnalysis.cpp (revision 17584) +++ ../trunk-jpl/src/c/analyses/ExtrudeFromBaseAnalysis.cpp (revision 17585) @@ -162,7 +162,7 @@ /*}}}*/ ElementMatrix* ExtrudeFromBaseAnalysis::CreateKMatrixBed(Element* element){/*{{{*/ - if(!element->IsOnBed()) return NULL; + if(!element->IsOnBase()) return NULL; /*Intermediaries */ IssmDouble Jdet,D,normal[3]; Index: ../trunk-jpl/src/c/analyses/AdjointBalancethicknessAnalysis.cpp =================================================================== --- ../trunk-jpl/src/c/analyses/AdjointBalancethicknessAnalysis.cpp (revision 17584) +++ ../trunk-jpl/src/c/analyses/AdjointBalancethicknessAnalysis.cpp (revision 17585) @@ -58,7 +58,7 @@ basalelement = element; break; case Mesh3DEnum: - if(!element->IsOnBed()) return NULL; + if(!element->IsOnBase()) return NULL; basalelement = element->SpawnBasalElement(); break; default: _error_("mesh "<IsOnBed()) return NULL; + if(!element->IsOnBase()) return NULL; basalelement = element->SpawnBasalElement(); break; case Mesh3DEnum: - if(!element->IsOnBed()) return NULL; + if(!element->IsOnBase()) return NULL; basalelement = element->SpawnBasalElement(); break; default: _error_("mesh "<IsOnBed()) return NULL; + if(!element->IsOnBase()) return NULL; basalelement = element->SpawnBasalElement(); break; default: _error_("mesh "<IsIceInElement()) return NULL; - if(!element->IsOnBed()) return NULL; + if(!element->IsOnBase()) return NULL; Element* basalelement = element->SpawnBasalElement(); ElementMatrix* Ke = NULL; @@ -489,7 +489,7 @@ /* Check if ice in element */ if(!element->IsIceInElement()) return NULL; - if(!element->IsOnBed()) return NULL; + if(!element->IsOnBase()) return NULL; Element* basalelement = element->SpawnBasalElement(); ElementVector* pe = NULL; @@ -676,7 +676,7 @@ element->FindParam(&meshtype,MeshTypeEnum); if(meshtype!=Mesh2DhorizontalEnum){ - if(!element->IsOnBed()) return; + if(!element->IsOnBase()) return; basalelement=element->SpawnBasalElement(); } else{ Index: ../trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeXAnalysis.cpp =================================================================== --- ../trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeXAnalysis.cpp (revision 17584) +++ ../trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeXAnalysis.cpp (revision 17585) @@ -114,7 +114,7 @@ basalelement = element; break; case Mesh3DEnum: - if(!element->IsOnBed()) return NULL; + if(!element->IsOnBase()) return NULL; basalelement = element->SpawnBasalElement(); break; default: _error_("mesh "<IsOnBed()) return NULL; + if(!element->IsOnBase()) return NULL; basalelement = element->SpawnBasalElement(); break; default: _error_("mesh "<IsOnBed()) return NULL; + if(!element->IsOnBase()) return NULL; /*Intermediaries */ IssmDouble Jdet,D,normal[3]; Index: ../trunk-jpl/src/c/analyses/BalancevelocityAnalysis.cpp =================================================================== --- ../trunk-jpl/src/c/analyses/BalancevelocityAnalysis.cpp (revision 17584) +++ ../trunk-jpl/src/c/analyses/BalancevelocityAnalysis.cpp (revision 17585) @@ -157,7 +157,7 @@ basalelement = element; break; case Mesh3DEnum: - if(!element->IsOnBed()) return NULL; + if(!element->IsOnBase()) return NULL; basalelement = element->SpawnBasalElement(); break; default: _error_("mesh "<IsOnBed()) return NULL; + if(!element->IsOnBase()) return NULL; basalelement = element->SpawnBasalElement(); break; case Mesh3DEnum: - if(!element->IsOnBed()) return NULL; + if(!element->IsOnBase()) return NULL; basalelement = element->SpawnBasalElement(); break; case Mesh3DtetrasEnum: - if(!element->IsOnBed()) return NULL; + if(!element->IsOnBase()) return NULL; basalelement = element->SpawnBasalElement(); break; default: _error_("mesh "<IsOnBed()) return NULL; + if(!element->IsOnBase()) return NULL; basalelement = element->SpawnBasalElement(); break; case Mesh3DEnum: - if(!element->IsOnBed()) return NULL; + if(!element->IsOnBase()) return NULL; basalelement = element->SpawnBasalElement(); break; case Mesh3DtetrasEnum: - if(!element->IsOnBed()) return NULL; + if(!element->IsOnBase()) return NULL; basalelement = element->SpawnBasalElement(); break; default: _error_("mesh "<IsOnBed() && element->IsOnSurface()){ + if(element->IsOnBase() && element->IsOnSurface()){ Ke->values[i0*numdof+i0] = +one0; Ke->values[i1*numdof+i1] = +one0; Ke->values[j0*numdof+i0] = -one1; @@ -234,7 +234,7 @@ Ke->values[j1*numdof+i1] = -one1; Ke->values[j1*numdof+j1] = +one1; } - else if(element->IsOnBed()){ + else if(element->IsOnBase()){ Ke->values[i0*numdof+i0] = one0; Ke->values[i1*numdof+i1] = one0; Ke->values[j0*numdof+i0] = -2.*one1; @@ -418,7 +418,7 @@ } /*Deal with basal velocities*/ - if(element->IsOnBed()){ + if(element->IsOnBase()){ drag_input->GetInputValue(&drag,gauss); switch(frictionlaw){ Index: ../trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp =================================================================== --- ../trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (revision 17584) +++ ../trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (revision 17585) @@ -1084,7 +1084,7 @@ basalelement = element; break; case Mesh3DEnum: - if(!element->IsOnBed()) return NULL; + if(!element->IsOnBase()) return NULL; basalelement = element->SpawnBasalElement(); break; default: _error_("mesh "<IsOnBed()) return NULL; + if(!element->IsOnBase()) return NULL; basalelement = element->SpawnBasalElement(); break; default: _error_("mesh "<IsOnBed()) return NULL; + if(!element->IsOnBase()) return NULL; basalelement = element->SpawnBasalElement(); break; default: _error_("mesh "<IsOnBed()){xDelete(xyz_list); return;} + if(!element->IsOnBase()){xDelete(xyz_list); return;} basalelement=element->SpawnBasalElement(); break; default: _error_("mesh "<IsOnBed() || element->IsFloating()) return NULL; + if(!element->IsOnBase() || element->IsFloating()) return NULL; Element* basalelement = element->SpawnBasalElement(); ElementMatrix* Ke = CreateKMatrixSSAFriction(basalelement); @@ -1853,7 +1853,7 @@ basalelement = element; break; case Mesh3DEnum: - if(!element->IsOnBed()) return NULL; + if(!element->IsOnBase()) return NULL; basalelement = element->SpawnBasalElement(); break; default: _error_("mesh "<IsOnBed()){xDelete(xyz_list); return;} + if(!element->IsOnBase()){xDelete(xyz_list); return;} basalelement=element->SpawnBasalElement(); break; default: _error_("mesh "<IsIceInElement()) return NULL; - if(element->IsFloating() || !element->IsOnBed()) return NULL; + if(element->IsFloating() || !element->IsOnBase()) return NULL; /*Intermediaries*/ int dim,meshtype; @@ -3040,7 +3040,7 @@ }/*}}}*/ ElementMatrix* StressbalanceAnalysis::CreateKMatrixFSFriction(Element* element){/*{{{*/ - if(element->IsFloating() || !element->IsOnBed()) return NULL; + if(element->IsFloating() || !element->IsOnBase()) return NULL; /*If on water or not FS, skip stiffness: */ int approximation; @@ -3133,7 +3133,7 @@ }/*}}}*/ ElementMatrix* StressbalanceAnalysis::CreateKMatrixFSShelf(Element* element){/*{{{*/ - if(!element->IsFloating() || !element->IsOnBed()) return NULL; + if(!element->IsFloating() || !element->IsOnBase()) return NULL; /*If on not water or not FS, skip stiffness: */ int approximation,shelf_dampening; @@ -3564,7 +3564,7 @@ IssmDouble *xyz_list_base = NULL; /*Get basal element*/ - if(!element->IsOnBed() || !element->IsFloating()) return NULL; + if(!element->IsOnBase() || !element->IsFloating()) return NULL; /*Get problem dimension*/ element->FindParam(&meshtype,MeshTypeEnum); @@ -4508,7 +4508,7 @@ ElementMatrix* StressbalanceAnalysis::CreateKMatrixSSA3dFriction(Element* element){/*{{{*/ /*Initialize Element matrix and return if necessary*/ - if(element->IsFloating() || !element->IsOnBed()) return NULL; + if(element->IsFloating() || !element->IsOnBase()) return NULL; /*Build a tria element using the 3 nodes of the base of the penta. Then use * the tria functionality to build a friction stiffness matrix on these 3 @@ -4732,7 +4732,7 @@ }/*}}}*/ ElementMatrix* StressbalanceAnalysis::CreateKMatrixCouplingSSAHOFriction(Element* element){/*{{{*/ - if(element->IsFloating() || !element->IsOnBed()) return NULL; + if(element->IsFloating() || !element->IsOnBase()) return NULL; /*Constants*/ int numnodes = element->GetNumberOfNodes(); @@ -4938,7 +4938,7 @@ /*If on water or not FS, skip stiffness: */ element->GetInputValue(&approximation,ApproximationEnum); - if(element->IsFloating() || !element->IsOnBed()) return NULL; + if(element->IsFloating() || !element->IsOnBase()) return NULL; int vnumnodes = element->NumberofNodesVelocity(); int pnumnodes = element->NumberofNodesPressure(); @@ -5223,7 +5223,7 @@ IssmDouble basis[6]; //for the six nodes of the penta /*Initialize Element vector and return if necessary*/ - if(!element->IsOnBed() || element->IsFloating()) return NULL; + if(!element->IsOnBase() || element->IsFloating()) return NULL; element->GetInputValue(&approximation,ApproximationEnum); if(approximation!=HOFSApproximationEnum) return NULL; @@ -5387,7 +5387,7 @@ IssmDouble *xyz_list = NULL; /*Initialize Element vector and return if necessary*/ - if(!element->IsOnBed() || element->IsFloating()) return NULL; + if(!element->IsOnBase() || element->IsFloating()) return NULL; element->GetInputValue(&approximation,ApproximationEnum); if(approximation!=SSAFSApproximationEnum) return NULL; int vnumnodes = element->NumberofNodesVelocity(); Index: ../trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp =================================================================== --- ../trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp (revision 17584) +++ ../trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp (revision 17585) @@ -164,7 +164,7 @@ basalelement = element; break; case Mesh3DEnum: - if(!element->IsOnBed()) return NULL; + if(!element->IsOnBase()) return NULL; basalelement = element->SpawnBasalElement(); break; default: _error_("mesh "<IsOnBed()) return NULL; + if(!element->IsOnBase()) return NULL; basalelement = element->SpawnBasalElement(); break; default: _error_("mesh "<FindParam(&meshtype,MeshTypeEnum); if(meshtype!=Mesh2DhorizontalEnum){ - if(!element->IsOnBed()) return; + if(!element->IsOnBase()) return; basalelement=element->SpawnBasalElement(); } else{ Index: ../trunk-jpl/src/c/analyses/ThermalAnalysis.cpp =================================================================== --- ../trunk-jpl/src/c/analyses/ThermalAnalysis.cpp (revision 17584) +++ ../trunk-jpl/src/c/analyses/ThermalAnalysis.cpp (revision 17585) @@ -280,13 +280,13 @@ if(!element->IsIceInElement()) return NULL; /*Initialize Element matrix and return if necessary*/ - if(!element->IsOnBed() || !element->IsFloating()) return NULL; + if(!element->IsOnBase() || !element->IsFloating()) return NULL; IssmDouble dt,Jdet,D; IssmDouble *xyz_list_base = NULL; /*Get basal element*/ - if(!element->IsOnBed() || !element->IsFloating()) return NULL; + if(!element->IsOnBase() || !element->IsFloating()) return NULL; /*Fetch number of nodes for this finite element*/ int numnodes = element->GetNumberOfNodes(); @@ -433,7 +433,7 @@ if(!element->IsIceInElement()) return NULL; /* Geothermal flux on ice sheet base and basal friction */ - if(!element->IsOnBed() || element->IsFloating()) return NULL; + if(!element->IsOnBase() || element->IsFloating()) return NULL; IssmDouble dt,Jdet,geothermalflux,vx,vy,vz; IssmDouble alpha2,scalar,basalfriction,heatflux; @@ -498,7 +498,7 @@ IssmDouble *xyz_list_base = NULL; /*Get basal element*/ - if(!element->IsOnBed() || !element->IsFloating()) return NULL; + if(!element->IsOnBase() || !element->IsFloating()) return NULL; /*Fetch number of nodes for this finite element*/ int numnodes = element->GetNumberOfNodes(); Index: ../trunk-jpl/src/c/analyses/DamageEvolutionAnalysis.cpp =================================================================== --- ../trunk-jpl/src/c/analyses/DamageEvolutionAnalysis.cpp (revision 17584) +++ ../trunk-jpl/src/c/analyses/DamageEvolutionAnalysis.cpp (revision 17585) @@ -122,7 +122,7 @@ dim = 2; break; case Mesh3DEnum: - if(!element->IsOnBed()) return NULL; + if(!element->IsOnBase()) return NULL; basalelement = element->SpawnBasalElement(); dim = 2; break; @@ -270,7 +270,7 @@ basalelement = element; break; case Mesh3DEnum: - if(!element->IsOnBed()) return NULL; + if(!element->IsOnBase()) return NULL; basalelement = element->SpawnBasalElement(); break; default: _error_("mesh "<FindParam(&meshtype,MeshTypeEnum); if(meshtype!=Mesh2DhorizontalEnum){ - if(!element->IsOnBed()) return; + if(!element->IsOnBase()) return; basalelement=element->SpawnBasalElement(); } else{ Index: ../trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp =================================================================== --- ../trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp (revision 17584) +++ ../trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp (revision 17585) @@ -353,7 +353,7 @@ if(!element->IsIceInElement()) return NULL; /*Initialize Element matrix and return if necessary*/ - if(!element->IsOnBed() || !element->IsFloating()) return NULL; + if(!element->IsOnBase() || !element->IsFloating()) return NULL; /*Intermediaries*/ IssmDouble dt,Jdet,D; @@ -538,7 +538,7 @@ if(!element->IsIceInElement()) return NULL; /* implementation of the basal condition decision chart of Aschwanden 2012, Fig.5 */ - if(!element->IsOnBed() || element->IsFloating()) return NULL; + if(!element->IsOnBase() || element->IsFloating()) return NULL; IssmDouble dt,Jdet,enthalpy,pressure,watercolumn,geothermalflux,vx,vy,vz; IssmDouble enthalpyup,pressureup,alpha2,scalar,basalfriction,heatflux; @@ -628,7 +628,7 @@ if(!element->IsIceInElement()) return NULL; /*Get basal element*/ - if(!element->IsOnBed() || !element->IsFloating()) return NULL; + if(!element->IsOnBase() || !element->IsFloating()) return NULL; IssmDouble h_pmp,dt,Jdet,scalar_ocean,pressure; IssmDouble *xyz_list_base = NULL; @@ -901,7 +901,7 @@ if(!element->IsIceInElement()) return; /* Only compute melt rates at the base of grounded ice*/ - if(!element->IsOnBed() || element->IsFloating()) return; + if(!element->IsOnBase() || element->IsFloating()) return; /* Intermediaries */ const int dim=3; @@ -1047,7 +1047,7 @@ if(!element->IsIceInElement()) return; /* Only drain waterfraction of ice column from element at base*/ - if(!element->IsOnBed()) return; //FIXME: allow freeze on for floating elements + if(!element->IsOnBase()) return; //FIXME: allow freeze on for floating elements /* Intermediaries*/ int is, numvertices, numsegments; @@ -1149,7 +1149,7 @@ if(!element->IsIceInElement()) return; /* Only update Constraints at the base of grounded ice*/ - if(!(element->IsOnBed()) || element->IsFloating()) return; + if(!(element->IsOnBase()) || element->IsFloating()) return; /*Intermediary*/ bool isdynamicbasalspc,setspc; Index: ../trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.cpp =================================================================== --- ../trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.cpp (revision 17584) +++ ../trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.cpp (revision 17585) @@ -118,12 +118,12 @@ dim = 2; break; case Mesh2DverticalEnum: - if(!element->IsOnBed()) return NULL; + if(!element->IsOnBase()) return NULL; basalelement = element->SpawnBasalElement(); dim = 1; break; case Mesh3DEnum: - if(!element->IsOnBed()) return NULL; + if(!element->IsOnBase()) return NULL; basalelement = element->SpawnBasalElement(); dim = 2; break; @@ -241,12 +241,12 @@ dim = 2; break; case Mesh2DverticalEnum: - if(!element->IsOnBed()) return NULL; + if(!element->IsOnBase()) return NULL; basalelement = element->SpawnBasalElement(); dim = 1; break; case Mesh3DEnum: - if(!element->IsOnBed()) return NULL; + if(!element->IsOnBase()) return NULL; basalelement = element->SpawnBasalElement(); dim = 2; break; @@ -372,7 +372,7 @@ for(int i=0;ielements->Size();i++){ Element* element=dynamic_cast(femmodel->elements->GetObjectByOffset(i)); - if(!element->IsOnBed()) continue; + if(!element->IsOnBase()) continue; int numnodes = element->GetNumberOfNodes(); Input* groundedice_input = element->GetInput(MaskGroundediceLevelsetEnum); _assert_(groundedice_input); Index: ../trunk-jpl/src/c/analyses/ExtrapolationAnalysis.cpp =================================================================== --- ../trunk-jpl/src/c/analyses/ExtrapolationAnalysis.cpp (revision 17584) +++ ../trunk-jpl/src/c/analyses/ExtrapolationAnalysis.cpp (revision 17585) @@ -83,7 +83,7 @@ }/*}}}*/ ElementMatrix* ExtrapolationAnalysis::CreateKMatrix(Element* element){/*{{{*/ - if(!element->IsOnBed()) return NULL; + if(!element->IsOnBase()) return NULL; Element* basalelement = element->SpawnBasalElement(); /*Intermediaries */ @@ -218,7 +218,7 @@ }/*}}}*/ ElementVector* ExtrapolationAnalysis::CreatePVector(Element* element){/*{{{*/ - if(!element->IsOnBed()) return NULL; + if(!element->IsOnBase()) return NULL; Element* basalelement = element->SpawnBasalElement(); /*Intermediaries */ Index: ../trunk-jpl/src/c/classes/Loads/Pengrid.cpp =================================================================== --- ../trunk-jpl/src/c/classes/Loads/Pengrid.cpp (revision 17584) +++ ../trunk-jpl/src/c/classes/Loads/Pengrid.cpp (revision 17585) @@ -613,7 +613,7 @@ *punstable=unstable; return; } - if(!element->IsOnBed()){ + if(!element->IsOnBase()){ unstable=0; active=0; *punstable=unstable; Index: ../trunk-jpl/src/c/classes/Elements/Element.h =================================================================== --- ../trunk-jpl/src/c/classes/Elements/Element.h (revision 17584) +++ ../trunk-jpl/src/c/classes/Elements/Element.h (revision 17585) @@ -88,7 +88,7 @@ void GetVerticesCoordinates(IssmDouble** xyz_list); void GetVerticesSidList(int* sidlist); void GetVerticesConnectivityList(int* connectivitylist); - bool HasNodeOnBed(); + bool HasNodeOnBase(); bool HasNodeOnSurface(); int Id(); int Sid(); @@ -182,7 +182,7 @@ virtual int GetNumberOfVertices(void)=0; virtual bool IsNodeOnShelfFromFlags(IssmDouble* flags)=0; - virtual bool IsOnBed()=0; + virtual bool IsOnBase()=0; virtual bool IsOnSurface()=0; virtual void GetGroundedPart(int* point1,IssmDouble* fraction1,IssmDouble* fraction2, bool* mainlyfloating)=0; virtual IssmDouble GetGroundedPortion(IssmDouble* xyz_list)=0; Index: ../trunk-jpl/src/c/classes/Elements/Tria.cpp =================================================================== --- ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 17584) +++ ../trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 17585) @@ -111,7 +111,7 @@ IssmDouble values2[NUMVERTICES]={0.}; int numindices; int *indices = NULL; - int index = this->EdgeOnBedIndex(); + int index = this->EdgeOnBaseIndex(); NodeOnEdgeIndices(&numindices,&indices,index,this->FiniteElement()); for(int i=0;iEdgeOnBedIndices(&index1,&index2); + this->EdgeOnBaseIndices(&index1,&index2); if(gl[index1]>0 && gl[index2]>0) phi=1; // All grounded else if(gl[index1]<0 && gl[index2]<0) phi=0; // All floating else if(gl[index1]<0 && gl[index2]>0){ //index2 grounded @@ -584,7 +584,7 @@ /*Allocate Output*/ IssmDouble* xyz_list_edge = xNew(2*3); - this->EdgeOnBedIndices(&indices[0],&indices[1]); + this->EdgeOnBaseIndices(&indices[0],&indices[1]); for(int i=0;i<2;i++) for(int j=0;j<2;j++) xyz_list_edge[i*3+j]=xyz_list[indices[i]][j]; /*Assign output pointer*/ @@ -1131,14 +1131,14 @@ } /*}}}*/ -/*FUNCTION Tria::IsOnBed {{{*/ -bool Tria::IsOnBed(){ +/*FUNCTION Tria::IsOnBase {{{*/ +bool Tria::IsOnBase(){ int meshtype; this->parameters->FindParam(&meshtype,MeshTypeEnum); switch(meshtype){ case Mesh2DverticalEnum: - return HasEdgeOnBed(); + return HasEdgeOnBase(); case Mesh2DhorizontalEnum: return true; default: _error_("mesh "<* vertexgrounded,Vector* vertexfloating){ - if(!IsOnBed()) return; + if(!IsOnBase()) return; /*Intermediaries*/ IssmDouble* xyz_list = NULL; @@ -1397,7 +1397,7 @@ Gauss* Tria::NewGaussBase(int order){ int indices[2]; - this->EdgeOnBedIndices(&indices[0],&indices[1]); + this->EdgeOnBaseIndices(&indices[0],&indices[1]); return new GaussTria(indices[0],indices[1],order); } /*}}}*/ @@ -1643,7 +1643,7 @@ /*For FS only: we want the CS to be tangential to the bedrock*/ inputs->GetInputValue(&approximation,ApproximationEnum); - if(!HasNodeOnBed() || approximation!=FSApproximationEnum) return; + if(!HasNodeOnBase() || approximation!=FSApproximationEnum) return; //printf("element number %i \n",this->id); /*Get inputs*/ @@ -1773,8 +1773,8 @@ case Mesh2DhorizontalEnum: return this; case Mesh2DverticalEnum: - _assert_(HasEdgeOnBed()); - this->EdgeOnBedIndices(&index1,&index2); + _assert_(HasEdgeOnBase()); + this->EdgeOnBaseIndices(&index1,&index2); return SpawnSeg(index1,index2); default: _error_("not implemented yet"); @@ -1986,7 +1986,7 @@ /*FUNCTION Tria::UpdateConstraintsExtrudeFromBase{{{*/ void Tria::UpdateConstraintsExtrudeFromBase(void){ - if(!HasEdgeOnBed()) return; + if(!HasEdgeOnBase()) return; int extrusioninput; IssmDouble value,isonbed; Index: ../trunk-jpl/src/c/classes/Elements/Tria.h =================================================================== --- ../trunk-jpl/src/c/classes/Elements/Tria.h (revision 17584) +++ ../trunk-jpl/src/c/classes/Elements/Tria.h (revision 17585) @@ -69,13 +69,13 @@ int GetNodeIndex(Node* node); int GetNumberOfNodes(void); int GetNumberOfVertices(void); - bool IsOnBed(); + bool IsOnBase(); bool IsOnSurface(); - bool HasEdgeOnBed(); + bool HasEdgeOnBase(); bool HasEdgeOnSurface(); void EdgeOnSurfaceIndices(int* pindex1,int* pindex); - void EdgeOnBedIndices(int* pindex1,int* pindex); - int EdgeOnBedIndex(); + void EdgeOnBaseIndices(int* pindex1,int* pindex); + int EdgeOnBaseIndex(); int EdgeOnSurfaceIndex(); bool IsNodeOnShelfFromFlags(IssmDouble* flags); int NumberofNodesVelocity(void); Index: ../trunk-jpl/src/c/classes/Elements/Penta.cpp =================================================================== --- ../trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 17584) +++ ../trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 17585) @@ -118,7 +118,7 @@ void Penta::AddBasalInput(int input_enum,IssmDouble* values, int interpolation_enum){ _assert_(this->inputs); - if(!IsOnBed()) return; + if(!IsOnBase()) return; else{ if(interpolation_enum==P1Enum){ int i; @@ -151,7 +151,7 @@ GaussPenta *gauss = NULL; /* Basal friction can only be found at the base of an ice sheet: */ - if (!IsOnBed() || IsFloating()){ + if (!IsOnBase() || IsFloating()){ //empty friction: this->inputs->AddInput(new PentaInput(BasalFrictionEnum,&basalfriction[0],P1Enum)); return; @@ -218,7 +218,7 @@ /*retrieve some parameters: */ this->parameters->FindParam(&FSreconditioning,StressbalanceFSreconditioningEnum); - if(!IsOnBed()){ + if(!IsOnBase()){ //put zero sigma_b->SetValue(id-1,0.0,INS_VAL); return; @@ -373,7 +373,7 @@ /*FUNCTION Penta::Delta18oParameterization{{{*/ void Penta::Delta18oParameterization(void){ /*Are we on the base? If not, return*/ - if(!IsOnBed()) return; + if(!IsOnBase()) return; int i; IssmDouble monthlytemperatures[NUMVERTICES][12],monthlyprec[NUMVERTICES][12]; @@ -543,7 +543,7 @@ penta=this; for(;;){ /*Stop if we have reached the surface, else, take lower penta*/ - if (penta->IsOnBed()) break; + if (penta->IsOnBase()) break; /* get lower Penta*/ penta=penta->GetLowerPenta(); @@ -1124,7 +1124,7 @@ /*recover parameters: */ /*Are we on the base? If not, return*/ - if(!IsOnBed()) return; + if(!IsOnBase()) return; /*OK, we are on bed. Initialize global inputs as 0*/ total_thickness_input =new PentaInput(ThicknessEnum,zeros_list,P1Enum); @@ -1224,7 +1224,7 @@ Input **base_inputs = NULL; /*Are we on the base, not on the surface?:*/ - if(!IsOnBed()) return; + if(!IsOnBase()) return; /*Step1: Get and Extrude original input: */ num_inputs=1; @@ -1414,7 +1414,7 @@ Penta *penta = NULL; /*If not on bed, return*/ - if (!IsOnBed()) return; + if (!IsOnBase()) return; /*Get dof list: */ GetDofList(&doflist,NoneApproximationEnum,GsetEnum); @@ -1503,8 +1503,8 @@ } } /*}}}*/ -/*FUNCTION Penta::IsOnBed{{{*/ -bool Penta::IsOnBed(void){ +/*FUNCTION Penta::IsOnBase{{{*/ +bool Penta::IsOnBase(void){ bool onbed; inputs->GetInputValue(&onbed,MeshElementonbedEnum); @@ -1912,7 +1912,7 @@ /*For FS only: we want the CS to be tangential to the bedrock*/ inputs->GetInputValue(&approximation,ApproximationEnum); - if(!IsOnBed() || (approximation!=FSApproximationEnum && approximation!=SSAFSApproximationEnum && approximation!=HOFSApproximationEnum)) return; + if(!IsOnBase() || (approximation!=FSApproximationEnum && approximation!=SSAFSApproximationEnum && approximation!=HOFSApproximationEnum)) return; /*Get number of nodes for velocity only and base*/ BasalNodeIndices(&numindices,&indices,this->VelocityInterpolation()); @@ -2021,7 +2021,7 @@ /*FUNCTION Penta::SpawnBasalElement{{{*/ Element* Penta::SpawnBasalElement(void){ - _assert_(this->IsOnBed()); + _assert_(this->IsOnBase()); this->InputDepthAverageAtBase(MaterialsRheologyBEnum,MaterialsRheologyBbarEnum); this->InputDepthAverageAtBase(DamageDEnum,DamageDbarEnum); @@ -2108,7 +2108,7 @@ /*Bail out if this element if: * -> Non SSA not on the surface * -> SSA (2d model) and not on bed) */ - if ((approximation!=SSAApproximationEnum && !IsOnSurface()) || (approximation==SSAApproximationEnum && !IsOnBed())){ + if ((approximation!=SSAApproximationEnum && !IsOnSurface()) || (approximation==SSAApproximationEnum && !IsOnBase())){ return 0; } else if (approximation==SSAApproximationEnum){ @@ -2489,7 +2489,7 @@ /*FUNCTION Penta::UpdateConstraintsExtrudeFromBase{{{*/ void Penta::UpdateConstraintsExtrudeFromBase(void){ - if(!IsOnBed()) return; + if(!IsOnBase()) return; int extrusioninput; IssmDouble value,isonbed; @@ -2664,7 +2664,7 @@ IssmDouble base,bed,surface,bathymetry; IssmDouble xyz_list[NUMVERTICES][3]; - if(!IsIceInElement() || IsFloating() || !IsOnBed())return 0; + if(!IsIceInElement() || IsFloating() || !IsOnBase())return 0; rho_ice=matpar->GetRhoIce(); rho_water=matpar->GetRhoWater(); @@ -2732,7 +2732,7 @@ IssmDouble mass_flux=0; - if(!IsOnBed()) return mass_flux; + if(!IsOnBase()) return mass_flux; /*Depth Averaging Vx and Vy*/ this->InputDepthAverageAtBase(VxEnum,VxAverageEnum); @@ -2756,7 +2756,7 @@ IssmDouble mass_flux=0; - if(!IsOnBed()) return mass_flux; + if(!IsOnBase()) return mass_flux; /*Depth Averaging Vx and Vy*/ this->InputDepthAverageAtBase(VxEnum,VxAverageEnum); @@ -2922,11 +2922,11 @@ Input* input=NULL; if(enum_type==MaterialsRheologyBbarEnum){ - if(!IsOnBed()) return; + if(!IsOnBase()) return; input=(Input*)inputs->GetInput(MaterialsRheologyBEnum); } else if(enum_type==DamageDbarEnum){ - if(!IsOnBed()) return; + if(!IsOnBase()) return; input=(Input*)inputs->GetInput(DamageDEnum); } else{ @@ -3114,14 +3114,14 @@ /*Nothing, J does not depends on the parameter being inverted for*/ break; case DragCoefficientAbsGradientEnum: - if(IsOnBed()){ + if(IsOnBase()){ tria=(Tria*)SpawnTria(0,1,2); tria->GradjDragGradient(gradient,control_index); delete tria->material; delete tria; } break; case RheologyBbarAbsGradientEnum: - if(IsOnBed()){ + if(IsOnBase()){ tria=(Tria*)SpawnTria(0,1,2); tria->GradjBGradient(gradient,control_index); delete tria->material; delete tria; @@ -3137,7 +3137,7 @@ void Penta::GradjDragSSA(Vector* gradient,int control_index){ /*Gradient is 0 if on shelf or not on bed*/ - if(IsFloating() || !IsOnBed()) return; + if(IsFloating() || !IsOnBase()) return; /*Spawn tria*/ Tria* tria=(Tria*)SpawnTria(0,1,2); @@ -3163,7 +3163,7 @@ GaussPenta *gauss=NULL; /*Gradient is 0 if on shelf or not on bed*/ - if(IsFloating() || !IsOnBed()) return; + if(IsFloating() || !IsOnBase()) return; /*Retrieve all inputs and parameters*/ parameters->FindParam(&analysis_type,AnalysisTypeEnum); @@ -3236,7 +3236,7 @@ GaussPenta* gauss=NULL; /*Gradient is 0 if on shelf or not on bed*/ - if(IsFloating() || !IsOnBed()) return; + if(IsFloating() || !IsOnBase()) return; /*Retrieve all inputs and parameters*/ parameters->FindParam(&analysis_type,AnalysisTypeEnum); @@ -3312,7 +3312,7 @@ void Penta::GradjBbarSSA(Vector* gradient,int control_index){ /*This element should be collapsed into a tria element at its base*/ - if (!IsOnBed()) return; + if (!IsOnBase()) return; /*Depth Average B*/ this->InputDepthAverageAtBase(MaterialsRheologyBEnum,MaterialsRheologyBbarEnum); @@ -3332,7 +3332,7 @@ void Penta::GradjBbarHO(Vector* gradient,int control_index){ /*Gradient is computed on bed only (Bbar)*/ - if (!IsOnBed()) return; + if (!IsOnBase()) return; /*Depth Average B and D*/ this->InputDepthAverageAtBase(MaterialsRheologyBEnum,MaterialsRheologyBbarEnum); @@ -3351,7 +3351,7 @@ void Penta::GradjBbarFS(Vector* gradient,int control_index){ /*Gradient is computed on bed only (Bbar)*/ - if (!IsOnBed()) return; + if (!IsOnBase()) return; /*Depth Average B and D*/ this->InputDepthAverageAtBase(MaterialsRheologyBEnum,MaterialsRheologyBbarEnum); @@ -3381,11 +3381,11 @@ for(int i=0;iinputs->GetInput(MaterialsRheologyBEnum); _assert_(input); } else if(control_type[i]==DamageDbarEnum){ - if (!IsOnBed()) goto cleanup_and_return; + if (!IsOnBase()) goto cleanup_and_return; input=(Input*)this->inputs->GetInput(DamageDEnum); _assert_(input); } else{ @@ -3426,7 +3426,7 @@ /*Bail out if this element if: * -> Non SSA and not on the surface * -> SSA (2d model) and not on bed) */ - if ((approximation!=SSAApproximationEnum && !IsOnSurface()) || (approximation==SSAApproximationEnum && !IsOnBed())){ + if ((approximation!=SSAApproximationEnum && !IsOnSurface()) || (approximation==SSAApproximationEnum && !IsOnBase())){ return 0; } else if (approximation==SSAApproximationEnum){ @@ -3463,7 +3463,7 @@ /*Bail out if this element if: * -> Non SSA and not on the surface * -> SSA (2d model) and not on bed) */ - if ((approximation!=SSAApproximationEnum && !IsOnSurface()) || (approximation==SSAApproximationEnum && !IsOnBed())){ + if ((approximation!=SSAApproximationEnum && !IsOnSurface()) || (approximation==SSAApproximationEnum && !IsOnBase())){ return 0; } else if (approximation==SSAApproximationEnum){ @@ -3500,7 +3500,7 @@ /*Bail out if this element if: * -> Non SSA and not on the surface * -> SSA (2d model) and not on bed) */ - if ((approximation!=SSAApproximationEnum && !IsOnSurface()) || (approximation==SSAApproximationEnum && !IsOnBed())){ + if ((approximation!=SSAApproximationEnum && !IsOnSurface()) || (approximation==SSAApproximationEnum && !IsOnBase())){ return 0; } else if (approximation==SSAApproximationEnum){ @@ -3539,7 +3539,7 @@ /*Bail out if this element if: * -> Non SSA and not on the surface * -> SSA (2d model) and not on bed) */ - if ((approximation!=SSAApproximationEnum && !IsOnSurface()) || (approximation==SSAApproximationEnum && !IsOnBed())){ + if ((approximation!=SSAApproximationEnum && !IsOnSurface()) || (approximation==SSAApproximationEnum && !IsOnBase())){ return 0; } else if (approximation==SSAApproximationEnum){ @@ -3576,7 +3576,7 @@ /*Bail out if this element if: * -> Non SSA and not on the surface * -> SSA (2d model) and not on bed) */ - if ((approximation!=SSAApproximationEnum && !IsOnSurface()) || (approximation==SSAApproximationEnum && !IsOnBed())){ + if ((approximation!=SSAApproximationEnum && !IsOnSurface()) || (approximation==SSAApproximationEnum && !IsOnBase())){ return 0; } else if (approximation==SSAApproximationEnum){ @@ -3630,7 +3630,7 @@ Tria* tria=NULL; /*If on water, on shelf or not on bed, skip: */ - if(!IsIceInElement()|| IsFloating() || !IsOnBed()) return 0; + if(!IsIceInElement()|| IsFloating() || !IsOnBase()) return 0; tria=(Tria*)SpawnTria(0,1,2); //lower face is 0, upper face is 1 J=tria->DragCoefficientAbsGradient(); @@ -3645,7 +3645,7 @@ Tria* tria=NULL; /*If on water, on shelf or not on bed, skip: */ - if(!IsIceInElement() || !IsOnBed()) return 0; + if(!IsIceInElement() || !IsOnBase()) return 0; tria=(Tria*)SpawnTria(0,1,2); J=tria->RheologyBbarAbsGradient(); @@ -3890,7 +3890,7 @@ IssmDouble h[NUMVERTICES],s[NUMVERTICES],b[NUMVERTICES],r[NUMVERTICES]; IssmDouble melting[NUMVERTICES],phi[NUMVERTICES]; - if(!IsOnBed()) return; + if(!IsOnBase()) return; /*Recover info at the vertices: */ parameters->FindParam(&migration_style,GroundinglineMigrationEnum); Index: ../trunk-jpl/src/c/classes/Elements/Penta.h =================================================================== --- ../trunk-jpl/src/c/classes/Elements/Penta.h (revision 17584) +++ ../trunk-jpl/src/c/classes/Elements/Penta.h (revision 17585) @@ -186,7 +186,7 @@ void InputUpdateFromSolutionOneDof(IssmDouble* solutiong,int enum_type); void InputUpdateFromSolutionOneDofCollapsed(IssmDouble* solutiong,int enum_type); bool IsOnSurface(void); - bool IsOnBed(void); + bool IsOnBase(void); bool IsNodeOnShelfFromFlags(IssmDouble* flags); void JacobianDeterminant(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss); void JacobianDeterminantLine(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss); Index: ../trunk-jpl/src/c/classes/Elements/Tetra.cpp =================================================================== --- ../trunk-jpl/src/c/classes/Elements/Tetra.cpp (revision 17584) +++ ../trunk-jpl/src/c/classes/Elements/Tetra.cpp (revision 17585) @@ -102,8 +102,8 @@ this->inputs->Configure(parameters); } /*}}}*/ -/*FUNCTION Tetra::FaceOnBedIndices{{{*/ -void Tetra::FaceOnBedIndices(int* pindex1,int* pindex2,int* pindex3){ +/*FUNCTION Tetra::FaceOnBaseIndices{{{*/ +void Tetra::FaceOnBaseIndices(int* pindex1,int* pindex2,int* pindex3){ IssmDouble values[NUMVERTICES]; int indices[4][3] = {{0,1,2},{0,1,3},{1,2,3},{2,0,3}}; @@ -186,7 +186,7 @@ /*Allocate Output*/ IssmDouble* xyz_list_edge = xNew(3*3); - this->FaceOnBedIndices(&indices[0],&indices[1],&indices[2]); + this->FaceOnBaseIndices(&indices[0],&indices[1],&indices[2]); for(int i=0;i<3;i++) for(int j=0;j<3;j++) xyz_list_edge[i*3+j]=xyz_list[indices[i]][j]; /*Assign output pointer*/ @@ -226,8 +226,8 @@ return z; } /*}}}*/ -/*FUNCTION Tetra::HasFaceOnBed{{{*/ -bool Tetra::HasFaceOnBed(){ +/*FUNCTION Tetra::HasFaceOnBase{{{*/ +bool Tetra::HasFaceOnBase(){ IssmDouble values[NUMVERTICES]; IssmDouble sum; @@ -397,9 +397,9 @@ xDelete(doflist); } /*}}}*/ -/*FUNCTION Tetra::IsOnBed {{{*/ -bool Tetra::IsOnBed(){ - return HasFaceOnBed(); +/*FUNCTION Tetra::IsOnBase {{{*/ +bool Tetra::IsOnBase(){ + return HasFaceOnBase(); } /*}}}*/ /*FUNCTION Tetra::IsOnSurface {{{*/ @@ -475,7 +475,7 @@ Gauss* Tetra::NewGaussBase(int order){ int indices[3]; - this->FaceOnBedIndices(&indices[0],&indices[1],&indices[2]); + this->FaceOnBaseIndices(&indices[0],&indices[1],&indices[2]); return new GaussTetra(indices[0],indices[1],indices[2],order); } /*}}}*/ @@ -659,7 +659,7 @@ /*For FS only: we want the CS to be tangential to the bedrock*/ inputs->GetInputValue(&approximation,ApproximationEnum); - if(IsFloating() || !HasNodeOnBed() || approximation!=FSApproximationEnum) return; + if(IsFloating() || !HasNodeOnBase() || approximation!=FSApproximationEnum) return; //printf("element number %i \n",this->id); /*Get inputs*/ @@ -726,10 +726,10 @@ /*FUNCTION Tetra::SpawnBasalElement{{{*/ Element* Tetra::SpawnBasalElement(void){ - _assert_(HasFaceOnBed()); + _assert_(HasFaceOnBase()); int index1,index2,index3; - this->FaceOnBedIndices(&index1,&index2,&index3); + this->FaceOnBaseIndices(&index1,&index2,&index3); return SpawnTria(index1,index2,index3); }/*}}}*/ /*FUNCTION Tetra::SpawnTopElement{{{*/ Index: ../trunk-jpl/src/c/classes/Elements/Seg.h =================================================================== --- ../trunk-jpl/src/c/classes/Elements/Seg.h (revision 17584) +++ ../trunk-jpl/src/c/classes/Elements/Seg.h (revision 17585) @@ -71,7 +71,7 @@ void GetVerticesCoordinates(IssmDouble** pxyz_list); void GetVerticesCoordinatesBase(IssmDouble** pxyz_list){_error_("not implemented yet");}; void GetVerticesCoordinatesTop(IssmDouble** pxyz_list){_error_("not implemented yet");}; - bool IsOnBed(){_error_("not implemented yet");}; + bool IsOnBase(){_error_("not implemented yet");}; bool IsOnSurface(){_error_("not implemented yet");}; bool IsNodeOnShelfFromFlags(IssmDouble* flags){_error_("not implemented yet");}; void JacobianDeterminant(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss); Index: ../trunk-jpl/src/c/classes/Elements/Tetra.h =================================================================== --- ../trunk-jpl/src/c/classes/Elements/Tetra.h (revision 17584) +++ ../trunk-jpl/src/c/classes/Elements/Tetra.h (revision 17585) @@ -60,7 +60,7 @@ void Delta18oParameterization(void){_error_("not implemented yet");}; void ElementSizes(IssmDouble* hx,IssmDouble* hy,IssmDouble* hz){_error_("not implemented yet");}; void FaceOnFrontIndices(int* pindex1,int* pindex2,int* pindex3); - void FaceOnBedIndices(int* pindex1,int* pindex2,int* pindex3); + void FaceOnBaseIndices(int* pindex1,int* pindex2,int* pindex3); void FaceOnSurfaceIndices(int* pindex1,int* pindex2,int* pindex3); void FSContactMigration(Vector* vertexgrounded,Vector* vertexfloating){_error_("not implemented yet");}; int FiniteElement(void); @@ -73,9 +73,9 @@ int GetNumberOfVertices(void); void GetVerticesCoordinatesBase(IssmDouble** pxyz_list); void GetVerticesCoordinatesTop(IssmDouble** pxyz_list); - bool HasFaceOnBed(); + bool HasFaceOnBase(); bool HasFaceOnSurface(); - bool IsOnBed(); + bool IsOnBase(); bool IsOnSurface(); bool IsNodeOnShelfFromFlags(IssmDouble* flags){_error_("not implemented yet");}; void JacobianDeterminant(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss); Index: ../trunk-jpl/src/c/classes/Elements/Element.cpp =================================================================== --- ../trunk-jpl/src/c/classes/Elements/Element.cpp (revision 17584) +++ ../trunk-jpl/src/c/classes/Elements/Element.cpp (revision 17585) @@ -548,7 +548,7 @@ for(int i=0;ivertices[i]->Connectivity(); } /*}}}*/ -bool Element::HasNodeOnBed(){/*{{{*/ +bool Element::HasNodeOnBase(){/*{{{*/ return (this->inputs->Max(MeshVertexonbedEnum)>0.); }/*}}}*/ bool Element::HasNodeOnSurface(){/*{{{*/