Changeset 6020 for issm/trunk/src/c/shared/Numerics/PetscOptionsFromAnalysis.cpp

Timestamp:

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

Author:

Eric.Larour

Message:

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

File:

• issm/trunk/src/c/shared/Numerics/PetscOptionsFromAnalysis.cpp (modified) (1 diff)

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.