Cosmetic fixes after icc complaints
git-svn-id: http://svn.sintef.no/trondheim/IFEM/trunk@882 e10b68d5-8a6e-419e-a041-bce267b0401d
This commit is contained in:
parent
1b4e69e5db
commit
eaafe088a0
@ -1,4 +1,4 @@
|
||||
// $Id: EigSolver.h,v 1.2 2010-03-24 12:01:36 rho Exp $
|
||||
// $Id$
|
||||
//==============================================================================
|
||||
//!
|
||||
//! \file EigSolver.h
|
||||
@ -43,6 +43,6 @@ namespace eig //! Top-level functions for invoking eigenproblem solvers.
|
||||
bool solve(SystemMatrix* A, SystemMatrix* B,
|
||||
Vector& eigVal, Matrix& eigVec, int nev, int ncv,
|
||||
int mode = 4, double shift = 0.0);
|
||||
};
|
||||
}
|
||||
|
||||
#endif
|
||||
|
@ -1,4 +1,4 @@
|
||||
// $Id: MatVec.h,v 1.9 2011-02-05 18:07:51 kmo Exp $
|
||||
// $Id$
|
||||
//==============================================================================
|
||||
//!
|
||||
//! \file MatVec.h
|
||||
@ -57,6 +57,6 @@ namespace utl
|
||||
|
||||
//! \brief Inverts the square matrix \b A.
|
||||
bool invert(Matrix& A);
|
||||
};
|
||||
}
|
||||
|
||||
#endif
|
||||
|
@ -520,8 +520,7 @@ namespace utl //! General utility classes and functions.
|
||||
|
||||
private:
|
||||
//! \brief Check dimension compatibility for matrix-vector multiplication.
|
||||
bool compatible(const std::vector<T>& X, const std::vector<T>& Y,
|
||||
bool transA) const
|
||||
bool compatible(const std::vector<T>& X, bool transA) const
|
||||
{
|
||||
if ((transA ? nrow : ncol) == X.size()) return true;
|
||||
|
||||
@ -863,7 +862,7 @@ namespace utl //! General utility classes and functions.
|
||||
std::vector<float>& Y,
|
||||
bool transA, bool addTo) const
|
||||
{
|
||||
if (!this->compatible(X,Y,transA)) return false;
|
||||
if (!this->compatible(X,transA)) return false;
|
||||
if (!addTo) Y.resize(transA ? ncol : nrow);
|
||||
|
||||
cblas_sgemv(CblasColMajor,
|
||||
@ -881,7 +880,7 @@ namespace utl //! General utility classes and functions.
|
||||
std::vector<double>& Y,
|
||||
bool transA, bool addTo) const
|
||||
{
|
||||
if (!this->compatible(X,Y,transA)) return false;
|
||||
if (!this->compatible(X,transA)) return false;
|
||||
if (!addTo) Y.resize(transA ? ncol : nrow);
|
||||
|
||||
cblas_dgemv(CblasColMajor,
|
||||
@ -1405,7 +1404,7 @@ namespace utl //! General utility classes and functions.
|
||||
}
|
||||
s <<" ];"<< std::endl;
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
#undef THIS
|
||||
#endif
|
||||
|
@ -1,4 +1,4 @@
|
||||
// $Id: SIMenums.h,v 1.3 2010-12-18 20:03:54 kmo Exp $
|
||||
// $Id$
|
||||
//==============================================================================
|
||||
//!
|
||||
//! \file SIMenums.h
|
||||
@ -40,6 +40,6 @@ namespace SIM //! Simulation scope
|
||||
RHS_ONLY,
|
||||
RECOVERY
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
#endif
|
||||
|
@ -1,4 +1,4 @@
|
||||
// $Id: CoordinateMapping.h,v 1.2 2010-10-14 20:01:55 kmo Exp $
|
||||
// $Id$
|
||||
//==============================================================================
|
||||
//!
|
||||
//! \file CoordinateMapping.h
|
||||
@ -70,6 +70,6 @@ namespace utl
|
||||
const matrix<real>& Ji, const matrix<real>& X,
|
||||
const matrix3d<real>& d2Ndu2, const matrix<real>& dNdu,
|
||||
bool computeGradient = true);
|
||||
};
|
||||
}
|
||||
|
||||
#endif
|
||||
|
@ -1,4 +1,4 @@
|
||||
// $Id: Legendre.h,v 1.2 2010-10-05 06:47:34 kmo Exp $
|
||||
// $Id$
|
||||
//==============================================================================
|
||||
//!
|
||||
//! \file Legendre.h
|
||||
@ -48,6 +48,6 @@ namespace Legendre
|
||||
//! \param[in] n Number of GLL points\polynomials
|
||||
//! \param[out] der Evaluated values
|
||||
bool basisDerivatives(int n, Matrix& der);
|
||||
};
|
||||
}
|
||||
|
||||
#endif
|
||||
|
@ -1,4 +1,4 @@
|
||||
// $Id: Utilities.h,v 1.7 2010-12-30 15:11:34 kmo Exp $
|
||||
// $Id$
|
||||
//==============================================================================
|
||||
//!
|
||||
//! \file Utilities.h
|
||||
@ -89,6 +89,6 @@ namespace utl
|
||||
void Pascal(int p, real x, real y, std::vector<real>& phi);
|
||||
//! \brief Evaluates the monomials of Pascal's triangle in 3D for order \a p.
|
||||
void Pascal(int p, real x, real y, real z, std::vector<real>& phi);
|
||||
};
|
||||
}
|
||||
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user