Changeset 11695 for issm/trunk-jpl/src/c/shared/Numerics/PetscOptionsFromAnalysis.cpp

Timestamp:

03/13/12 19:59:59 (13 years ago)

Author:

Eric.Larour

Message:

Completed separation of Petsc from ISSM. Matrix and Vector
are now the vehicles for Mat and Vec objects when running with
Petsc, or double* when running with a custom made type of matrix (still
to be finished).

File:

• issm/trunk-jpl/src/c/shared/Numerics/PetscOptionsFromAnalysis.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/shared/Numerics/PetscOptionsFromAnalysis.cpp

@@ -15 +15 @@
 void PetscOptionsFromAnalysis(Parameters* parameters,int analysis_type){
 
-        int     dummy;
-        double* analyses=NULL;
-        char**  strings=NULL;
-        int     numanalyses;
-        char*   string=NULL;
-        int     found=-1;
-        int     i;
+        /*intermediary: */
+        char* options=NULL;
 
-        numanalyses=0;
-        parameters->FindParam(&strings,&numanalyses,PetscOptionsStringsEnum);
-
-        #ifdef _SERIAL_ //do not take this away, because ISSM loads analyses as a Double Param instead of a DoubleVec Param  when running with only 1 analysis
-        if(numanalyses==1){ analyses=(double*)xmalloc(1*sizeof(double)); parameters->FindParam(analyses,PetscOptionsAnalysesEnum);
-        }
-        else parameters->FindParam(&analyses,&dummy,PetscOptionsAnalysesEnum);
-        #else
-        parameters->FindParam(&analyses,&dummy,PetscOptionsAnalysesEnum);
-        #endif
-
-        if(numanalyses==0)return; //we did not find petsc options, don't bother.
-
-        /*ok, go through analyses and figure out if it corresponds to our analysis_type: */
-        found=-1;
-        for(i=0;i<numanalyses;i++){
-                if (analyses[i]==analysis_type){
-                        /*found the analysis, get out of here: */
-                        found=i;
-                        break;
-                }
-        }
-        if(found==-1){
-                /*still haven't found a list of petsc options, go find the default one, for analysis type NoneAnalysisEnum: */
-                for(i=0;i<numanalyses;i++){
-                        if (analyses[i]==NoneAnalysisEnum){
-                                /*found the default analysis, get out of here: */
-                                found=i;
-                                break;
-                        }
-                }
-        }
-        if (found==-1){
-                /*ok, we did not find anything, this is not good! error out: */
-                _error_("%s%s","could find neither a default analysis  nor analysis ",EnumToStringx(analysis_type));
-        }
-
-        /*ok, grab the petsc option string: */
-        string=strings[found];
+        /*Recover first the options string for this analysis: */
+        options=OptionsFromAnalysis(parameters,analysis_type);
 
         /*now, reset the options database with this string. Taken from petsc/install/src/sys/objects/pinit.c. This 
@@ -72 +30 @@
         //PetscOptionsCheckInitial_Components();
         PetscOptionsSetFromOptions();
-        PetscOptionsInsertMultipleString(string); //our patch
+        PetscOptionsInsertMultipleString(options); //our patch
         #else
         PetscOptionsSetFromOptions();
         PetscOptionsClear();
         //PetscOptionsSetFromOptions();
-        PetscOptionsInsertMultipleString(string); //our patch
+        PetscOptionsInsertMultipleString(options); //our patch
         #endif
 
-
-        /*Free ressources*/
-        xfree((void**)&analyses);
-        for(i=0;i<numanalyses;i++){
-                string=strings[i];
-                xfree((void**)&string);
-        }
-        xfree((void**)&strings);
-
+        /*Free ressources:*/
+        xfree((void**)&options);
 }