Changeset 17886

Timestamp:

04/30/14 08:23:23 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: 1. removed elementonbed elementonsurface (everybody should use vertexonX)

2. added sanity check for bednormal and surface normal
3. merging extrudecore and InputExtrude for Penta

Location:

issm/trunk-jpl/src

Files:

• c/analyses/BalancethicknessAnalysis.cpp (modified) (1 diff)
• c/analyses/BalancevelocityAnalysis.cpp (modified) (1 diff)
• c/analyses/EnthalpyAnalysis.cpp (modified) (1 diff)
• c/analyses/ExtrapolationAnalysis.cpp (modified) (1 diff)
• c/analyses/FreeSurfaceBaseAnalysis.cpp (modified) (1 diff)
• c/analyses/FreeSurfaceTopAnalysis.cpp (modified) (1 diff)
• c/analyses/HydrologyDCEfficientAnalysis.cpp (modified) (1 diff)
• c/analyses/HydrologyDCInefficientAnalysis.cpp (modified) (1 diff)
• c/analyses/HydrologyShreveAnalysis.cpp (modified) (1 diff)
• c/analyses/L2ProjectionBaseAnalysis.cpp (modified) (1 diff)
• c/analyses/L2ProjectionEPLAnalysis.cpp (modified) (1 diff)
• c/analyses/MasstransportAnalysis.cpp (modified) (1 diff)
• c/analyses/MeltingAnalysis.cpp (modified) (1 diff)
• c/analyses/SmoothedSurfaceSlopeXAnalysis.cpp (modified) (1 diff)
• c/analyses/SmoothedSurfaceSlopeYAnalysis.cpp (modified) (1 diff)
• c/analyses/StressbalanceAnalysis.cpp (modified) (3 diffs)
• c/analyses/StressbalanceVerticalAnalysis.cpp (modified) (1 diff)
• c/analyses/ThermalAnalysis.cpp (modified) (1 diff)
• c/classes/Elements/Penta.cpp (modified) (2 diffs)
• c/classes/Elements/Tetra.cpp (modified) (2 diffs)
• c/cores/extrudefrombase_core.cpp (modified) (1 diff)
• c/modules/InputDepthAverageAtBasex (modified) (1 prop)
• c/modules/InputExtrudex (modified) (1 prop)
• c/shared/Enum/EnumDefinitions.h (modified) (1 diff)
• c/shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• c/shared/Enum/StringToEnumx.cpp (modified) (5 diffs)
• m/classes/mesh3dprisms.m (modified) (2 diffs)
• m/classes/mesh3dprisms.py (modified) (2 diffs)
• m/enum/EnumDefinitions.py (modified) (1 diff)
• m/enum/MeshElementonbaseEnum.m (deleted)
• m/enum/MeshElementonsurfaceEnum.m (deleted)

issm/trunk-jpl/src/c/analyses/BalancethicknessAnalysis.cpp

@@ -45 +45 @@
         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);
         }
 }/*}}}*/

issm/trunk-jpl/src/c/analyses/BalancevelocityAnalysis.cpp

@@ -33 +33 @@
         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);
         }
 }/*}}}*/

issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp

@@ -59 +59 @@
         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);

issm/trunk-jpl/src/c/analyses/ExtrapolationAnalysis.cpp

@@ -30 +30 @@
                 }
         }
-        if(iomodel->domaintype==Domain3DEnum){
-                iomodel->FetchDataToInput(elements,MeshElementonbaseEnum);
-                iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum);
+        if(iomodel->domaintype!=Domain2DhorizontalEnum){
+                iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum);
+                iomodel->FetchDataToInput(elements,MeshVertexonsurfaceEnum);
         }
 }

issm/trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.cpp

@@ -35 +35 @@
         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);
         }
 }/*}}}*/

issm/trunk-jpl/src/c/analyses/FreeSurfaceTopAnalysis.cpp

@@ -35 +35 @@
         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){

issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp

@@ -57 +57 @@
         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);
+        }
 
 }/*}}}*/

issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp

@@ -88 +88 @@
         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);

issm/trunk-jpl/src/c/analyses/HydrologyShreveAnalysis.cpp

@@ -44 +44 @@
         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);

issm/trunk-jpl/src/c/analyses/L2ProjectionBaseAnalysis.cpp

@@ -26 +26 @@
         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);
         }
 }/*}}}*/

issm/trunk-jpl/src/c/analyses/L2ProjectionEPLAnalysis.cpp

@@ -36 +36 @@
         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);
         }
 }/*}}}*/

issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp

@@ -83 +83 @@
         }
 
-        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
         }
 

issm/trunk-jpl/src/c/analyses/MeltingAnalysis.cpp

@@ -34 +34 @@
         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);

issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeXAnalysis.cpp

@@ -26 +26 @@
         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);
         }
 }/*}}}*/

issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeYAnalysis.cpp

@@ -26 +26 @@
         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);
         }
 }/*}}}*/

issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp

@@ -220 +220 @@
         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 +231 @@
                 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 +237 @@
         if(islevelset){
                 iomodel->FetchDataToInput(elements,IceMaskNodeActivationEnum);
-                if(iomodel->domaintype!=Domain2DhorizontalEnum)
-                        iomodel->FetchDataToInput(elements,MeshVertexonbaseEnum); // required for updating active nodes
         }
 

issm/trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.cpp

@@ -34 +34 @@
         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.);

issm/trunk-jpl/src/c/analyses/ThermalAnalysis.cpp

@@ -55 +55 @@
         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);

issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

@@ -1650 +1650 @@
 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 +1669 @@
 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;
+        }
 }
 /*}}}*/

issm/trunk-jpl/src/c/classes/Elements/Tetra.cpp

@@ -668 +668 @@
         bed_normal[1]=-normal[1]/normal_norm;
         bed_normal[2]=-normal[2]/normal_norm;
+
+        _assert_(bed_normal[2]<0.);
 }
 /*}}}*/
@@ -690 +692 @@
         top_normal[1]=normal[1]/normal_norm;
         top_normal[2]=normal[2]/normal_norm;
+        _assert_(top_normal[2]>0.);
 }
 /*}}}*/

issm/trunk-jpl/src/c/cores/extrudefrombase_core.cpp

@@ -12 +12 @@
 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);
+         }
 
 }

issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

@@ -194 +194 @@
         MaterialsMantleDensityEnum,
         MeshAverageVertexConnectivityEnum,
-        MeshElementonbaseEnum,
-        MeshElementonsurfaceEnum,
         MeshElements2dEnum,
         MeshElementsEnum,

issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

@@ -202 +202 @@
                 case MaterialsMantleDensityEnum : return "MaterialsMantleDensity";
                 case MeshAverageVertexConnectivityEnum : return "MeshAverageVertexConnectivity";
-                case MeshElementonbaseEnum : return "MeshElementonbase";
-                case MeshElementonsurfaceEnum : return "MeshElementonsurface";
                 case MeshElements2dEnum : return "MeshElements2d";
                 case MeshElementsEnum : return "MeshElements";

issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

@@ -205 +205 @@
               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 +258 @@
               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 +381 @@
               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 +504 @@
               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 +627 @@
               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;

issm/trunk-jpl/src/m/classes/mesh3dprisms.m

@@ -83 +83 @@
                         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 +143 @@
                         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);

issm/trunk-jpl/src/m/classes/mesh3dprisms.py

@@ -121 +121 @@
                 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 +147 @@
                 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)

issm/trunk-jpl/src/m/enum/EnumDefinitions.py

@@ -194 +194 @@
 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]