Changeset 6014 for issm/trunk/src/mex/Solver/Solver.cpp

Timestamp:

09/24/10 10:04:01 (14 years ago)

Author:

Eric.Larour

Message:

Commit de la mort qui tue: new way of running petsc,
where options are specified using a @petscoptions class,
which acts in a different way for each analysis_type, with
of course some defaults. This allows to change the petsc
solver on a per analysis basis.

File:

• issm/trunk/src/mex/Solver/Solver.cpp (modified) (3 diffs)

issm/trunk/src/mex/Solver/Solver.cpp

@@ -12 +12 @@
         Vec         uf0           = NULL;
         Vec         uf            = NULL;
-        char       *petscrc = NULL;
         Parameters *parameters    = NULL;
         int         verbose;
-                
+        int         analysis_type;
+        char        option[100];
+        PetscTruth  flag;
+        
         /*Matlab solver: */
         mxArray* array[2];
@@ -24 +26 @@
         /*checks on arguments on the matlab side: */
         CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&SolverUsage);
+        
+        /*parameters: */
+        FetchParams(&parameters,PARAMETERS);
+        parameters->FindParam(&verbose,VerboseEnum);
 
-        /*First, check solver string: */
-        FetchParams(&parameters,PARAMETERS);
-        parameters->FindParam(&petscrc,PetscRcEnum);
-        int verbose; parameters->FindParam(&verbose,VerboseEnum);
+        /*In serial mode, we have no set any petsc options, do it now: */
+        #ifdef _SERIAL_
+        parameters->FindParam(&analysis_type,AnalysisTypeEnum);
+        PetscOptionsFromAnalysis(parameters,analysis_type);
+        #endif
         
+        /*Retrieve solver type: */
+        PetscOptionsGetString(PETSC_NULL,"-ksp_type",&option[0],100,&flag);
+
         /*Fetch rest of data only if not running the matlab solver: */
-        if (strcmp(petscrc,matlabstring)!=0){
+        if (strcmp(option,"matlab")!=0){
+        
                 /*Input datasets: */
                 FetchData(&Kff,KFF);
                 FetchData(&pf,PF);
                 FetchData(&uf0,UF0);
-                /*Petsc solver: */
+
+                /*Core module: */
                 Solverx(&uf, Kff, pf, uf0, parameters);
+
                 /*Write output*/
                 WriteData(UF,uf);
@@ -55 +68 @@
         VecFree(&uf);
         delete parameters;
-        xfree((void**)&petscrc);
 
         MODULEEND();
+
 }