diff --git a/Common/onelabUtils.cpp b/Common/onelabUtils.cpp index a81f918f35814c852cc5cd50efb8ef0e70c9a0b0..223fcd23fec05d26766d909e1eb5a5adfbff86f3 100644 --- a/Common/onelabUtils.cpp +++ b/Common/onelabUtils.cpp @@ -399,9 +399,9 @@ namespace onelabUtils { x.setStep((x.getMax() - x.getMin()) / 100.); } if(val && isInteger){ - x.setMin((int) x.getMin()); - x.setMax((int) x.getMax()); - x.setStep((int) x.getStep()); + x.setMin((int)x.getMin()); + x.setMax((int)x.getMax()); + x.setStep((int)x.getStep()); } } } diff --git a/Solver/linearSystemPETSc.hpp b/Solver/linearSystemPETSc.hpp index 34f8ce44e679b4b6dd12b75c419f0129db708d23..02f6d48a9f627a234f641351577099e2b2f8d9ac 100644 --- a/Solver/linearSystemPETSc.hpp +++ b/Solver/linearSystemPETSc.hpp @@ -103,9 +103,10 @@ void linearSystemPETSc<scalar>::preAllocateEntries() int blockSize = _getBlockSizeFromParameters(); std::vector<int> nByRowDiag (_localSize), nByRowOffDiag (_localSize); if (_sparsity.getNbRows() == 0) { - PetscInt prealloc = std::min(300,_localSize); + PetscInt prealloc = 300; PetscBool set; PetscOptionsGetInt(PETSC_NULL, "-petsc_prealloc", &prealloc, &set); + prealloc = std::min(prealloc, _localSize); nByRowDiag.resize(0); nByRowDiag.resize(_localSize, prealloc); } else { diff --git a/benchmarks/misc/cpu.geo b/benchmarks/misc/cpu.geo new file mode 100644 index 0000000000000000000000000000000000000000..873e38e682ddeb7b6d609ddcc1344d5a5d6cbde5 --- /dev/null +++ b/benchmarks/misc/cpu.geo @@ -0,0 +1,3 @@ + +ss = Sprintf(" (CPU = %g s, Memory = %g Mb)", Cpu, Memory); +Printf( StrCat(Today, ss) );