Index: /issm/trunk-jpl/src/c/analyses/transient_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/transient_core.cpp (revision 15940) +++ /issm/trunk-jpl/src/c/analyses/transient_core.cpp (revision 15941) @@ -166,5 +166,5 @@ } if(isgroundingline && (groundingline_migration==SubelementMigrationEnum || groundingline_migration==SubelementMigration2Enum)){ - InputToResultx(femmodel,GLlevelsetEnum); + InputToResultx(femmodel,MaskGroundediceLevelsetEnum); } if(VerboseSolution()) _printf0_(" saving temporary results\n"); Index: /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 15940) +++ /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 15941) @@ -1094,5 +1094,5 @@ /*Recover parameters and values*/ - GetInputListOnVertices(&gl[0],GLlevelsetEnum); + GetInputListOnVertices(&gl[0],MaskGroundediceLevelsetEnum); /*Be sure that values are not zero*/ @@ -2717,6 +2717,6 @@ name==WaterfractionEnum|| name==FrictionCoefficientEnum || - name==GLlevelsetEnum || - name==MaskIcelevelsetEnum || + name==MaskGroundediceLevelsetEnum || + name==MaskIceLevelsetEnum || name==GradientEnum || name==OldGradientEnum || @@ -2800,5 +2800,5 @@ /*Get levelset*/ IssmDouble ls[NUMVERTICES]; - GetInputListOnVertices(&ls[0],MaskIcelevelsetEnum); + GetInputListOnVertices(&ls[0],MaskIceLevelsetEnum); /*If the level set is >0, ice is present in this element*/ @@ -9126,5 +9126,5 @@ /*Retrieve all inputs and parameters*/ - GetInputListOnVertices(&ls[0],MaskIcelevelsetEnum); + GetInputListOnVertices(&ls[0],MaskIceLevelsetEnum); /*If the level set is awlays <=0, there is no ice front here*/ @@ -9161,5 +9161,5 @@ rho_ice =matpar->GetRhoIce(); gravity =matpar->GetG(); - GetZeroLevelsetCoordinates(&xyz_list_front[0][0],xyz_list,MaskIcelevelsetEnum); + GetZeroLevelsetCoordinates(&xyz_list_front[0][0],xyz_list,MaskIceLevelsetEnum); GetAreaCoordinates(&area_coordinates[0][0],xyz_list_front,xyz_list,4); GetQuadNormal(&normal[0],xyz_list_front); @@ -9231,5 +9231,5 @@ /*Retrieve all inputs and parameters*/ - GetInputListOnVertices(&ls[0],MaskIcelevelsetEnum); + GetInputListOnVertices(&ls[0],MaskIceLevelsetEnum); /*If the level set is awlays <=0, there is no ice front here*/ @@ -9271,5 +9271,5 @@ rho_ice =matpar->GetRhoIce(); gravity =matpar->GetG(); - GetZeroLevelsetCoordinates(&xyz_list_front[0][0],xyz_list,MaskIcelevelsetEnum); + GetZeroLevelsetCoordinates(&xyz_list_front[0][0],xyz_list,MaskIceLevelsetEnum); GetAreaCoordinates(&area_coordinates[0][0],xyz_list_front,xyz_list,4); GetQuadNormal(&normal[0],xyz_list_front); @@ -11221,5 +11221,5 @@ GetInputListOnVertices(&b[0],BedEnum); GetInputListOnVertices(&r[0],BathymetryEnum); - GetInputListOnVertices(&phi[0],GLlevelsetEnum); + GetInputListOnVertices(&phi[0],MaskGroundediceLevelsetEnum); rho_water = matpar->GetRhoWater(); rho_ice = matpar->GetRhoIce(); @@ -11300,6 +11300,6 @@ /*Recalculate phi*/ for(i=0;iinputs->AddInput(new PentaInput(GLlevelsetEnum,&phi[0],P1Enum)); - this->InputExtrude(GLlevelsetEnum,ElementEnum); + this->inputs->AddInput(new PentaInput(MaskGroundediceLevelsetEnum,&phi[0],P1Enum)); + this->InputExtrude(MaskGroundediceLevelsetEnum,ElementEnum); /*Extrude inputs*/ Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 15940) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 15941) @@ -822,5 +822,5 @@ /*Recover parameters and values*/ - GetInputListOnVertices(&gl[0],GLlevelsetEnum); + GetInputListOnVertices(&gl[0],MaskGroundediceLevelsetEnum); /*Be sure that values are not zero*/ @@ -876,5 +876,5 @@ /*Recover parameters and values*/ - GetInputListOnVertices(&gl[0],GLlevelsetEnum); + GetInputListOnVertices(&gl[0],MaskGroundediceLevelsetEnum); /*Be sure that values are not zero*/ @@ -1903,6 +1903,6 @@ name==BathymetryEnum || name==BedEnum || - name==GLlevelsetEnum || - name==MaskIcelevelsetEnum || + name==MaskGroundediceLevelsetEnum || + name==MaskIceLevelsetEnum || name==SurfaceSlopeXEnum || name==SurfaceSlopeYEnum || @@ -1994,5 +1994,5 @@ /*Get levelset*/ IssmDouble ls[NUMVERTICES]; - GetInputListOnVertices(&ls[0],MaskIcelevelsetEnum); + GetInputListOnVertices(&ls[0],MaskIceLevelsetEnum); /*If the level set is >0, ice is present in this element*/ @@ -3072,5 +3072,5 @@ if(migration_style==SubelementMigrationEnum) phi=this->GetGroundedPortion(&xyz_list[0][0]); if(migration_style==SubelementMigration2Enum){ - gllevelset_input=inputs->GetInput(GLlevelsetEnum); _assert_(gllevelset_input); + gllevelset_input=inputs->GetInput(MaskGroundediceLevelsetEnum); _assert_(gllevelset_input); this->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating); gauss=new GaussTria(point1,fraction1,fraction2,mainlyfloating,2); @@ -3216,5 +3216,5 @@ /*Retrieve all inputs and parameters*/ - GetInputListOnVertices(&ls[0],MaskIcelevelsetEnum); + GetInputListOnVertices(&ls[0],MaskIceLevelsetEnum); /*If the level set is awlays <0, there is no ice front here*/ @@ -3251,5 +3251,5 @@ rho_ice = matpar->GetRhoIce(); gravity = matpar->GetG(); - GetZeroLevelsetCoordinates(&xyz_list_front[0][0],xyz_list,MaskIcelevelsetEnum); + GetZeroLevelsetCoordinates(&xyz_list_front[0][0],xyz_list,MaskIceLevelsetEnum); GetAreaCoordinates(&area_coordinates[0][0],xyz_list_front,xyz_list,2); GetSegmentNormal(&normal[0],xyz_list_front); @@ -7331,5 +7331,5 @@ GetInputListOnVertices(&b[0],BedEnum); GetInputListOnVertices(&r[0],BathymetryEnum); - if(migration_style==SubelementMigrationEnum || migration_style==SubelementMigration2Enum) GetInputListOnVertices(&phi[0],GLlevelsetEnum); + if(migration_style==SubelementMigrationEnum || migration_style==SubelementMigration2Enum) GetInputListOnVertices(&phi[0],MaskGroundediceLevelsetEnum); rho_water = matpar->GetRhoWater(); rho_ice = matpar->GetRhoIce(); @@ -7411,5 +7411,5 @@ /*Recalculate phi*/ for(i=0;iinputs->AddInput(new TriaInput(GLlevelsetEnum,&phi[0],P1Enum)); + this->inputs->AddInput(new TriaInput(MaskGroundediceLevelsetEnum,&phi[0],P1Enum)); } /*}}}*/ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/UpdateElementsBalancethickness.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/UpdateElementsBalancethickness.cpp (revision 15940) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/UpdateElementsBalancethickness.cpp (revision 15941) @@ -35,5 +35,5 @@ iomodel->FetchDataToInput(elements,SurfaceEnum); iomodel->FetchDataToInput(elements,BedEnum); - iomodel->FetchDataToInput(elements,MaskIcelevelsetEnum); + iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum); iomodel->FetchDataToInput(elements,VxEnum); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/UpdateElementsBedSlope.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/UpdateElementsBedSlope.cpp (revision 15940) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/UpdateElementsBedSlope.cpp (revision 15941) @@ -23,5 +23,5 @@ iomodel->FetchDataToInput(elements,SurfaceEnum); iomodel->FetchDataToInput(elements,BedEnum); - iomodel->FetchDataToInput(elements,MaskIcelevelsetEnum); + iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); if(iomodel->dim==3){ iomodel->FetchDataToInput(elements,MeshElementonbedEnum); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp (revision 15940) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp (revision 15941) @@ -82,5 +82,5 @@ /*Fetch data:*/ - iomodel->FetchData(6,MeshXEnum,MeshYEnum,MeshZEnum,BedEnum,ThicknessEnum,MaskIcelevelsetEnum); + iomodel->FetchData(6,MeshXEnum,MeshYEnum,MeshZEnum,BedEnum,ThicknessEnum,MaskIceLevelsetEnum); CreateNumberNodeToElementConnectivity(iomodel); @@ -96,5 +96,5 @@ /*Free data: */ - iomodel->DeleteData(6,MeshXEnum,MeshYEnum,MeshZEnum,BedEnum,ThicknessEnum,MaskIcelevelsetEnum); + iomodel->DeleteData(6,MeshXEnum,MeshYEnum,MeshZEnum,BedEnum,ThicknessEnum,MaskIceLevelsetEnum); /*Assign output pointer: */ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/UpdateElementsEnthalpy.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/UpdateElementsEnthalpy.cpp (revision 15940) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/UpdateElementsEnthalpy.cpp (revision 15941) @@ -33,5 +33,5 @@ iomodel->FetchDataToInput(elements,FrictionPEnum); iomodel->FetchDataToInput(elements,FrictionQEnum); - iomodel->FetchDataToInput(elements,MaskIcelevelsetEnum); + iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum); iomodel->FetchDataToInput(elements,MeshElementonbedEnum); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/FreeSurfaceBase/UpdateElementsFreeSurfaceBase.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/FreeSurfaceBase/UpdateElementsFreeSurfaceBase.cpp (revision 15940) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/FreeSurfaceBase/UpdateElementsFreeSurfaceBase.cpp (revision 15941) @@ -31,5 +31,5 @@ iomodel->FetchDataToInput(elements,SurfaceEnum); - iomodel->FetchDataToInput(elements,MaskIcelevelsetEnum); + iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum); iomodel->FetchDataToInput(elements,SurfaceforcingsMassBalanceEnum); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/FreeSurfaceTop/UpdateElementsFreeSurfaceTop.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/FreeSurfaceTop/UpdateElementsFreeSurfaceTop.cpp (revision 15940) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/FreeSurfaceTop/UpdateElementsFreeSurfaceTop.cpp (revision 15941) @@ -30,5 +30,5 @@ iomodel->FetchDataToInput(elements,SurfaceEnum); - iomodel->FetchDataToInput(elements,MaskIcelevelsetEnum); + iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum); iomodel->FetchDataToInput(elements,SurfaceforcingsMassBalanceEnum); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/UpdateElementsHydrologyDCEfficient.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/UpdateElementsHydrologyDCEfficient.cpp (revision 15940) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/UpdateElementsHydrologyDCEfficient.cpp (revision 15941) @@ -35,5 +35,5 @@ iomodel->FetchDataToInput(elements,SurfaceEnum); iomodel->FetchDataToInput(elements,BedEnum); - iomodel->FetchDataToInput(elements,MaskIcelevelsetEnum); + iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum); iomodel->FetchDataToInput(elements,MeshElementonbedEnum); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/UpdateElementsHydrologyDCInefficient.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/UpdateElementsHydrologyDCInefficient.cpp (revision 15940) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/UpdateElementsHydrologyDCInefficient.cpp (revision 15941) @@ -36,5 +36,5 @@ iomodel->FetchDataToInput(elements,SurfaceEnum); iomodel->FetchDataToInput(elements,BedEnum); - iomodel->FetchDataToInput(elements,MaskIcelevelsetEnum); + iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum); iomodel->FetchDataToInput(elements,MeshElementonbedEnum); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/UpdateElementsHydrologyShreve.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/UpdateElementsHydrologyShreve.cpp (revision 15940) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/UpdateElementsHydrologyShreve.cpp (revision 15941) @@ -34,5 +34,5 @@ iomodel->FetchDataToInput(elements,MeshElementonbedEnum); iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); - iomodel->FetchDataToInput(elements,MaskIcelevelsetEnum); + iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum); iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Masstransport/UpdateElementsMasstransport.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Masstransport/UpdateElementsMasstransport.cpp (revision 15940) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Masstransport/UpdateElementsMasstransport.cpp (revision 15941) @@ -44,5 +44,5 @@ iomodel->FetchDataToInput(elements,BedEnum); iomodel->FetchDataToInput(elements,BathymetryEnum); - iomodel->FetchDataToInput(elements,MaskIcelevelsetEnum); + iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum); iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/UpdateElementsMelting.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/UpdateElementsMelting.cpp (revision 15940) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/UpdateElementsMelting.cpp (revision 15941) @@ -31,5 +31,5 @@ iomodel->FetchDataToInput(elements,FrictionPEnum); iomodel->FetchDataToInput(elements,FrictionQEnum); - iomodel->FetchDataToInput(elements,MaskIcelevelsetEnum); + iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum); iomodel->FetchDataToInput(elements,MeshElementonbedEnum); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Stressbalance/UpdateElementsStressbalance.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Stressbalance/UpdateElementsStressbalance.cpp (revision 15940) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Stressbalance/UpdateElementsStressbalance.cpp (revision 15941) @@ -95,5 +95,5 @@ iomodel->FetchDataToInput(elements,FrictionQEnum); iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum); - iomodel->FetchDataToInput(elements,MaskIcelevelsetEnum); + iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); iomodel->FetchDataToInput(elements,MaterialsRheologyBEnum); iomodel->FetchDataToInput(elements,MaterialsRheologyNEnum); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/StressbalanceVertical/UpdateElementsStressbalanceVertical.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/StressbalanceVertical/UpdateElementsStressbalanceVertical.cpp (revision 15940) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/StressbalanceVertical/UpdateElementsStressbalanceVertical.cpp (revision 15941) @@ -28,5 +28,5 @@ iomodel->FetchDataToInput(elements,SurfaceEnum); iomodel->FetchDataToInput(elements,BedEnum); - iomodel->FetchDataToInput(elements,MaskIcelevelsetEnum); + iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum); iomodel->FetchDataToInput(elements,MeshElementonbedEnum); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/UpdateElementsSurfaceSlope.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/UpdateElementsSurfaceSlope.cpp (revision 15940) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/UpdateElementsSurfaceSlope.cpp (revision 15941) @@ -23,5 +23,5 @@ iomodel->FetchDataToInput(elements,SurfaceEnum); iomodel->FetchDataToInput(elements,BedEnum); - iomodel->FetchDataToInput(elements,MaskIcelevelsetEnum); + iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); if(iomodel->dim==3){ iomodel->FetchDataToInput(elements,MeshElementonbedEnum); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp (revision 15940) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp (revision 15941) @@ -30,5 +30,5 @@ iomodel->FetchDataToInput(elements,FrictionPEnum); iomodel->FetchDataToInput(elements,FrictionQEnum); - iomodel->FetchDataToInput(elements,MaskIcelevelsetEnum); + iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); iomodel->FetchDataToInput(elements,MaskElementonfloatingiceEnum); iomodel->FetchDataToInput(elements,MeshElementonbedEnum); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp (revision 15940) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp (revision 15941) @@ -38,5 +38,5 @@ for(int i=0;iSize();i++){ Element* element=dynamic_cast(elements->GetObjectByOffset(i)); - element->InputCreate(phi,element->Sid(),iomodel,iomodel->numberofvertices,1,1,GLlevelsetEnum,1); + element->InputCreate(phi,element->Sid(),iomodel,iomodel->numberofvertices,1,1,MaskGroundediceLevelsetEnum,1); } Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 15940) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 15941) @@ -146,5 +146,5 @@ MaskVertexonfloatingiceEnum, MaskVertexongroundediceEnum, - MaskIcelevelsetEnum, + MaskIceLevelsetEnum, MaterialsBetaEnum, MaterialsHeatcapacityEnum, @@ -559,5 +559,5 @@ SubelementMigrationEnum, SubelementMigration2Enum, - GLlevelsetEnum, + MaskGroundediceLevelsetEnum, /*}}}*/ /*Solver{{{*/ Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 15940) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 15941) @@ -154,5 +154,5 @@ case MaskVertexonfloatingiceEnum : return "MaskVertexonfloatingice"; case MaskVertexongroundediceEnum : return "MaskVertexongroundedice"; - case MaskIcelevelsetEnum : return "MaskIcelevelset"; + case MaskIceLevelsetEnum : return "MaskIceLevelset"; case MaterialsBetaEnum : return "MaterialsBeta"; case MaterialsHeatcapacityEnum : return "MaterialsHeatcapacity"; @@ -478,4 +478,5 @@ case WatercolumnEnum : return "Watercolumn"; case BasalFrictionEnum : return "BasalFriction"; + case BasalMeltrateEnum : return "BasalMeltrate"; case ViscousHeatingEnum : return "ViscousHeating"; case QmuTemperatureEnum : return "QmuTemperature"; @@ -542,5 +543,5 @@ case SubelementMigrationEnum : return "SubelementMigration"; case SubelementMigration2Enum : return "SubelementMigration2"; - case GLlevelsetEnum : return "GLlevelset"; + case MaskGroundediceLevelsetEnum : return "MaskGroundediceLevelset"; case FSSolverEnum : return "FSSolver"; case AdjointEnum : return "Adjoint"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 15940) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 15941) @@ -157,5 +157,5 @@ else if (strcmp(name,"MaskVertexonfloatingice")==0) return MaskVertexonfloatingiceEnum; else if (strcmp(name,"MaskVertexongroundedice")==0) return MaskVertexongroundediceEnum; - else if (strcmp(name,"MaskIcelevelset")==0) return MaskIcelevelsetEnum; + else if (strcmp(name,"MaskIceLevelset")==0) return MaskIceLevelsetEnum; else if (strcmp(name,"MaterialsBeta")==0) return MaterialsBetaEnum; else if (strcmp(name,"MaterialsHeatcapacity")==0) return MaterialsHeatcapacityEnum; @@ -487,4 +487,5 @@ else if (strcmp(name,"Watercolumn")==0) return WatercolumnEnum; else if (strcmp(name,"BasalFriction")==0) return BasalFrictionEnum; + else if (strcmp(name,"BasalMeltrate")==0) return BasalMeltrateEnum; else if (strcmp(name,"ViscousHeating")==0) return ViscousHeatingEnum; else if (strcmp(name,"QmuTemperature")==0) return QmuTemperatureEnum; @@ -505,9 +506,9 @@ else if (strcmp(name,"P1DG")==0) return P1DGEnum; else if (strcmp(name,"P1bubble")==0) return P1bubbleEnum; - else if (strcmp(name,"P1bubblecondensed")==0) return P1bubblecondensedEnum; else stage=5; } if(stage==5){ - if (strcmp(name,"P2")==0) return P2Enum; + if (strcmp(name,"P1bubblecondensed")==0) return P1bubblecondensedEnum; + else if (strcmp(name,"P2")==0) return P2Enum; else if (strcmp(name,"P2xP1")==0) return P2xP1Enum; else if (strcmp(name,"P1xP2")==0) return P1xP2Enum; @@ -554,5 +555,5 @@ else if (strcmp(name,"SubelementMigration")==0) return SubelementMigrationEnum; else if (strcmp(name,"SubelementMigration2")==0) return SubelementMigration2Enum; - else if (strcmp(name,"GLlevelset")==0) return GLlevelsetEnum; + else if (strcmp(name,"MaskGroundediceLevelset")==0) return MaskGroundediceLevelsetEnum; else if (strcmp(name,"FSSolver")==0) return FSSolverEnum; else if (strcmp(name,"Adjoint")==0) return AdjointEnum; Index: /issm/trunk-jpl/src/m/enum/EnumDefinitions.py =================================================================== --- /issm/trunk-jpl/src/m/enum/EnumDefinitions.py (revision 15940) +++ /issm/trunk-jpl/src/m/enum/EnumDefinitions.py (revision 15941) @@ -146,5 +146,5 @@ def MaskVertexonfloatingiceEnum(): return StringToEnum("MaskVertexonfloatingice")[0] def MaskVertexongroundediceEnum(): return StringToEnum("MaskVertexongroundedice")[0] -def MaskIcelevelsetEnum(): return StringToEnum("MaskIcelevelset")[0] +def MaskIceLevelsetEnum(): return StringToEnum("MaskIceLevelset")[0] def MaterialsBetaEnum(): return StringToEnum("MaterialsBeta")[0] def MaterialsHeatcapacityEnum(): return StringToEnum("MaterialsHeatcapacity")[0] @@ -470,4 +470,5 @@ def WatercolumnEnum(): return StringToEnum("Watercolumn")[0] def BasalFrictionEnum(): return StringToEnum("BasalFriction")[0] +def BasalMeltrateEnum(): return StringToEnum("BasalMeltrate")[0] def ViscousHeatingEnum(): return StringToEnum("ViscousHeating")[0] def QmuTemperatureEnum(): return StringToEnum("QmuTemperature")[0] @@ -534,5 +535,5 @@ def SubelementMigrationEnum(): return StringToEnum("SubelementMigration")[0] def SubelementMigration2Enum(): return StringToEnum("SubelementMigration2")[0] -def GLlevelsetEnum(): return StringToEnum("GLlevelset")[0] +def MaskGroundediceLevelsetEnum(): return StringToEnum("MaskGroundediceLevelset")[0] def FSSolverEnum(): return StringToEnum("FSSolver")[0] def AdjointEnum(): return StringToEnum("Adjoint")[0] Index: sm/trunk-jpl/src/m/enum/GLlevelsetEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/GLlevelsetEnum.m (revision 15940) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=GLlevelsetEnum() -%GLLEVELSETENUM - Enum of GLlevelset -% -% 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=GLlevelsetEnum() - -macro=StringToEnum('GLlevelset'); Index: /issm/trunk-jpl/src/m/enum/MaskGroundediceLevelsetEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/MaskGroundediceLevelsetEnum.m (revision 15941) +++ /issm/trunk-jpl/src/m/enum/MaskGroundediceLevelsetEnum.m (revision 15941) @@ -0,0 +1,11 @@ +function macro=MaskGroundediceLevelsetEnum() +%MASKGROUNDEDICELEVELSETENUM - Enum of MaskGroundediceLevelset +% +% 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=MaskGroundediceLevelsetEnum() + +macro=StringToEnum('MaskGroundediceLevelset'); Index: /issm/trunk-jpl/src/m/enum/MaskIceLevelsetEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/MaskIceLevelsetEnum.m (revision 15941) +++ /issm/trunk-jpl/src/m/enum/MaskIceLevelsetEnum.m (revision 15941) @@ -0,0 +1,11 @@ +function macro=MaskIceLevelsetEnum() +%MASKICELEVELSETENUM - Enum of MaskIceLevelset +% +% 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=MaskIceLevelsetEnum() + +macro=StringToEnum('MaskIceLevelset'); Index: sm/trunk-jpl/src/m/enum/MaskIcelevelsetEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/MaskIcelevelsetEnum.m (revision 15940) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=MaskIcelevelsetEnum() -%MASKICELEVELSETENUM - Enum of MaskIcelevelset -% -% 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=MaskIcelevelsetEnum() - -macro=StringToEnum('MaskIcelevelset');