Changeset 15437

Timestamp:

07/05/13 09:28:54 (12 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added md.flowequations.fe_ssa (0=P1, 1=P2), quadratic elements not working yet of course

Location:

issm/trunk-jpl/src

Files:

• 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/flowequation.m (modified) (2 diffs)
• m/classes/flowequation.py (modified) (2 diffs)
• m/enum/EnumDefinitions.py (modified) (2 diffs)
• m/enum/FlowequationFeSsaEnum.m (added)
• m/enum/MaximumNumberOfEnums.m (modified) (1 diff)

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

@@ -72 +72 @@
         FlowequationIsstokesEnum,
         FlowequationFeStokesEnum,
+        FlowequationFeSsaEnum,
         FlowequationVertexEquationEnum,
         FrictionCoefficientEnum,

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

@@ -80 +80 @@
                 case FlowequationIsstokesEnum : return "FlowequationIsstokes";
                 case FlowequationFeStokesEnum : return "FlowequationFeStokes";
+                case FlowequationFeSsaEnum : return "FlowequationFeSsa";
                 case FlowequationVertexEquationEnum : return "FlowequationVertexEquation";
                 case FrictionCoefficientEnum : return "FrictionCoefficient";

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

@@ -80 +80 @@
               else if (strcmp(name,"FlowequationIsstokes")==0) return FlowequationIsstokesEnum;
               else if (strcmp(name,"FlowequationFeStokes")==0) return FlowequationFeStokesEnum;
+              else if (strcmp(name,"FlowequationFeSsa")==0) return FlowequationFeSsaEnum;
               else if (strcmp(name,"FlowequationVertexEquation")==0) return FlowequationVertexEquationEnum;
               else if (strcmp(name,"FrictionCoefficient")==0) return FrictionCoefficientEnum;
@@ -136 +137 @@
               else if (strcmp(name,"InversionIncompleteAdjoint")==0) return InversionIncompleteAdjointEnum;
               else if (strcmp(name,"InversionMaxParameters")==0) return InversionMaxParametersEnum;
-              else if (strcmp(name,"InversionMaxiterPerStep")==0) return InversionMaxiterPerStepEnum;
          else stage=2;
    }
    if(stage==2){
-              if (strcmp(name,"InversionMinParameters")==0) return InversionMinParametersEnum;
+              if (strcmp(name,"InversionMaxiterPerStep")==0) return InversionMaxiterPerStepEnum;
+              else if (strcmp(name,"InversionMinParameters")==0) return InversionMinParametersEnum;
               else if (strcmp(name,"InversionNsteps")==0) return InversionNstepsEnum;
               else if (strcmp(name,"InversionNumControlParameters")==0) return InversionNumControlParametersEnum;
@@ -259 +260 @@
               else if (strcmp(name,"GiaLithosphereThickness")==0) return GiaLithosphereThicknessEnum;
               else if (strcmp(name,"Thickness")==0) return ThicknessEnum;
-              else if (strcmp(name,"TimesteppingStartTime")==0) return TimesteppingStartTimeEnum;
          else stage=3;
    }
    if(stage==3){
-              if (strcmp(name,"TimesteppingFinalTime")==0) return TimesteppingFinalTimeEnum;
+              if (strcmp(name,"TimesteppingStartTime")==0) return TimesteppingStartTimeEnum;
+              else if (strcmp(name,"TimesteppingFinalTime")==0) return TimesteppingFinalTimeEnum;
               else if (strcmp(name,"TimesteppingCflCoefficient")==0) return TimesteppingCflCoefficientEnum;
               else if (strcmp(name,"TimesteppingTimeAdapt")==0) return TimesteppingTimeAdaptEnum;
@@ -382 +383 @@
               else if (strcmp(name,"RiftfrontType")==0) return RiftfrontTypeEnum;
               else if (strcmp(name,"Segment")==0) return SegmentEnum;
-              else if (strcmp(name,"SegmentRiftfront")==0) return SegmentRiftfrontEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"SpcDynamic")==0) return SpcDynamicEnum;
+              if (strcmp(name,"SegmentRiftfront")==0) return SegmentRiftfrontEnum;
+              else if (strcmp(name,"SpcDynamic")==0) return SpcDynamicEnum;
               else if (strcmp(name,"SpcStatic")==0) return SpcStaticEnum;
               else if (strcmp(name,"SpcTransient")==0) return SpcTransientEnum;
@@ -505 +506 @@
               else if (strcmp(name,"DoubleElementResult")==0) return DoubleElementResultEnum;
               else if (strcmp(name,"DoubleExternalResult")==0) return DoubleExternalResultEnum;
-              else if (strcmp(name,"DoubleMatExternalResult")==0) return DoubleMatExternalResultEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"IntExternalResult")==0) return IntExternalResultEnum;
+              if (strcmp(name,"DoubleMatExternalResult")==0) return DoubleMatExternalResultEnum;
+              else if (strcmp(name,"IntExternalResult")==0) return IntExternalResultEnum;
               else if (strcmp(name,"J")==0) return JEnum;
               else if (strcmp(name,"Patch")==0) return PatchEnum;

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

@@ -11 +11 @@
                 isstokes             = 0;
                 fe_stokes            = 0;
+                fe_ssa               = 0;
                 vertex_equation      = NaN;
                 element_equation     = NaN;
@@ -80 +81 @@
                         WriteData(fid,'object',obj,'fieldname','isstokes','format','Boolean');
                         WriteData(fid,'object',obj,'fieldname','fe_stokes','format','Integer');
+                        WriteData(fid,'object',obj,'fieldname','fe_ssa','format','Integer');
                         WriteData(fid,'object',obj,'fieldname','bordermacayeal','format','DoubleMat','mattype',1);
                         WriteData(fid,'object',obj,'fieldname','borderpattyn','format','DoubleMat','mattype',1);

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

@@ -16 +16 @@
         def __init__(self): # {{{
                 
-                self.ismacayealpattyn     = 0
-                self.ishutter             = 0
-                self.isl1l2               = 0
-                self.isstokes             = 0
-                self.fe_stokes            = 0
-                self.vertex_equation      = float('NaN')
-                self.element_equation     = float('NaN')
-                self.bordermacayeal       = float('NaN')
-                self.borderpattyn         = float('NaN')
-                self.borderstokes         = float('NaN')
+                self.ismacayealpattyn = 0
+                self.ishutter         = 0
+                self.isl1l2           = 0
+                self.isstokes         = 0
+                self.fe_stokes        = 0
+                self.fe_ssa           = 0
+                self.vertex_equation  = float('NaN')
+                self.element_equation = float('NaN')
+                self.bordermacayeal   = float('NaN')
+                self.borderpattyn     = float('NaN')
+                self.borderstokes     = float('NaN')
 
                 #set defaults
@@ -80 +81 @@
                 WriteData(fid,'object',self,'fieldname','isstokes','format','Boolean')
                 WriteData(fid,'object',self,'fieldname','fe_stokes','format','Integer')
+                WriteData(fid,'object',self,'fieldname','fe_ssa','format','Integer')
                 WriteData(fid,'object',self,'fieldname','bordermacayeal','format','DoubleMat','mattype',1)
                 WriteData(fid,'object',self,'fieldname','borderpattyn','format','DoubleMat','mattype',1)

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

@@ -891 +891 @@
         return StringToEnum('FlowequationFeStokes')[0]
 
+def FlowequationFeSsaEnum():
+        """
+        FLOWEQUATIONFESSAENUM - Enum of FlowequationFeSsa
+
+        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=FlowequationFeSsaEnum()
+        """
+
+        return StringToEnum('FlowequationFeSsa')[0]
+
 def FlowequationVertexEquationEnum():
         """
@@ -7847 +7861 @@
         """
 
-        return 559
-
+        return 560
+

issm/trunk-jpl/src/m/enum/MaximumNumberOfEnums.m

@@ -9 +9 @@
 %      macro=MaximumNumberOfEnums()
 
-macro=559;
+macro=560;