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

Moved compressedToCartesian() to its own file.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2015-09-15 14:13:58 +02:00
parent 65e6fe79cd
commit f2c6344d04
3 changed files with 55 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists_files.cmake
View File

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

20
opm/core/props/BlackoilPropertiesFromDeck.cpp
View File

@ -21,31 +21,13 @@
#include <opm/core/props/BlackoilPropertiesFromDeck.hpp>
#include <opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp>
#include <opm/core/utility/parameters/ParameterGroup.hpp>
#include <opm/core/utility/compressedToCartesian.hpp>
#include <vector>
#include <numeric>
namespace Opm
{
namespace
{
// Construct explicit mapping from active/compressed to logical cartesian
// indices, either as given in global_cell or as { 0, 1, 2, ....} if null.
std::vector<int> compressedToCartesian(const int num_cells,
const int* global_cell)
{
std::vector<int> retval;
if (global_cell) {
retval.assign(global_cell, global_cell + num_cells);
} else {
retval.resize(num_cells);
std::iota(retval.begin(), retval.end(), 0);
}
return retval;
}
} // anonymous namespace
BlackoilPropertiesFromDeck::BlackoilPropertiesFromDeck(Opm::DeckConstPtr deck,
Opm::EclipseStateConstPtr eclState,
const UnstructuredGrid& grid,

53
opm/core/utility/compressedToCartesian.hpp Normal file
View File

@ -0,0 +1,53 @@
/*
Copyright 2015 SINTEF ICT, Applied Mathematics.
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_COMPRESSEDTOCARTESIAN_HEADER_INCLUDED
#define OPM_COMPRESSEDTOCARTESIAN_HEADER_INCLUDED
#include <vector>
#include <numeric>
namespace Opm
{
// Construct explicit mapping from active/compressed to logical cartesian
// indices, either as given in global_cell or as { 0, 1, 2, ....} if null.
// \param[in] num_cells The number of active cells.
// \param[in] global_cell Either null, or an array of size num_cells.
// \return A vector containing the same data as global_cell,
// or the sequence { 0, 1, ... , num_cells - 1 } if
// global_cell was null.
inline
std::vector<int> compressedToCartesian(const int num_cells,
const int* global_cell)
{
std::vector<int> retval;
if (global_cell) {
retval.assign(global_cell, global_cell + num_cells);
} else {
retval.resize(num_cells);
std::iota(retval.begin(), retval.end(), 0);
}
return retval;
}
} // namespace Opm
#endif // OPM_COMPRESSEDTOCARTESIAN_HEADER_INCLUDED