OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove BlackoilSolventState

Browse Source 
The solvent saturation is added to BlackoilState and the
BlackoilSolventState is thus redundant.
This commit is contained in:
Tor Harald Sandve 2017-05-10 11:16:28 +02:00
parent b987e4b324
commit 50c1a1404a
8 changed files with 5 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists_files.cmake
View File

@ -48,7 +48,6 @@ list (APPEND MAIN_SOURCE_FILES
opm/autodiff/VFPInjProperties.cpp opm/autodiff/VFPInjProperties.cpp
opm/autodiff/WellMultiSegment.cpp opm/autodiff/WellMultiSegment.cpp
opm/autodiff/MultisegmentWells.cpp opm/autodiff/MultisegmentWells.cpp
opm/autodiff/BlackoilSolventState.cpp
opm/autodiff/MissingFeatures.cpp opm/autodiff/MissingFeatures.cpp
opm/polymer/PolymerState.cpp opm/polymer/PolymerState.cpp
opm/polymer/PolymerBlackoilState.cpp opm/polymer/PolymerBlackoilState.cpp
@ -169,7 +168,6 @@ list (APPEND PUBLIC_HEADER_FILES
opm/autodiff/BlackoilSequentialModel.hpp opm/autodiff/BlackoilSequentialModel.hpp
opm/autodiff/BlackoilSolventModel.hpp opm/autodiff/BlackoilSolventModel.hpp
opm/autodiff/BlackoilSolventModel_impl.hpp opm/autodiff/BlackoilSolventModel_impl.hpp
opm/autodiff/BlackoilSolventState.hpp
opm/autodiff/BlackoilMultiSegmentModel.hpp opm/autodiff/BlackoilMultiSegmentModel.hpp
opm/autodiff/BlackoilMultiSegmentModel_impl.hpp opm/autodiff/BlackoilMultiSegmentModel_impl.hpp
opm/autodiff/BlackoilTransportModel.hpp opm/autodiff/BlackoilTransportModel.hpp

3
opm/autodiff/BlackoilSolventModel.hpp
View File

@ -22,7 +22,6 @@
#include <opm/autodiff/BlackoilModelBase.hpp> #include <opm/autodiff/BlackoilModelBase.hpp>
#include <opm/autodiff/BlackoilModelParameters.hpp> #include <opm/autodiff/BlackoilModelParameters.hpp>
#include <opm/autodiff/BlackoilSolventState.hpp>
#include <opm/autodiff/WellStateFullyImplicitBlackoilSolvent.hpp> #include <opm/autodiff/WellStateFullyImplicitBlackoilSolvent.hpp>
#include <opm/autodiff/SolventPropsAdFromDeck.hpp> #include <opm/autodiff/SolventPropsAdFromDeck.hpp>
#include <opm/autodiff/StandardWellsSolvent.hpp> #include <opm/autodiff/StandardWellsSolvent.hpp>
@ -255,7 +254,7 @@ namespace Opm {
template <class Grid> template <class Grid>
struct ModelTraits< BlackoilSolventModel<Grid> > struct ModelTraits< BlackoilSolventModel<Grid> >
{ {
typedef BlackoilSolventState ReservoirState; typedef BlackoilState ReservoirState;
typedef WellStateFullyImplicitBlackoilSolvent WellState; typedef WellStateFullyImplicitBlackoilSolvent WellState;
typedef BlackoilModelParameters ModelParameters; typedef BlackoilModelParameters ModelParameters;
typedef BlackoilSolventSolutionState SolutionState; typedef BlackoilSolventSolutionState SolutionState;

2
opm/autodiff/BlackoilSolventModel_impl.hpp
View File

@ -135,7 +135,7 @@ namespace Opm {
// Initial solvent concentration. // Initial solvent concentration.
if (has_solvent_) { if (has_solvent_) {
const auto& solvent_saturation = x.getCellData( BlackoilSolventState::SSOL ); const auto& solvent_saturation = x.getCellData( BlackoilState::SSOL );
const int nc = solvent_saturation.size(); const int nc = solvent_saturation.size();
const V ss = Eigen::Map<const V>(solvent_saturation.data() , nc); const V ss = Eigen::Map<const V>(solvent_saturation.data() , nc);

34
opm/autodiff/BlackoilSolventState.cpp
View File

@ -1,34 +0,0 @@
/*
Copyright 2015 IRIS AS, 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/>.
*/
#include <opm/autodiff/BlackoilSolventState.hpp>
namespace Opm
{
const std::string BlackoilSolventState::SSOL = "SSOL";
BlackoilSolventState::BlackoilSolventState( int number_of_cells, int number_of_faces, int number_of_phases)
: BlackoilState( number_of_cells , number_of_faces , number_of_phases)
{
registerCellData( SSOL , 1 );
}
} // namespace Opm

46
opm/autodiff/BlackoilSolventState.hpp
View File

@ -1,46 +0,0 @@
/*
Copyright 2015 IRIS AS, 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_BLACKOILSOLVENTSTATE_HEADER_INCLUDED
#define OPM_BLACKOILSOLVENTSTATE_HEADER_INCLUDED
#include <string>
#include <opm/core/simulator/BlackoilState.hpp>
namespace Opm
{
/// Simulator state for blackoil simulator with solvent.
/// We use the Blackoil state parameters.
class BlackoilSolventState : public BlackoilState
{
public:
static const std::string SSOL;
BlackoilSolventState( int number_of_cells, int number_of_faces, int number_of_phases);
};
} // namespace Opm
#endif // OPM_BLACKOILSOLVENTSTATE_HEADER_INCLUDED

3
opm/autodiff/Compat.cpp
View File

@ -29,7 +29,6 @@
#include <opm/core/simulator/BlackoilState.hpp> #include <opm/core/simulator/BlackoilState.hpp>
#include <opm/autodiff/WellStateFullyImplicitBlackoil.hpp> #include <opm/autodiff/WellStateFullyImplicitBlackoil.hpp>
#include <opm/autodiff/WellStateFullyImplicitBlackoilDense.hpp> #include <opm/autodiff/WellStateFullyImplicitBlackoilDense.hpp>
#include <opm/autodiff/BlackoilSolventState.hpp>
#include <opm/output/data/Cells.hpp> #include <opm/output/data/Cells.hpp>
#include <opm/output/data/Solution.hpp> #include <opm/output/data/Solution.hpp>
#include <opm/output/data/Wells.hpp> #include <opm/output/data/Wells.hpp>
@ -111,7 +110,7 @@ data::Solution simToSolution( const SimulationDataContainer& reservoir,
} }
if (phases.has_solvent) { if (phases.has_solvent) {
sol.insert( "SSOL", UnitSystem::measure::identity, reservoir.getCellData( BlackoilSolventState::SSOL ) , data::TargetType::RESTART_SOLUTION ); sol.insert( "SSOL", UnitSystem::measure::identity, reservoir.getCellData( BlackoilState::SSOL ) , data::TargetType::RESTART_SOLUTION );
} }
return sol; return sol;

2
opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp
View File

@ -62,7 +62,7 @@ namespace Opm
{ {
class SimulationDataContainer; class SimulationDataContainer;
class BlackoilSolventState; class BlackoilState;
void outputStateVtk(const UnstructuredGrid& grid, void outputStateVtk(const UnstructuredGrid& grid,
const Opm::SimulationDataContainer& state, const Opm::SimulationDataContainer& state,

3
opm/autodiff/SimulatorFullyImplicitBlackoilSolvent.hpp
View File

@ -22,7 +22,6 @@
#include <opm/autodiff/SimulatorBase.hpp> #include <opm/autodiff/SimulatorBase.hpp>
#include <opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp> #include <opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp>
#include <opm/autodiff/BlackoilSolventState.hpp>
#include <opm/autodiff/BlackoilSolventModel.hpp> #include <opm/autodiff/BlackoilSolventModel.hpp>
#include <opm/core/utility/parameters/ParameterGroup.hpp> #include <opm/core/utility/parameters/ParameterGroup.hpp>
@ -85,7 +84,7 @@ namespace Opm
struct SimulatorTraits<SimulatorFullyImplicitBlackoilSolvent<GridT> > struct SimulatorTraits<SimulatorFullyImplicitBlackoilSolvent<GridT> >
{ {
typedef WellStateFullyImplicitBlackoilSolvent WellState; typedef WellStateFullyImplicitBlackoilSolvent WellState;
typedef BlackoilSolventState ReservoirState; typedef BlackoilState ReservoirState;
typedef BlackoilOutputWriter OutputWriter; typedef BlackoilOutputWriter OutputWriter;
typedef GridT Grid; typedef GridT Grid;
typedef BlackoilSolventModel<Grid> Model; typedef BlackoilSolventModel<Grid> Model;