From aff1ed1758d6d7f2c8bb0ff484b465ff4f6a279c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A5rd=20Skaflestad?= Date: Thu, 8 Dec 2011 13:48:16 +0100 Subject: [PATCH] Incorporate OPMTransport into OPM core library directory structure. --- {examples => opmcore/linalg}/call_umfpack.c | 0 {examples => opmcore/linalg}/call_umfpack.h | 0 src/CSRMatrixUmfpackSolver.hpp | 68 --------------------- 3 files changed, 68 deletions(-) rename {examples => opmcore/linalg}/call_umfpack.c (100%) rename {examples => opmcore/linalg}/call_umfpack.h (100%) delete mode 100644 src/CSRMatrixUmfpackSolver.hpp diff --git a/examples/call_umfpack.c b/opmcore/linalg/call_umfpack.c similarity index 100% rename from examples/call_umfpack.c rename to opmcore/linalg/call_umfpack.c diff --git a/examples/call_umfpack.h b/opmcore/linalg/call_umfpack.h similarity index 100% rename from examples/call_umfpack.h rename to opmcore/linalg/call_umfpack.h diff --git a/src/CSRMatrixUmfpackSolver.hpp b/src/CSRMatrixUmfpackSolver.hpp deleted file mode 100644 index daaf836a0..000000000 --- a/src/CSRMatrixUmfpackSolver.hpp +++ /dev/null @@ -1,68 +0,0 @@ -/*=========================================================================== -// -// File: CSRMatrixUmfpackSolver.hpp -// -// Created: 2011-10-03 17:27:26+0200 -// -// Authors: Ingeborg S. Ligaarden -// Jostein R. Natvig -// Halvor M. Nilsen -// Atgeirr F. Rasmussen -// Bård Skaflestad -// -//==========================================================================*/ - - -/* - Copyright 2011 SINTEF ICT, Applied Mathematics. - Copyright 2011 Statoil ASA. - - This file is part of the Open Porous Media Project (OPM). - - OPM is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OPM is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with OPM. If not, see . -*/ - -#ifndef OPM_CSRMATRIXUMFPACKSOLVER_HPP_HEADER -#define OPM_CSRMATRIXUMFPACKSOLVER_HPP_HEADER - -#include - -namespace Opm { - namespace ImplicitTransportLinAlgSupport { - class CSRMatrixUmfpackSolver { - public: - template - void - solve(const struct CSRMatrix* A, - const Vector b, - Vector x) { - - call_UMFPACK(const_cast(A), - b, x); - } - - template - void - solve(const struct CSRMatrix& A, - const Vector& b, - Vector& x) { - - call_UMFPACK(const_cast(&A), - &b[0], &x[0]); - } - }; - } -} - -#endif /* OPM_CSRMATRIXUMFPACKSOLVER_HPP_HEADER */