Changeset 14633 for issm/trunk-jpl/src/c/shared/Numerics/ToolkitsOptionsFromAnalysis.cpp

Timestamp:

04/17/13 14:15:21 (12 years ago)

Author:

Eric.Larour

Message:

CHG: new ToolkitOptions static class variable, used to drive a lot of the Matrix, Vector and Solver
structures, akin to the Petsc Options database.

File:

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

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

@@ -1 +1 @@
 /*!\file:  ToolkitsOptionsFromAnalysis.cpp
- * \brief: this is mainly for the case where we run our toolkits using petsc. In this case, we need to 
+ * \brief: for each analysis, setup the issmoptions string. 
+ * This is mainly for the case where we run our toolkits using petsc. In this case, we need to 
  * plug our toolkits options directly into the petsc options database. This is the case for each analysis type 
  * and parameters
@@ -11 +12 @@
 #endif
 
-#include "../../classes/objects/objects.h"
+#include "../../classes/classes.h"
 #include "../../Container/Parameters.h"
 #include "../../toolkits/toolkits.h"
@@ -17 +18 @@
 void ToolkitsOptionsFromAnalysis(Parameters* parameters,int analysis_type){
 
-        /*intermediary: */
         char* options=NULL;
-
+        
         /*Recover first the options string for this analysis: */
         options=OptionsFromAnalysis(parameters,analysis_type);
 
-        /*now, reset the petsc options database with this string. Taken from petsc/install/src/sys/objects/pinit.c. This 
-         *capability is not covered by Petsc!: */
+        /*Initialize our Toolkit Options: */
+        ToolkitOptions::Init(options);
 
         #ifdef _HAVE_PETSC_
+                /*In case we are using PETSC, we do not rely on issmoptions. Instead, we dump issmoptions into the Petsc 
+                 * options database: */
 
-        #if _PETSC_MAJOR_ == 2 
-        PetscOptionsDestroy();
-        PetscOptionsCreate();
-        //PetscOptionsCheckInitial_Private();
-        //PetscOptionsCheckInitial_Components();
-        PetscOptionsSetFromOptions();
-        PetscOptionsInsertMultipleString(options); //our patch
-        #else
-        PetscOptionsSetFromOptions();
-        PetscOptionsClear();
-        //PetscOptionsSetFromOptions();
-        PetscOptionsInsertMultipleString(options); //our patch
-        #endif
+                #if _PETSC_MAJOR_ == 2 
+                PetscOptionsDestroy();
+                PetscOptionsCreate();
+                //PetscOptionsCheckInitial_Private();
+                //PetscOptionsCheckInitial_Components();
+                PetscOptionsSetFromOptions();
+                PetscOptionsInsertMultipleString(options); //our patch
+                #else
+                PetscOptionsSetFromOptions();
+                PetscOptionsClear();
+                //PetscOptionsSetFromOptions();
+                PetscOptionsInsertMultipleString(options); //our patch
+                #endif
 
         #endif
-
-        /*Free ressources:*/
+                
         xDelete<char>(options);
 }