Changeset 15129

Timestamp:

05/28/13 14:24:07 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: removed useless Enums

Location:

issm/trunk-jpl/src

Files:

• c/classes/Elements/Element.h (modified) (1 diff)
• c/classes/Elements/Penta.cpp (modified) (1 diff)
• c/classes/Elements/Penta.h (modified) (1 diff)
• c/classes/Elements/Tria.cpp (modified) (1 diff)
• c/classes/Elements/Tria.h (modified) (1 diff)
• c/classes/FemModel.cpp (modified) (1 diff)
• c/shared/Enum/EnumDefinitions.h (modified) (2 diffs)
• c/shared/Enum/EnumToStringx.cpp (modified) (2 diffs)
• c/shared/Enum/StringToEnumx.cpp (modified) (3 diffs)
• m/enum/EnumDefinitions.py (modified) (3 diffs)
• m/enum/ExtToIuEnum.m (deleted)
• m/enum/IuToExtEnum.m (deleted)
• m/enum/MaximumNumberOfEnums.m (modified) (1 diff)

issm/trunk-jpl/src/c/classes/Elements/Element.h

@@ -101 +101 @@
                 virtual void   MaxAbsVz(IssmDouble* pmaxabsvz, bool process_units)=0;
                 virtual IssmDouble MassFlux(IssmDouble* segment,bool process_units)=0;
-                virtual void   ElementResponse(IssmDouble* presponse,int response_enum,bool process_units)=0;
+                virtual void   ElementResponse(IssmDouble* presponse,int response_enum)=0;
                 virtual IssmDouble IceVolume(void)=0;
                 virtual IssmDouble TotalSmb(void)=0;

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

@@ -3401 +3401 @@
 /*}}}*/
 /*FUNCTION Penta::ElementResponse{{{*/
-void Penta::ElementResponse(IssmDouble* presponse,int response_enum,bool process_units){
+void Penta::ElementResponse(IssmDouble* presponse,int response_enum){
 
         switch(response_enum){

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

@@ -136 +136 @@
                 void   MaxAbsVz(IssmDouble* pmaxabsvz, bool process_units);
                 void   MaxVel(IssmDouble* pmaxvel, bool process_units);
-                void   ElementResponse(IssmDouble* presponse,int response_enum,bool process_units);
+                void   ElementResponse(IssmDouble* presponse,int response_enum);
                 void   MaxVx(IssmDouble* pmaxvx, bool process_units);
                 void   MaxVy(IssmDouble* pmaxvy, bool process_units);

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

@@ -3045 +3045 @@
 /*}}}*/
 /*FUNCTION Tria::ElementResponse{{{*/
-void Tria::ElementResponse(IssmDouble* presponse,int response_enum,bool process_units){
+void Tria::ElementResponse(IssmDouble* presponse,int response_enum){
 
         switch(response_enum){

issm/trunk-jpl/src/c/classes/Elements/Tria.h

@@ -133 +133 @@
                 void   MaxAbsVy(IssmDouble* pmaxabsvy, bool process_units);
                 void   MaxAbsVz(IssmDouble* pmaxabsvz, bool process_units);
-                void   ElementResponse(IssmDouble* presponse,int response_enum,bool process_units);
+                void   ElementResponse(IssmDouble* presponse,int response_enum);
                 void   MaxVel(IssmDouble* pmaxvel, bool process_units);
                 void   MaxVx(IssmDouble* pmaxvx, bool process_units);

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -1368 +1368 @@
         /*Ok, we found the element, compute responseocity: */
         if(my_rank==cpu_found){
-                element->ElementResponse(&response,response_enum,IuToExtEnum);
+                element->ElementResponse(&response,response_enum);
         }
 

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

@@ -408 +408 @@
         ConstantEnum,
         ConvergedEnum,
-        ExtToIuEnum,
         FillEnum,
         FractionIncrementEnum,
@@ -414 +413 @@
         GroundinglineMeltingRateEnum,
         InternalEnum,
-        IuToExtEnum,
         MassFluxEnum,
         MaxPenetrationEnum,

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

@@ -402 +402 @@
                 case ConstantEnum : return "Constant";
                 case ConvergedEnum : return "Converged";
-                case ExtToIuEnum : return "ExtToIu";
                 case FillEnum : return "Fill";
                 case FractionIncrementEnum : return "FractionIncrement";
@@ -408 +407 @@
                 case GroundinglineMeltingRateEnum : return "GroundinglineMeltingRate";
                 case InternalEnum : return "Internal";
-                case IuToExtEnum : return "IuToExt";
                 case MassFluxEnum : return "MassFlux";
                 case MaxPenetrationEnum : return "MaxPenetration";

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

@@ -411 +411 @@
               else if (strcmp(name,"Constant")==0) return ConstantEnum;
               else if (strcmp(name,"Converged")==0) return ConvergedEnum;
-              else if (strcmp(name,"ExtToIu")==0) return ExtToIuEnum;
               else if (strcmp(name,"Fill")==0) return FillEnum;
               else if (strcmp(name,"FractionIncrement")==0) return FractionIncrementEnum;
@@ -417 +416 @@
               else if (strcmp(name,"GroundinglineMeltingRate")==0) return GroundinglineMeltingRateEnum;
               else if (strcmp(name,"Internal")==0) return InternalEnum;
-              else if (strcmp(name,"IuToExt")==0) return IuToExtEnum;
               else if (strcmp(name,"MassFlux")==0) return MassFluxEnum;
               else if (strcmp(name,"MaxPenetration")==0) return MaxPenetrationEnum;
@@ -506 +504 @@
               else if (strcmp(name,"PatchNodes")==0) return PatchNodesEnum;
               else if (strcmp(name,"PatchVertices")==0) return PatchVerticesEnum;
+              else if (strcmp(name,"PentaP1ElementResult")==0) return PentaP1ElementResultEnum;
+              else if (strcmp(name,"StringExternalResult")==0) return StringExternalResultEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"PentaP1ElementResult")==0) return PentaP1ElementResultEnum;
-              else if (strcmp(name,"StringExternalResult")==0) return StringExternalResultEnum;
-              else if (strcmp(name,"Step")==0) return StepEnum;
+              if (strcmp(name,"Step")==0) return StepEnum;
               else if (strcmp(name,"Time")==0) return TimeEnum;
               else if (strcmp(name,"TriaP1ElementResult")==0) return TriaP1ElementResultEnum;

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

@@ -5399 +5399 @@
         return StringToEnum('Converged')[0]
 
-def ExtToIuEnum():
-        """
-        EXTTOIUENUM - Enum of ExtToIu
-
-        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=ExtToIuEnum()
-        """
-
-        return StringToEnum('ExtToIu')[0]
-
 def FillEnum():
         """
@@ -5483 +5469 @@
         return StringToEnum('Internal')[0]
 
-def IuToExtEnum():
-        """
-        IUTOEXTENUM - Enum of IuToExt
-
-        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=IuToExtEnum()
-        """
-
-        return StringToEnum('IuToExt')[0]
-
 def MassFluxEnum():
         """
@@ -7777 +7749 @@
         """
 
-        return 554
-
+        return 552
+

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

@@ -9 +9 @@
 %      macro=MaximumNumberOfEnums()
 
-macro=554;
+macro=552;