Index: /issm/trunk-jpl/src/c/analyses/BalancethicknessAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/BalancethicknessAnalysis.cpp (revision 17885) +++ /issm/trunk-jpl/src/c/analyses/BalancethicknessAnalysis.cpp (revision 17886) @@ -45,7 +45,7 @@ iomodel->FetchDataToInput(elements,BalancethicknessThickeningRateEnum); - if(iomodel->domaintype==Domain3DEnum){ - iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); - iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); + if(iomodel->domaintype!=Domain2DhorizontalEnum){ + iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); + iomodel->FetchDataToInput(elements,MeshVertexonsurfaceEnum); } }/*}}}*/ Index: /issm/trunk-jpl/src/c/analyses/BalancevelocityAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/BalancevelocityAnalysis.cpp (revision 17885) +++ /issm/trunk-jpl/src/c/analyses/BalancevelocityAnalysis.cpp (revision 17886) @@ -33,7 +33,7 @@ iomodel->FetchDataToInput(elements,BalancethicknessThickeningRateEnum); - if(iomodel->domaintype==Domain3DEnum){ - iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); - iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); + if(iomodel->domaintype!=Domain2DhorizontalEnum){ + iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); + iomodel->FetchDataToInput(elements,MeshVertexonsurfaceEnum); } }/*}}}*/ Index: /issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp (revision 17885) +++ /issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp (revision 17886) @@ -59,6 +59,8 @@ iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); iomodel->FetchDataToInput(elements,MaskGroundediceLevelsetEnum); - iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); - iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); + if(iomodel->domaintype!=Domain2DhorizontalEnum){ + iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); + iomodel->FetchDataToInput(elements,MeshVertexonsurfaceEnum); + } iomodel->FetchDataToInput(elements,FlowequationElementEquationEnum); iomodel->FetchDataToInput(elements,MaterialsRheologyBEnum); Index: /issm/trunk-jpl/src/c/analyses/ExtrapolationAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/ExtrapolationAnalysis.cpp (revision 17885) +++ /issm/trunk-jpl/src/c/analyses/ExtrapolationAnalysis.cpp (revision 17886) @@ -30,7 +30,7 @@ } } - if(iomodel->domaintype==Domain3DEnum){ - iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); - iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); + if(iomodel->domaintype!=Domain2DhorizontalEnum){ + iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); + iomodel->FetchDataToInput(elements,MeshVertexonsurfaceEnum); } } Index: /issm/trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.cpp (revision 17885) +++ /issm/trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.cpp (revision 17886) @@ -35,8 +35,10 @@ iomodel->FetchDataToInput(elements,VxEnum); iomodel->FetchDataToInput(elements,VyEnum); - if(iomodel->domaintype==Domain3DEnum){ + if(iomodel->domaindim==3){ iomodel->FetchDataToInput(elements,VzEnum); - iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); - iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); + } + if(iomodel->domaintype!=Domain2DhorizontalEnum){ + iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); + iomodel->FetchDataToInput(elements,MeshVertexonsurfaceEnum); } }/*}}}*/ Index: /issm/trunk-jpl/src/c/analyses/FreeSurfaceTopAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/FreeSurfaceTopAnalysis.cpp (revision 17885) +++ /issm/trunk-jpl/src/c/analyses/FreeSurfaceTopAnalysis.cpp (revision 17886) @@ -35,9 +35,10 @@ iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); iomodel->FetchDataToInput(elements,VxEnum); - if(iomodel->domaintype!=Domain2DhorizontalEnum) iomodel->FetchDataToInput(elements,MeshVertexonsurfaceEnum); - if(iomodel->domaintype==Domain3DEnum){ + if(iomodel->domaintype!=Domain2DhorizontalEnum){ + iomodel->FetchDataToInput(elements,MeshVertexonsurfaceEnum); + iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); + } + if(iomodel->domaindim==3){ iomodel->FetchDataToInput(elements,VzEnum); - iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); - iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); } switch(smb_model){ Index: /issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp (revision 17885) +++ /issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp (revision 17886) @@ -57,7 +57,8 @@ iomodel->FetchDataToInput(elements,HydrologydcSedimentTransmitivityEnum); iomodel->FetchDataToInput(elements,HydrologydcEplThicknessEnum); - if(iomodel->domaintype==Domain3DEnum) iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); - - // elements->InputDuplicate(HydrologydcEplInitialThicknessEnum,HydrologydcEplThicknessEnum); + if(iomodel->domaintype!=Domain2DhorizontalEnum){ + iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); + iomodel->FetchDataToInput(elements,MeshVertexonsurfaceEnum); + } }/*}}}*/ Index: /issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp (revision 17885) +++ /issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp (revision 17886) @@ -88,5 +88,8 @@ iomodel->FetchDataToInput(elements,SedimentHeadEnum); iomodel->FetchDataToInput(elements,HydrologydcSedimentTransmitivityEnum); - if(iomodel->domaintype==Domain3DEnum) iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); + if(iomodel->domaintype!=Domain2DhorizontalEnum){ + iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); + iomodel->FetchDataToInput(elements,MeshVertexonsurfaceEnum); + } if(isefficientlayer)iomodel->FetchDataToInput(elements,HydrologydcMaskEplactiveNodeEnum); Index: /issm/trunk-jpl/src/c/analyses/HydrologyShreveAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/HydrologyShreveAnalysis.cpp (revision 17885) +++ /issm/trunk-jpl/src/c/analyses/HydrologyShreveAnalysis.cpp (revision 17886) @@ -44,6 +44,8 @@ iomodel->FetchDataToInput(elements,SurfaceEnum); iomodel->FetchDataToInput(elements,BaseEnum); - iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); - iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); + if(iomodel->domaintype!=Domain2DhorizontalEnum){ + iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); + iomodel->FetchDataToInput(elements,MeshVertexonsurfaceEnum); + } iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); iomodel->FetchDataToInput(elements,MaskGroundediceLevelsetEnum); Index: /issm/trunk-jpl/src/c/analyses/L2ProjectionBaseAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/L2ProjectionBaseAnalysis.cpp (revision 17885) +++ /issm/trunk-jpl/src/c/analyses/L2ProjectionBaseAnalysis.cpp (revision 17886) @@ -26,13 +26,7 @@ iomodel->FetchDataToInput(elements,BaseEnum); iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); - if(iomodel->domaintype==Domain3DEnum){ - if(iomodel->meshelementtype==PentaEnum){ - iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); - iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); - } + if(iomodel->domaintype!=Domain2DhorizontalEnum){ iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); - } - if(iomodel->domaintype==Domain2DverticalEnum){ - iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); + iomodel->FetchDataToInput(elements,MeshVertexonsurfaceEnum); } }/*}}}*/ Index: /issm/trunk-jpl/src/c/analyses/L2ProjectionEPLAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/L2ProjectionEPLAnalysis.cpp (revision 17885) +++ /issm/trunk-jpl/src/c/analyses/L2ProjectionEPLAnalysis.cpp (revision 17886) @@ -36,6 +36,7 @@ iomodel->FetchDataToInput(elements,EplHeadEnum); iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); - if(iomodel->domaintype==Domain3DEnum){ - iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); + if(iomodel->domaintype!=Domain2DhorizontalEnum){ + iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); + iomodel->FetchDataToInput(elements,MeshVertexonsurfaceEnum); } }/*}}}*/ Index: /issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp (revision 17885) +++ /issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp (revision 17886) @@ -83,13 +83,11 @@ } - if(iomodel->domaintype==Domain3DEnum){ - iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); - iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); + if(iomodel->domaintype!=Domain2DhorizontalEnum){ + iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); + iomodel->FetchDataToInput(elements,MeshVertexonsurfaceEnum); } if(islevelset){ iomodel->FetchDataToInput(elements,IceMaskNodeActivationEnum); - if(iomodel->domaintype!=Domain2DhorizontalEnum) - iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); // required for updating active nodes } Index: /issm/trunk-jpl/src/c/analyses/MeltingAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/MeltingAnalysis.cpp (revision 17885) +++ /issm/trunk-jpl/src/c/analyses/MeltingAnalysis.cpp (revision 17886) @@ -34,6 +34,8 @@ iomodel->FetchDataToInput(elements,FrictionQEnum); iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); - iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); - iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); + if(iomodel->domaintype!=Domain2DhorizontalEnum){ + iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); + iomodel->FetchDataToInput(elements,MeshVertexonsurfaceEnum); + } iomodel->FetchDataToInput(elements,FlowequationElementEquationEnum); iomodel->FetchDataToInput(elements,MaterialsRheologyBEnum); Index: /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeXAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeXAnalysis.cpp (revision 17885) +++ /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeXAnalysis.cpp (revision 17886) @@ -26,10 +26,7 @@ iomodel->FetchDataToInput(elements,BaseEnum); iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); - if(iomodel->domaintype==Domain3DEnum){ - iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); - iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); - } - if(iomodel->domaintype==Domain2DverticalEnum){ + if(iomodel->domaintype!=Domain2DhorizontalEnum){ iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); + iomodel->FetchDataToInput(elements,MeshVertexonsurfaceEnum); } }/*}}}*/ Index: /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeYAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeYAnalysis.cpp (revision 17885) +++ /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeYAnalysis.cpp (revision 17886) @@ -26,10 +26,7 @@ iomodel->FetchDataToInput(elements,BaseEnum); iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); - if(iomodel->domaintype==Domain3DEnum){ - iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); - iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); - } - if(iomodel->domaintype==Domain2DverticalEnum){ + if(iomodel->domaintype!=Domain2DhorizontalEnum){ iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); + iomodel->FetchDataToInput(elements,MeshVertexonsurfaceEnum); } }/*}}}*/ Index: /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (revision 17885) +++ /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (revision 17886) @@ -220,9 +220,9 @@ if(isdamage)iomodel->FetchDataToInput(elements,DamageDEnum); + if(iomodel->domaintype!=Domain2DhorizontalEnum){ + iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); + iomodel->FetchDataToInput(elements,MeshVertexonsurfaceEnum); + } if(iomodel->domaintype==Domain3DEnum){ - if(iomodel->meshelementtype==PentaEnum){ - iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); - iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); - } iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum); iomodel->FetchDataToInput(elements,FlowequationBorderFSEnum); @@ -231,9 +231,5 @@ if(dakota_analysis)elements->InputDuplicate(VzEnum,QmuVzEnum); } - if(iomodel->domaintype==Domain2DverticalEnum){ - iomodel->FetchDataToInput(elements,MeshVertexonsurfaceEnum); - } if(isFS){ - iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); iomodel->FetchDataToInput(elements,PressureEnum,0.); if(dakota_analysis)elements->InputDuplicate(PressureEnum,QmuPressureEnum); @@ -241,6 +237,4 @@ if(islevelset){ iomodel->FetchDataToInput(elements,IceMaskNodeActivationEnum); - if(iomodel->domaintype!=Domain2DhorizontalEnum) - iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); // required for updating active nodes } Index: /issm/trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.cpp (revision 17885) +++ /issm/trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.cpp (revision 17886) @@ -34,9 +34,8 @@ iomodel->FetchDataToInput(elements,BaseEnum); iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); - if(iomodel->meshelementtype==PentaEnum){ - iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); - iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); - } - iomodel->FetchDataToInput(elements,MeshVertexonsurfaceEnum); + if(iomodel->domaintype!=Domain2DhorizontalEnum){ + iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); + iomodel->FetchDataToInput(elements,MeshVertexonsurfaceEnum); + } iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum); iomodel->FetchDataToInput(elements,VxEnum,0.); Index: /issm/trunk-jpl/src/c/analyses/ThermalAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/ThermalAnalysis.cpp (revision 17885) +++ /issm/trunk-jpl/src/c/analyses/ThermalAnalysis.cpp (revision 17886) @@ -55,6 +55,8 @@ iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); iomodel->FetchDataToInput(elements,MaskGroundediceLevelsetEnum); - iomodel->FetchDataToInput(elements,MeshElementonbaseEnum); - iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); + if(iomodel->domaintype!=Domain2DhorizontalEnum){ + iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); + iomodel->FetchDataToInput(elements,MeshVertexonsurfaceEnum); + } iomodel->FetchDataToInput(elements,FlowequationElementEquationEnum); iomodel->FetchDataToInput(elements,MaterialsRheologyBEnum); Index: /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 17885) +++ /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 17886) @@ -1650,7 +1650,18 @@ bool Penta::IsOnBase(void){ - bool onbase; - inputs->GetInputValue(&onbase,MeshElementonbaseEnum); - return onbase; + IssmDouble values[NUMVERTICES]; + IssmDouble sum; + + /*Retrieve all inputs and parameters*/ + GetInputListOnVertices(&values[0],MeshVertexonbaseEnum); + sum = values[0]+values[1]+values[2]+values[3]+values[4]+values[5]; + _assert_(sum==0. || sum==3.); + + if(sum==3){ + return true; + } + else{ + return false; + } } /*}}}*/ @@ -1658,7 +1669,18 @@ bool Penta::IsOnSurface(void){ - bool onsurface; - inputs->GetInputValue(&onsurface,MeshElementonsurfaceEnum); - return onsurface; + IssmDouble values[NUMVERTICES]; + IssmDouble sum; + + /*Retrieve all inputs and parameters*/ + GetInputListOnVertices(&values[0],MeshVertexonsurfaceEnum); + sum = values[0]+values[1]+values[2]+values[3]+values[4]+values[5]; + _assert_(sum==0. || sum==3.); + + if(sum==3){ + return true; + } + else{ + return false; + } } /*}}}*/ Index: /issm/trunk-jpl/src/c/classes/Elements/Tetra.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tetra.cpp (revision 17885) +++ /issm/trunk-jpl/src/c/classes/Elements/Tetra.cpp (revision 17886) @@ -668,4 +668,6 @@ bed_normal[1]=-normal[1]/normal_norm; bed_normal[2]=-normal[2]/normal_norm; + + _assert_(bed_normal[2]<0.); } /*}}}*/ @@ -690,4 +692,5 @@ top_normal[1]=normal[1]/normal_norm; top_normal[2]=normal[2]/normal_norm; + _assert_(top_normal[2]>0.); } /*}}}*/ Index: /issm/trunk-jpl/src/c/cores/extrudefrombase_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/cores/extrudefrombase_core.cpp (revision 17885) +++ /issm/trunk-jpl/src/c/cores/extrudefrombase_core.cpp (revision 17886) @@ -12,10 +12,20 @@ void extrudefrombase_core(FemModel* femmodel){ + /*Intermediaries*/ + int elementtype; + if(VerboseSolution()) _printf0_("extruding solution from base...\n"); - /*Call on core computations: */ - femmodel->SetCurrentConfiguration(ExtrudeFromBaseAnalysisEnum); - femmodel->UpdateConstraintsExtrudeFromBasex(); - solutionsequence_linear(femmodel); + femmodel->parameters->FindParam(&elementtype,MeshElementtypeEnum); + if(elementtype==PentaEnum){ + int inputenum; femmodel->parameters->FindParam(&inputenum,InputToExtrudeEnum); + InputExtrudex(femmodel,inputenum); + } + else{ + /*Call on core computations: */ + femmodel->SetCurrentConfiguration(ExtrudeFromBaseAnalysisEnum); + femmodel->UpdateConstraintsExtrudeFromBasex(); + solutionsequence_linear(femmodel); + } } Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 17885) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 17886) @@ -194,6 +194,4 @@ MaterialsMantleDensityEnum, MeshAverageVertexConnectivityEnum, - MeshElementonbaseEnum, - MeshElementonsurfaceEnum, MeshElements2dEnum, MeshElementsEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 17885) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 17886) @@ -202,6 +202,4 @@ case MaterialsMantleDensityEnum : return "MaterialsMantleDensity"; case MeshAverageVertexConnectivityEnum : return "MeshAverageVertexConnectivity"; - case MeshElementonbaseEnum : return "MeshElementonbase"; - case MeshElementonsurfaceEnum : return "MeshElementonsurface"; case MeshElements2dEnum : return "MeshElements2d"; case MeshElementsEnum : return "MeshElements"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 17885) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 17886) @@ -205,6 +205,4 @@ else if (strcmp(name,"MaterialsMantleDensity")==0) return MaterialsMantleDensityEnum; else if (strcmp(name,"MeshAverageVertexConnectivity")==0) return MeshAverageVertexConnectivityEnum; - else if (strcmp(name,"MeshElementonbase")==0) return MeshElementonbaseEnum; - else if (strcmp(name,"MeshElementonsurface")==0) return MeshElementonsurfaceEnum; else if (strcmp(name,"MeshElements2d")==0) return MeshElements2dEnum; else if (strcmp(name,"MeshElements")==0) return MeshElementsEnum; @@ -260,10 +258,10 @@ else if (strcmp(name,"ProfilingCurrentFlops")==0) return ProfilingCurrentFlopsEnum; else if (strcmp(name,"ProfilingSolutionTime")==0) return ProfilingSolutionTimeEnum; + else if (strcmp(name,"MaxIterationConvergenceFlag")==0) return MaxIterationConvergenceFlagEnum; + else if (strcmp(name,"SteadystateMaxiter")==0) return SteadystateMaxiterEnum; else stage=3; } if(stage==3){ - if (strcmp(name,"MaxIterationConvergenceFlag")==0) return MaxIterationConvergenceFlagEnum; - else if (strcmp(name,"SteadystateMaxiter")==0) return SteadystateMaxiterEnum; - else if (strcmp(name,"SteadystateNumRequestedOutputs")==0) return SteadystateNumRequestedOutputsEnum; + if (strcmp(name,"SteadystateNumRequestedOutputs")==0) return SteadystateNumRequestedOutputsEnum; else if (strcmp(name,"SteadystateReltol")==0) return SteadystateReltolEnum; else if (strcmp(name,"SteadystateRequestedOutputs")==0) return SteadystateRequestedOutputsEnum; @@ -383,10 +381,10 @@ else if (strcmp(name,"Approximation")==0) return ApproximationEnum; else if (strcmp(name,"NoneApproximation")==0) return NoneApproximationEnum; + else if (strcmp(name,"SIAApproximation")==0) return SIAApproximationEnum; + else if (strcmp(name,"SSAApproximation")==0) return SSAApproximationEnum; else stage=4; } if(stage==4){ - if (strcmp(name,"SIAApproximation")==0) return SIAApproximationEnum; - else if (strcmp(name,"SSAApproximation")==0) return SSAApproximationEnum; - else if (strcmp(name,"SSAHOApproximation")==0) return SSAHOApproximationEnum; + if (strcmp(name,"SSAHOApproximation")==0) return SSAHOApproximationEnum; else if (strcmp(name,"SSAFSApproximation")==0) return SSAFSApproximationEnum; else if (strcmp(name,"L1L2Approximation")==0) return L1L2ApproximationEnum; @@ -506,10 +504,10 @@ else if (strcmp(name,"SurfaceLogVelMisfit")==0) return SurfaceLogVelMisfitEnum; else if (strcmp(name,"SurfaceLogVxVyMisfit")==0) return SurfaceLogVxVyMisfitEnum; + else if (strcmp(name,"SurfaceRelVelMisfit")==0) return SurfaceRelVelMisfitEnum; + else if (strcmp(name,"SurfaceSlopeX")==0) return SurfaceSlopeXEnum; else stage=5; } if(stage==5){ - if (strcmp(name,"SurfaceRelVelMisfit")==0) return SurfaceRelVelMisfitEnum; - else if (strcmp(name,"SurfaceSlopeX")==0) return SurfaceSlopeXEnum; - else if (strcmp(name,"SurfaceSlopeY")==0) return SurfaceSlopeYEnum; + if (strcmp(name,"SurfaceSlopeY")==0) return SurfaceSlopeYEnum; else if (strcmp(name,"Temperature")==0) return TemperatureEnum; else if (strcmp(name,"TemperaturePicard")==0) return TemperaturePicardEnum; @@ -629,10 +627,10 @@ else if (strcmp(name,"TotalSmb")==0) return TotalSmbEnum; else if (strcmp(name,"Absolute")==0) return AbsoluteEnum; + else if (strcmp(name,"Incremental")==0) return IncrementalEnum; + else if (strcmp(name,"AugmentedLagrangianR")==0) return AugmentedLagrangianREnum; else stage=6; } if(stage==6){ - if (strcmp(name,"Incremental")==0) return IncrementalEnum; - else if (strcmp(name,"AugmentedLagrangianR")==0) return AugmentedLagrangianREnum; - else if (strcmp(name,"AugmentedLagrangianTheta")==0) return AugmentedLagrangianThetaEnum; + if (strcmp(name,"AugmentedLagrangianTheta")==0) return AugmentedLagrangianThetaEnum; else if (strcmp(name,"None")==0) return NoneEnum; else if (strcmp(name,"AgressiveMigration")==0) return AgressiveMigrationEnum; Index: /issm/trunk-jpl/src/m/classes/mesh3dprisms.m =================================================================== --- /issm/trunk-jpl/src/m/classes/mesh3dprisms.m (revision 17885) +++ /issm/trunk-jpl/src/m/classes/mesh3dprisms.m (revision 17886) @@ -83,6 +83,4 @@ md = checkfield(md,'fieldname','mesh.numberofvertices','>',0); %no checks for numberofedges lat long and hemisphere - 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.vertexonbase','size',[md.mesh.numberofvertices 1],'values',[0 1]); md = checkfield(md,'fieldname','mesh.vertexonsurface','size',[md.mesh.numberofvertices 1],'values',[0 1]); @@ -145,6 +143,4 @@ 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','elementonbase','format','BooleanMat','mattype',2); - WriteData(fid,'object',obj,'class','mesh','fieldname','elementonsurface','format','BooleanMat','mattype',2); WriteData(fid,'object',obj,'class','mesh','fieldname','vertexonbase','format','BooleanMat','mattype',1); WriteData(fid,'object',obj,'class','mesh','fieldname','vertexonsurface','format','BooleanMat','mattype',1); Index: /issm/trunk-jpl/src/m/classes/mesh3dprisms.py =================================================================== --- /issm/trunk-jpl/src/m/classes/mesh3dprisms.py (revision 17885) +++ /issm/trunk-jpl/src/m/classes/mesh3dprisms.py (revision 17886) @@ -121,6 +121,4 @@ md = checkfield(md,'fieldname','mesh.numberofvertices','>',0) #no checks for numberofedges lat long and hemisphere - 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.vertexonbase','size',[md.mesh.numberofvertices],'values',[0,1]) md = checkfield(md,'fieldname','mesh.vertexonsurface','size',[md.mesh.numberofvertices],'values',[0,1]) @@ -149,6 +147,4 @@ 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','elementonbase','format','BooleanMat','mattype',2) - WriteData(fid,'object',self,'class','mesh','fieldname','elementonsurface','format','BooleanMat','mattype',2) WriteData(fid,'object',self,'class','mesh','fieldname','vertexonbase','format','BooleanMat','mattype',1) WriteData(fid,'object',self,'class','mesh','fieldname','vertexonsurface','format','BooleanMat','mattype',1) Index: /issm/trunk-jpl/src/m/enum/EnumDefinitions.py =================================================================== --- /issm/trunk-jpl/src/m/enum/EnumDefinitions.py (revision 17885) +++ /issm/trunk-jpl/src/m/enum/EnumDefinitions.py (revision 17886) @@ -194,6 +194,4 @@ def MaterialsMantleDensityEnum(): return StringToEnum("MaterialsMantleDensity")[0] def MeshAverageVertexConnectivityEnum(): return StringToEnum("MeshAverageVertexConnectivity")[0] -def MeshElementonbaseEnum(): return StringToEnum("MeshElementonbase")[0] -def MeshElementonsurfaceEnum(): return StringToEnum("MeshElementonsurface")[0] def MeshElements2dEnum(): return StringToEnum("MeshElements2d")[0] def MeshElementsEnum(): return StringToEnum("MeshElements")[0] Index: sm/trunk-jpl/src/m/enum/MeshElementonbaseEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/MeshElementonbaseEnum.m (revision 17885) +++ (revision ) @@ -1,11 +1,0 @@ -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/MeshElementonsurfaceEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/MeshElementonsurfaceEnum.m (revision 17885) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=MeshElementonsurfaceEnum() -%MESHELEMENTONSURFACEENUM - Enum of MeshElementonsurface -% -% 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=MeshElementonsurfaceEnum() - -macro=StringToEnum('MeshElementonsurface');