Changeset 4123

Timestamp:

06/22/10 15:13:54 (15 years ago)

Author:

Mathieu Morlighem

Message:

minor update and no error if Enum not found in StringAsEnum (so that error messages are always displayed)

Location:

issm/trunk/src/c

Files:

• EnumDefinitions/EnumAsString.cpp (modified) (1 diff)
• EnumDefinitions/SynchronizeStrings.sh (modified) (1 diff)
• objects/Elements/Penta.cpp (modified) (1 diff)
• objects/Elements/Tria.cpp (modified) (3 diffs)

issm/trunk/src/c/EnumDefinitions/EnumAsString.cpp

@@ -290 +290 @@
                 case WaitOnLockEnum : return "WaitOnLock";
                 case YtsEnum : return "Yts";
-                default : ISSMERROR("Enum %i not found",en);
+                default : return "unknown";
 
         }

issm/trunk/src/c/EnumDefinitions/SynchronizeStrings.sh

@@ -101 +101 @@
 #Add footer of of EnumAsString.cpp{{{1
 cat <<END >> EnumAsString.cpp
-                default : ISSMERROR("Enum %i not found",en);
+                default : return "unknown";
 
         }

issm/trunk/src/c/objects/Elements/Penta.cpp

@@ -634 +634 @@
 void  Penta::InputUpdateFromSolution(double* solution){
 
-        int analysis_type,sub_analysis_type;
-
-        /*retrive parameters: */
+        int analysis_type;
+
+        /*retreive parameters: */
         parameters->FindParam(&analysis_type,AnalysisTypeEnum);
-        parameters->FindParam(&sub_analysis_type,AnalysisTypeEnum);
 
         /*Just branch to the correct InputUpdateFromSolution generator, according to the type of analysis we are carrying out: */
         if (analysis_type==ControlAnalysisEnum){
-                
                 InputUpdateFromSolutionDiagnosticHoriz( solution);
         }
-        else if (analysis_type==DiagnosticAnalysisEnum){
-        
-                if (sub_analysis_type==HorizAnalysisEnum){
-
-                        InputUpdateFromSolutionDiagnosticHoriz( solution);
-                }
-                else if (sub_analysis_type==StokesAnalysisEnum){
-
-                        InputUpdateFromSolutionDiagnosticStokes( solution);
-                }
-                else ISSMERROR("%s%i%s\n","sub_analysis: ",sub_analysis_type," not supported yet");
-
+        else if (analysis_type==DiagnosticHorizAnalysisEnum){
+                InputUpdateFromSolutionDiagnosticHoriz( solution);
+        }
+        else if (analysis_type==DiagnosticStokesAnalysisEnum){
+                InputUpdateFromSolutionDiagnosticStokes( solution);
         }
         else if (analysis_type==SlopeAnalysisEnum){
-
                 InputUpdateFromSolutionSlopeCompute( solution);
         }
         else if (analysis_type==PrognosticAnalysisEnum){
-
                 InputUpdateFromSolutionPrognostic( solution);
         }
         else if (analysis_type==Prognostic2AnalysisEnum){
-
                 InputUpdateFromSolutionPrognostic2(solution);
         }
         else if (analysis_type==BalancedthicknessAnalysisEnum){
-
                 InputUpdateFromSolutionBalancedthickness( solution);
         }
         else if (analysis_type==Balancedthickness2AnalysisEnum){
-
                 InputUpdateFromSolutionBalancedthickness2( solution);
         }
         else if (analysis_type==BalancedvelocitiesAnalysisEnum){
-
                 InputUpdateFromSolutionBalancedvelocities( solution);
         }
         else{
-
-                ISSMERROR("%s%i%s\n","analysis: ",analysis_type," not supported yet");
+                ISSMERROR("analysis %i (%s) not supported yet",analysis_type,EnumAsString(analysis_type));
         }
 }

issm/trunk/src/c/objects/Elements/Tria.cpp

@@ -575 +575 @@
 void  Tria::InputUpdateFromSolution(double* solution){
 
-        int analysis_type,sub_analysis_type;
+        int analysis_type;
 
         /*retrive parameters: */
         parameters->FindParam(&analysis_type,AnalysisTypeEnum);
-        parameters->FindParam(&sub_analysis_type,AnalysisTypeEnum);
 
         /*Just branch to the correct InputUpdateFromSolution generator, according to the type of analysis we are carrying out: */
@@ -585 +584 @@
                 InputUpdateFromSolutionDiagnosticHoriz( solution);
         }
-        else if (analysis_type==DiagnosticAnalysisEnum){
-                if (sub_analysis_type==HorizAnalysisEnum){
-                        InputUpdateFromSolutionDiagnosticHoriz( solution);
-                }
-                else ISSMERROR("%s%i%s\n","sub_analysis: ",sub_analysis_type," not supported yet");
+        else if (analysis_type==DiagnosticHorizAnalysisEnum){
+                InputUpdateFromSolutionDiagnosticHoriz( solution);
         }
         else if (analysis_type==SlopeAnalysisEnum){
@@ -610 +606 @@
         }
         else{
-                ISSMERROR("%s%i%s\n","analysis: ",analysis_type," not supported yet");
+                ISSMERROR("analysis %i (%s) not supported yet",analysis_type,EnumAsString(analysis_type));
         }
 }