Changeset 4122 for issm/trunk/src/c/objects/Loads/Pengrid.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/Loads/Pengrid.cpp (modified) (4 diffs)

issm/trunk/src/c/objects/Loads/Pengrid.cpp

@@ -248 +248 @@
 /*Object functions*/
 /*FUNCTION Pengrid::CreateKMatrix {{{1*/
-
 void  Pengrid::CreateKMatrix(Mat Kgg){
 
@@ -406 +405 @@
 void  Pengrid::PenaltyCreateKMatrix(Mat Kgg,double kmax){
 
-        int analysis_type,sub_analysis_type;
+        int analysis_type;
 
         /*Retrieve parameters: */
         this->parameters->FindParam(&analysis_type,AnalysisTypeEnum);
-        this->parameters->FindParam(&sub_analysis_type,SubAnalysisTypeEnum);
-
-        if ((analysis_type==DiagnosticAnalysisEnum) && ((sub_analysis_type==StokesAnalysisEnum))){
-
+
+        if (analysis_type==DiagnosticStokesAnalysisEnum){
                 PenaltyCreateKMatrixDiagnosticStokes( Kgg,kmax);
         }
         else if (analysis_type==ThermalAnalysisEnum){
-                
                 PenaltyCreateKMatrixThermal( Kgg,kmax);
-                
         }
         else if (analysis_type==MeltingAnalysisEnum){
-                        
                 PenaltyCreateKMatrixMelting( Kgg,kmax);
-
         }
         else{
-                ISSMERROR("%s%i%s%i%s","analysis: ",analysis_type," and sub_analysis_type: ",sub_analysis_type," not supported yet");
+                ISSMERROR("analysis %i (%s) not supported yet",analysis_type,EnumAsString(analysis_type));
         }
 
@@ -564 +557 @@
 void  Pengrid::PenaltyCreatePVector(Vec pg,double kmax){
 
-        int analysis_type,sub_analysis_type;
+        int analysis_type;
 
         /*Retrieve parameters: */
         this->parameters->FindParam(&analysis_type,AnalysisTypeEnum);
-        this->parameters->FindParam(&sub_analysis_type,SubAnalysisTypeEnum);
 
         if (analysis_type==ThermalAnalysisEnum){
-                
                 PenaltyCreatePVectorThermal( pg,kmax);
-                
         }
         else if (analysis_type==MeltingAnalysisEnum){
-                        
                 PenaltyCreatePVectorMelting( pg,kmax);
-
-        }
-        else if (analysis_type==DiagnosticAnalysisEnum){
+        }
+        else if (analysis_type==DiagnosticStokesAnalysisEnum){
 
                 /*No loads applied, do nothing: */
@@ -587 +575 @@
         }
         else{
-                ISSMERROR("%s%i%s%i%s","analysis: ",analysis_type," and sub_analysis_type: ",sub_analysis_type," not supported yet");
+                ISSMERROR("analysis %i (%s) not supported yet",analysis_type,EnumAsString(analysis_type));
         }