From 90fc99298c60168f6e22e66d936eb0f70fa4bc4c Mon Sep 17 00:00:00 2001
From: Christoph Lehmann <christoph.lehmann@ufz.de>
Date: Wed, 9 Mar 2016 15:11:06 +0100
Subject: [PATCH] [T] adapted to changed matrix setter signatures
---
Tests/NumLib/ODEs.h | 42 +++++++++++++++++++++---------------------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/Tests/NumLib/ODEs.h b/Tests/NumLib/ODEs.h
index 7bf6502d6a0..c8b07dd1867 100644
--- a/Tests/NumLib/ODEs.h
+++ b/Tests/NumLib/ODEs.h
@@ -33,8 +33,8 @@ public:
void assemble(const double /*t*/, Vector const& /*x*/,
Matrix& M, Matrix& K, Vector& b) override
{
- MathLib::setMatrix(M, N, N, { 1.0, 0.0, 0.0, 1.0 });
- MathLib::setMatrix(K, N, N, { 0.0, 1.0, -1.0, 0.0 });
+ MathLib::setMatrix(M, { 1.0, 0.0, 0.0, 1.0 });
+ MathLib::setMatrix(K, { 0.0, 1.0, -1.0, 0.0 });
MathLib::setVector(b, { 0.0, 0.0 });
}
@@ -106,8 +106,8 @@ public:
void assemble(const double /*t*/, Vector const& x,
Matrix& M, Matrix& K, Vector& b) override
{
- MathLib::setMatrix(M, N, N, { 1.0 });
- MathLib::setMatrix(K, N, N, { x[0] });
+ MathLib::setMatrix(M, { 1.0 });
+ MathLib::setMatrix(K, { x[0] });
MathLib::setVector(b, { 0.0 });
}
@@ -122,7 +122,7 @@ public:
BLAS::copy(M, Jac);
BLAS::scale(Jac, dxdot_dx);
- MathLib::addToMatrix(Jac, N, N, { x[0] }); // add dK_dx
+ MathLib::addToMatrix(Jac, { x[0] }); // add dK_dx
if (dx_dx != 0.0)
{
@@ -194,13 +194,13 @@ public:
auto const z = x_curr[2];
MathLib::
- setMatrix(M, N, N, { t*y, 1.0, 0.0,
- 0.0, -t, t*y,
- omega*x*t, 0.0, omega*x });
+ setMatrix(M, { t*y, 1.0, 0.0,
+ 0.0, -t, t*y,
+ omega*x*t, 0.0, omega*x });
MathLib::
- setMatrix(K, N, N, { y, 1.0/t, -y,
- omega*omega/y, -0.5, 0.0,
- -0.5*omega*z, y/omega, -(1.0/omega/t+omega)*y*z });
+ setMatrix(K, { y, 1.0/t, -y,
+ omega*omega/y, -0.5, 0.0,
+ -0.5*omega*z, y/omega, -(1.0/omega/t+omega)*y*z });
MathLib::
setVector(b, { 0.0,
0.5/t,
@@ -241,24 +241,24 @@ public:
// add dM/dx \cdot \dot x
MathLib::
- addToMatrix(Jac, N, N, { 0.0, t*dx, 0.0,
- 0.0, t*dz, 0.0,
- omega*t*dx+omega*dz, 0.0, 0.0 });
+ addToMatrix(Jac, { 0.0, t*dx, 0.0,
+ 0.0, t*dz, 0.0,
+ omega*t*dx+omega*dz, 0.0, 0.0 });
BLAS::axpy(Jac, dx_dx, K); // add K \cdot dx_dx
// add dK/dx \cdot \dot x
MathLib::
- addToMatrix(Jac, N, N, { 0.0, x-z, 0.0,
- 0.0, -omega*omega/y/y*x, 0.0,
- 0.0, y/omega-(1.0/omega/t+omega)*z*z, // -->
- /* --> */ -0.5*omega*x - (1.0/omega/t+omega)*y*z });
+ addToMatrix(Jac, { 0.0, x-z, 0.0,
+ 0.0, -omega*omega/y/y*x, 0.0,
+ 0.0, y/omega-(1.0/omega/t+omega)*z*z, // -->
+ /* --> */ -0.5*omega*x - (1.0/omega/t+omega)*y*z });
// add -db/dx
MathLib::
- addToMatrix(Jac, N, N, { 0.0, 0.0, 0.0,
- 0.0, 0.0, 0.0,
- -0.5*omega*z, 0.0, -0.5*omega*z });
+ addToMatrix(Jac, { 0.0, 0.0, 0.0,
+ 0.0, 0.0, 0.0,
+ -0.5*omega*z, 0.0, -0.5*omega*z });
}
// Eigen::MatrixXd J(Jac.getRawMatrix());
--
GitLab