Changeset 11466

Timestamp:

02/17/12 12:01:12 (13 years ago)

Author:

Eric.Larour

Message:

Fixed issues with the MUMPS solver. Up to now, we never checked that the MUMPS
solver had been compiled. Now added this check in Solverx.cpp.
Also worked on the default solvers if MUMPS is not available -> solver.m and model.m and ismumps.m

Location:

issm/trunk-jpl/src

Files:

• c/modules/Solverx/Solverx.cpp (modified) (1 diff)
• c/toolkits/petsc/patches/PetscOptionsDetermineSolverType.cpp (modified) (1 diff)
• m/classes/model/model.m (modified) (1 diff)
• m/classes/solver.m (modified) (1 diff)
• m/utils/OS/ismumps.m (added)

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

@@ -108 +108 @@
         #endif
         /*}}}*/
+        /*Check the solver is available: {{{1*/
+        if(solver_type==MUMPSPACKAGE_LU || solver_type==MUMPSPACKAGE_CHOL){
+        #if _PETSC_MAJOR_ >=3
+                #ifndef _HAVE_MUMPS_
+                _error_("requested MUMPS solver, which was not compiled into ISSM!\n");
+                #endif
+
+        #endif
+        }
+        /*}}}*/
         /*Prepare solver:{{{1*/
         KSPCreate(MPI_COMM_WORLD,&ksp);

issm/trunk-jpl/src/c/toolkits/petsc/patches/PetscOptionsDetermineSolverType.cpp

@@ -49 +49 @@
                 solver_type=SUPERLUDISTPACKAGE;
         }
+        if (strcmp(option,"")==0){
+                solver_type=SUPERLUDISTPACKAGE;
+        }
+
+
+        #if _PETSC_MAJOR_ >= 3 
+        PetscOptionsGetString(PETSC_NULL,"-pc_factor_mat_solver_package",&option[0],100,&flag);
+        if (strcmp(option,"mumps")==0){
+                solver_type=MUMPSPACKAGE_LU;
+        }
+        #endif
+
         
         PetscOptionsGetString(PETSC_NULL,"-issm_option_solver",&option[0],100,&flag);

issm/trunk-jpl/src/m/classes/model/model.m

@@ -404 +404 @@
                          md.settings         = settings();
                          md.solver           = solver();
-                         md.solver           = addoptions(md.solver,DiagnosticVertAnalysisEnum,mumpsoptions);
+                         if ismumps,
+                                 md.solver           = addoptions(md.solver,DiagnosticVertAnalysisEnum,mumpsoptions);
+                         else
+                                 md.solver           = addoptions(md.solver,DiagnosticVertAnalysisEnum,iluasmoptions);
+                         end
                          md.cluster          = none();
                          md.balancethickness = balancethickness();

issm/trunk-jpl/src/m/classes/solver.m

@@ -27 +27 @@
 
                          %MUMPS is the default solver
-                         obj.options={'NoneAnalysis',mumpsoptions};
+                         if ismumps,
+                                 obj.options={'NoneAnalysis',mumpsoptions};
+                         else
+                                 obj.options={'NoneAnalysis',iluasmoptions};
+                         end
 
                  end % }}}