OilfieldToolsNet/IFEM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cosmetic change of cout messages. Activate CBLAS calls also when USE_MKL is defined

Browse Source 
git-svn-id: http://svn.sintef.no/trondheim/IFEM/trunk@879 e10b68d5-8a6e-419e-a041-bce267b0401d
This commit is contained in:
kmo 2011-03-29 15:38:12 +00:00 committed by Knut Morten Okstad
parent 768d108dc0
commit 087c8bce35
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/LinAlg/matrix.h
View File

@ -1,4 +1,4 @@
// $Id: matrix.h,v 1.32 2011-02-05 17:39:56 kmo Exp $
// $Id$
//==============================================================================
//!
//! \file matrix.h
@ -11,7 +11,8 @@
//! \details The classes have some algebraic operators defined, such that the
//! class type \a T has to be of a numerical type, i.e., \a float or \a double.
//! The multiplication methods are implemented based on the CBLAS library if
//! the macro symbol USE_CBLAS is defined. Otherwise, inlined methods are used.
//! either of the macro symbols USE_CBLAS or USE_MKL are defined.
//! Otherwise, inlined methods are used.
//!
//==============================================================================
@ -724,7 +725,7 @@ namespace utl //! General utility classes and functions.
};
#ifdef USE_CBLAS
#if defined(USE_CBLAS) || defined(USE_MKL)
//============================================================================
//=== BLAS-implementation of the matrix/vector multiplication methods ====
//============================================================================
@ -1345,9 +1346,9 @@ namespace utl //! General utility classes and functions.
template<class T> std::ostream& operator<<(std::ostream& s,
const vector<T>& X)
{
if (X.size() < 1) return s;
for (size_t i = 0; i < X.size(); i++)
if (X.size() < 1)
s <<" (empty)";
else for (size_t i = 0; i < X.size(); i++)
s << (i%nval_per_line ? ' ':'\n') << trunc(X[i]);
return s << std::endl;
@ -1361,7 +1362,8 @@ namespace utl //! General utility classes and functions.
template<class T> std::ostream& operator<<(std::ostream& s,
const matrix<T>& A)
{
if (A.rows() < 1 || A.cols() < 1) return s;
if (A.rows() < 1 || A.cols() < 1)
return s <<" (empty)"<< std::endl;
bool symm = A.isSymmetric(zero_print_tol);
for (size_t i = 1; i <= A.rows(); i++)
@ -1403,7 +1405,6 @@ namespace utl //! General utility classes and functions.
}
s <<" ];"<< std::endl;
}
};
#undef THIS

4
src/Utility/Functions.C
View File

@ -127,7 +127,7 @@ real StepXYFunc::evaluate (const Vec3& X) const
/*!
The functions is assumed on the general form
The functions are assumed on the general form
\f[ f({\bf X},t) = A * g({\bf X}) * h(t) \f]
The character string \a cline is assumed to contain first the definition
@ -244,7 +244,7 @@ const RealFunc* utl::parseRealFunc (char* cline, real A)
else if (strncmp(cline,"Step",4) == 0)
{
real xmax = atof(strtok(NULL," "));
std::cout <<"Step(t,"<< xmax <<")";
std::cout <<" * Step(t,"<< xmax <<")";
s = new StepFunc(C,xmax);
}
else if (strcmp(cline,"sin") == 0)