Changeset 4122 for issm/trunk/src/c/objects/Elements/Beam.cpp

Timestamp:

06/22/10 15:07:16 (15 years ago)

Author:

Mathieu Morlighem

Message:

Fixed counter problem in diagnostic horiz and updated elements/loads as sub_analysis is not used anymore

File:

• issm/trunk/src/c/objects/Elements/Beam.cpp (modified) (2 diffs)

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

@@ -222 +222 @@
 void  Beam::CreateKMatrix(Mat Kgg){
 
-        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 element stiffness matrix generator, according to the type of analysis we are carrying out: */
-        if (analysis_type==DiagnosticAnalysisEnum) {
-        
-                if (sub_analysis_type==HutterAnalysisEnum) {
-
-                        CreateKMatrixDiagnosticHutter( Kgg);
-                }
-                else 
-                        ISSMERROR("%s%i%s\n","sub_analysis_type: ",sub_analysis_type," not supported yet");
+        if (analysis_type==DiagnosticHutterAnalysisEnum) {
+                CreateKMatrixDiagnosticHutter( Kgg);
         }
         else{
-                ISSMERROR("%s%i%s\n","analysis: ",analysis_type," not supported yet");
+                ISSMERROR("analysis %i (%s) not supported yet",analysis_type,EnumAsString(analysis_type));
         }
 
@@ -306 +299 @@
         
         /*Just branch to the correct load generator, according to the type of analysis we are carrying out: */
-        if (analysis_type==DiagnosticAnalysisEnum) {
-                if (sub_analysis_type==HutterAnalysisEnum) {
-                        CreatePVectorDiagnosticHutter( pg);
-                }
-                else
-                        ISSMERROR("%s%i%s"," analysis ",analysis_type," not supported yet");
+        if (analysis_type==DiagnosticHutterAnalysisEnum) {
+                CreatePVectorDiagnosticHutter( pg);
         }
         else{
-                ISSMERROR("%s%i%s"," analysis ",analysis_type," not supported yet");
+                ISSMERROR("analysis %i (%s) not supported yet",analysis_type,EnumAsString(analysis_type));
         }