OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1194 from akva2/move_average_to_upscaling

Browse Source 
remove Average.hpp (from build system)
This commit is contained in:
Atgeirr Flø Rasmussen 2017-12-05 08:36:13 +01:00 committed by GitHub
commit 54b5910921
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists_files.cmake
View File

@ -274,7 +274,6 @@ list (APPEND PUBLIC_HEADER_FILES
opm/core/transport/reorder/TransportSolverTwophaseReorder.hpp
opm/core/transport/reorder/reordersequence.h
opm/core/transport/reorder/tarjan.h
opm/core/utility/Average.hpp
opm/core/utility/CompressedPropertyAccess.hpp
opm/core/utility/DataMap.hpp
opm/core/utility/Event.hpp

101
opm/core/utility/Average.hpp
View File

@ -1,101 +0,0 @@
//===========================================================================
//
// File: Average.hpp<2>
//
// Created: Wed Jul 1 12:25:57 2009
//
// Author(s): Atgeirr F Rasmussen <atgeirr@sintef.no>
// Bård Skaflestad <bard.skaflestad@sintef.no>
//
// $Date$
//
// $Revision$
//
//===========================================================================
/*
Copyright 2009, 2010 SINTEF ICT, Applied Mathematics.
Copyright 2009, 2010 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 <http://www.gnu.org/licenses/>.
*/
#ifndef OPM_AVERAGE_HEADER
#define OPM_AVERAGE_HEADER
#include <type_traits>
#include <cmath>
namespace Opm {
namespace utils {
/// Computes the arithmetic average:
/// a_A(t_1, t_2) = (t_1 + t_2)/2.
template <typename T, typename Tresult>
Tresult arithmeticAverage(const T& t1, const T& t2)
{
// To avoid some user errors, we disallow taking averages of
// integral values.
static_assert(std::is_integral<T>::value == false, "");
Tresult retval(t1);
retval += t2;
retval *= 0.5;
return retval;
}
/// Computes the geometric average:
/// a_G(t_1, t_2) = \sqrt{t_1 t_2}.
/// Since we use std::sqrt(), this function will only
/// compile when T is convertible to and from double.
template <typename T>
T geometricAverage(const T& t1, const T& t2)
{
// To avoid some user errors, we disallow taking averages of
// integral values.
static_assert(std::is_integral<T>::value == false, "");
if (t1*t2 <= 0)
return 0;
return std::sqrt(t1*t2);
}
/// Computes the harmonic average:
/// a_H(t_1, t_2) = \frac{2}{1/t_1 + 1/t_2} = \frac{2 t_1 t_2}{t_1 + t_2}.
template <typename T>
T harmonicAverage(const T& t1, const T& t2)
{
// To avoid some user errors, we disallow taking averages of
// integral values.
static_assert(std::is_integral<T>::value == false, "");
if (t1*t2 <= 0)
return 0;
return (2*t1*t2)/(t1 + t2);
}
} // namespace utils
} // namespace Opm
#endif // OPM_AVERAGE_HEADER