Changeset 12903

Timestamp:

08/04/12 09:17:13 (13 years ago)

Author:

Mathieu Morlighem

Message:

use switch instead of elseif

File:

• issm/trunk-jpl/src/c/modules/Solverx/Solverx.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/modules/Solverx/Solverx.cpp

@@ -30 +30 @@
 
         /*According to matrix type, use specific solvers: */
-        if(Kff->type==PetscMatType){
+        switch(Kff->type){
                 #ifdef _HAVE_PETSC_
-                PetscVec* uf0_vector = NULL;
-                PetscVec* df_vector  = NULL;
-                if(uf0) uf0_vector = uf0->pvector;
-                if(df)  df_vector  = df->pvector;
-
-                SolverxPetsc(&uf->pvector,Kff->pmatrix,pf->pvector,uf0_vector,df_vector,parameters);
-                #else
-                _error_("ISSM should be compiled with Petsc support for this operation!");
+                case PetscMatType:
+                        PetscVec* uf0_vector = NULL;
+                        PetscVec* df_vector  = NULL;
+                        if(uf0) uf0_vector = uf0->pvector;
+                        if(df)  df_vector  = df->pvector;
+                        SolverxPetsc(&uf->pvector,Kff->pmatrix,pf->pvector,uf0_vector,df_vector,parameters);
+                        break;
                 #endif
+                case SeqMatType:
+                        SolverxSeq(&uf->svector,Kff->smatrix,pf->svector);
+                        break
+                default:
+                          _error2_("Matrix type: " << Kff->type << " not supported yet!");
         }
-        else if(Kff->type==SeqMatType){
-                SolverxSeq(&uf->svector,Kff->smatrix,pf->svector);
-        }
-        else _error2_("Matrix type: " << Kff->type << " not supported yet!");
 
         /*Assign output pointers: */