From c46d57583848e264ae53b4ef27bd97d3ea3e2b16 Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Fri, 6 Jan 2012 09:40:32 +0100
Subject: [PATCH] some changes in programming settings for test purposes
---
SimpleTests/MatrixTests/MatMult.cpp | 2 ++
SimpleTests/MatrixTests/MatVecMultPerm.cpp | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/SimpleTests/MatrixTests/MatMult.cpp b/SimpleTests/MatrixTests/MatMult.cpp
index 6266c0365f2..c134f67459a 100644
--- a/SimpleTests/MatrixTests/MatMult.cpp
+++ b/SimpleTests/MatrixTests/MatMult.cpp
@@ -58,8 +58,10 @@ int main(int argc, char *argv[])
#ifdef _OPENMP
MathLib::CRSMatrixOpenMP<double, unsigned> mat (n, iA, jA, A, n_threads);
+ std::cout << "OpenMP matrix class used" << std::endl;
#else
MathLib::CRSMatrix<double, unsigned> mat (n, iA, jA, A);
+ std::cout << "matrix class without OpenMP used" << std::endl;
#endif
// CRSMatrixPThreads<double> mat (n, iA, jA, A, n_threads);
std::cout << mat.getNRows() << " x " << mat.getNCols() << std::endl;
diff --git a/SimpleTests/MatrixTests/MatVecMultPerm.cpp b/SimpleTests/MatrixTests/MatVecMultPerm.cpp
index b41d0fb108c..6de31351fec 100644
--- a/SimpleTests/MatrixTests/MatVecMultPerm.cpp
+++ b/SimpleTests/MatrixTests/MatVecMultPerm.cpp
@@ -131,8 +131,8 @@ int main(int argc, char *argv[])
std::cout << "done [" << cpu_timer.elapsed() << " sec cpu time], ["
<< run_timer.elapsed() << " sec run time]" << std::endl;
} else {
- if (argc == 5) {
- std::ofstream result_os (argv[4], std::ios::app);
+ if (argc == 4) {
+ std::ofstream result_os (argv[3], std::ios::app);
if (result_os) {
result_os << cpu_timer.elapsed() << "\t" << run_timer.elapsed() << std::endl;
}
--
GitLab