Changeset 14632

Timestamp:

04/17/13 11:23:14 (12 years ago)

Author:

Eric.Larour

Message:

CHG: moving things around to adapt new naming of petsc options to toolkits options

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (2 diffs)
• classes/FemModel.cpp (modified) (1 diff)
• modules/modules.h (modified) (1 diff)
• shared/Numerics/OptionsFromAnalysis.cpp (modified) (1 diff)
• shared/Numerics/ToolkitsOptionsFromAnalysis.cpp (moved) (moved from issm/trunk-jpl/src/c/shared/Numerics/PetscOptionsFromAnalysis.cpp ) (4 diffs)
• shared/Numerics/numerics.h (modified) (1 diff)

issm/trunk-jpl/src/c/Makefile.am

@@ -198 +198 @@
                                         ./shared/Numerics/UnitConversion.cpp\
                                         ./shared/Numerics/OptionsFromAnalysis.cpp\
+                                        ./shared/Numerics/ToolkitsOptionsFromAnalysis.cpp\
                                         ./shared/Exceptions/exceptions.h\
                                         ./shared/Exceptions/Exceptions.cpp\
@@ -728 +729 @@
                                         ./toolkits/petsc/objects/PetscVec.cpp\
                                         ./toolkits/petsc/petscincludes.h\
-                                        ./shared/Numerics/PetscOptionsFromAnalysis.cpp\
                                         ./modules/Solverx/SolverxPetsc.cpp\
                                         ./modules/Solverx/DofTypesToIndexSet.cpp

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -270 +270 @@
         this->loads->SetCurrentConfiguration(elements, loads, nodes,vertices, materials,parameters);
 
-        #ifdef _HAVE_PETSC_
-        /*take care of petsc options, that depend on this analysis type (present only after model processor)*/
-        if(this->parameters->Exist(PetscOptionsStringsEnum)){
-                PetscOptionsFromAnalysis(this->parameters,analysis_type);
-                if(VerboseSolver()) _pprintLine_("      petsc Options set for analysis type: " << EnumToStringx(analysis_type));
-        }
-        #endif
+        /*take care of toolkits options, that depend on this analysis type (present only after model processor)*/
+        if(this->parameters->Exist(ToolkitsOptionsStringsEnum)){
+                ToolkitsOptionsFromAnalysis(this->parameters,analysis_type);
+                if(VerboseSolver()) _pprintLine_("      toolkits Options set for analysis type: " << EnumToStringx(analysis_type));
+        }
 
 }

issm/trunk-jpl/src/c/modules/modules.h

@@ -69 +69 @@
 #include "./SurfaceAverageVelMisfitx/SurfaceAverageVelMisfitx.h"
 #include "./ModelProcessorx/ModelProcessorx.h"
-#include "./ParsePetscOptionsx/ParsePetscOptionsx.h"
+#include "./ParseToolkitsOptionsx/ParseToolkitsOptionsx.h"
 #include "./NodalValuex/NodalValuex.h"
 #include "./NodeConnectivityx/NodeConnectivityx.h"

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

@@ -30 +30 @@
 
         numanalyses=0;
-        parameters->FindParam(&strings,&numanalyses,PetscOptionsStringsEnum);
+        parameters->FindParam(&strings,&numanalyses,ToolkitsOptionsStringsEnum);
 
-        parameters->FindParam(&analyses,&dummy,PetscOptionsAnalysesEnum);
+        parameters->FindParam(&analyses,&dummy,ToolkitsOptionsAnalysesEnum);
 
         if(numanalyses==0)return NULL; //we did not find petsc options, don't bother.

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

@@ -1 @@
-/*!\file:  PetscOptionsFromAnalysis.cpp
- * \brief: change petsc options using analysis type and parameters
+/*!\file:  ToolkitsOptionsFromAnalysis.cpp
+ * \brief: 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
  */ 
 
@@ -13 +15 @@
 #include "../../toolkits/toolkits.h"
 
-void PetscOptionsFromAnalysis(Parameters* parameters,int analysis_type){
+void ToolkitsOptionsFromAnalysis(Parameters* parameters,int analysis_type){
 
         /*intermediary: */
@@ -21 +23 @@
         options=OptionsFromAnalysis(parameters,analysis_type);
 
-        /*now, reset the options database with this string. Taken from petsc/install/src/sys/objects/pinit.c. This 
+        /*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!: */
+
+        #ifdef _HAVE_PETSC_
 
         #if _PETSC_MAJOR_ == 2 
@@ -38 +42 @@
         #endif
 
+        #endif
+
         /*Free ressources:*/
         xDelete<char>(options);

issm/trunk-jpl/src/c/shared/Numerics/numerics.h

@@ -31 +31 @@
 void        XZvectorsToCoordinateSystem(IssmDouble *T,IssmDouble*xzvectors);
 int         cubic(IssmDouble a, IssmDouble b, IssmDouble c, IssmDouble d, double X[3], int *num);
-#ifdef _HAVE_PETSC_
-void   PetscOptionsFromAnalysis(Parameters* parameters,int analysis_type);
-#endif
+void        ToolkitsOptionsFromAnalysis(Parameters* parameters,int analysis_type);
 
 #endif //ifndef _NUMERICS_H_