Changeset 6020

Timestamp:

09/24/10 10:37:02 (15 years ago)

Author:

Eric.Larour

Message:

Fixed bug with Double instead of DoubleVec Param being load for the analyses.
Some other quick fixes.

Location:

issm/trunk/src/c

Files:

• modules/Solverx/Solverx.cpp (modified) (4 diffs)
• objects/FemModel.cpp (modified) (1 diff)
• shared/Numerics/PetscOptionsFromAnalysis.cpp (modified) (1 diff)

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

@@ -30 +30 @@
         int        solver_type;
         bool       fromlocalsize    = true;
+        int        verbose;
 
 
         /*Display message*/
-        int verbose; parameters->FindParam(&verbose,VerboseEnum);
-        if (verbose) _printf_("   Solving\n");
+        parameters->FindParam(&verbose,VerboseEnum); if (verbose) _printf_("   Solving\n");
+        if(verbose)PetscOptionsPrint(stdout);
 
         /*First, check that f-set is not NULL, ie model is fully constrained: */
@@ -40 +41 @@
                 *puf=NULL; return;
         }
+        
 
         /*If initial guess for solution exists, use it to create uf, otherwise, 
@@ -80 +82 @@
         #endif
         #endif
+                
 
         /*Prepare solver*/
@@ -104 +107 @@
                 }
         }
+        
+        if(verbose)KSPView(ksp,PETSC_VIEWER_STDOUT_WORLD);
 
         /*Solve: */

issm/trunk/src/c/objects/FemModel.cpp

@@ -164 +164 @@
         PetscOptionsFromAnalysis(this->parameters,analysis_type);
 
-        verbose=1;
         if(verbose){
-                _printf_("Petsc Options set for analysis type: %s\n",EnumToString(analysis_type));
-                PetscOptionsPrint(stdout);
+                _printf_("   Petsc Options set for analysis type: %s\n",EnumToString(analysis_type));
         }
 

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

@@ -25 +25 @@
         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.