OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-25 02:30:18 -06:00
Code Issues Packages Projects Releases Wiki Activity
ba86dc191c
opm-simulators/opm/autodiff/BlackoilPropsAdFromDeck.hpp

501 lines
23 KiB
C++
Raw Normal View History

Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
/*
Copyright 2013 SINTEF ICT, Applied Mathematics.
Adds a constructor to BlackoilPropsAdFromDeck that allows copy the grid independant part. In the parallel simulator we will have to be able adress only poperties on some part of the global grid. To create thos properties we need to be able to copy the grid independant data of the properties object and resize the rest. This commit adds a construct taking a properties object for reading and a new number of cells to accomplish this.
2015-02-03 09:42:09 -06:00
Copyright 2015 Dr. Blatt - HPC-Simulation-Software & Services.
Copyright 2015 NTNU.
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
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/>.
*/
Fixed error in include guard macros. Header file started life as a copy of another header, but include guard macro was not changed. Time to go for #pragma once?
2013-05-27 15:26:52 -05:00
#ifndef OPM_BLACKOILPROPSADFROMDECK_HEADER_INCLUDED
#define OPM_BLACKOILPROPSADFROMDECK_HEADER_INCLUDED
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
#include <opm/autodiff/BlackoilPropsAdInterface.hpp>
#include <opm/autodiff/AutoDiffBlock.hpp>
make the deck from opm-parser available to the black-oil PVT property classes
2013-12-12 09:23:56 -06:00
implement multi-region PVT this requires the multi-region PVT patch for opm-core
2014-05-06 08:01:08 -05:00
#include <opm/core/props/BlackoilPhases.hpp>
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
#include <opm/core/props/satfunc/SaturationPropsFromDeck.hpp>
#include <opm/core/props/rock/RockFromDeck.hpp>
Use the shared_ptr<> from Boost. Not all implementations support the TR1, and if they do, the type might not be in a namespace called std::tr1 . Favour the implementation from Boost for reasons of portability. This is inspired (and necessitated) by commit OPM/opm-core@68eb3fb which, incidentally, cleaned up some header pollution on which we inadvertently depended.
2013-07-04 13:59:29 -05:00
make the deck from opm-parser available to the black-oil PVT property classes
2013-12-12 09:23:56 -06:00
#include <opm/parser/eclipse/Deck/Deck.hpp>
glue in support for property modifiers i.e. reading the grid properties from EclipseState instead of from the raw deck. This requires that all deck files exhibit a GRID and a SCHEDULE section or else EclipseState will throw in the constructor.
2014-06-06 07:28:40 -05:00
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
make the deck from opm-parser available to the black-oil PVT property classes
2013-12-12 09:23:56 -06:00
completely remove the EclipseGridParser from the module
2014-04-11 04:54:16 -05:00
#include <memory>
explicitly include <array> it _seems_ like this causes the build failures of the RHEL 5 build at statoil: http://opm-project.org/CDash/viewBuildError.php?buildid=18933
2014-06-09 06:22:40 -05:00
#include <array>
implement multi-region PVT this requires the multi-region PVT patch for opm-core
2014-05-06 08:01:08 -05:00
#include <vector>
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
Removes the dependency of FullyImpliciteBlackoilSolver onto UnstructuredGrid. With these changes it will be possible to use CpGrid with FIBOS except for the output routines.
2014-02-20 06:15:02 -06:00
#ifdef HAVE_DUNE_CORNERPOINT
Use new location of warning suppression header.
2014-09-20 02:28:25 -05:00
#include <opm/core/utility/platform_dependent/disable_warnings.h>
Removes the dependency of FullyImpliciteBlackoilSolver onto UnstructuredGrid. With these changes it will be possible to use CpGrid with FIBOS except for the output routines.
2014-02-20 06:15:02 -06:00
#include <dune/grid/CpGrid.hpp>
Use new location of warning suppression header.
2014-09-20 02:28:25 -05:00
#include <opm/core/utility/platform_dependent/reenable_warnings.h>
Removes the dependency of FullyImpliciteBlackoilSolver onto UnstructuredGrid. With these changes it will be possible to use CpGrid with FIBOS except for the output routines.
2014-02-20 06:15:02 -06:00
#endif
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
namespace Opm
{
implement multi-region PVT this requires the multi-region PVT patch for opm-core
2014-05-06 08:01:08 -05:00
class PvtInterface;
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
Documented BlackoilPropsAdFromDeck.
2013-09-20 07:42:12 -05:00
/// This class implements the AD-adapted fluid interface for
/// three-phase black-oil. It requires an input deck from which it
/// reads all relevant property data.
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
///
/// Most methods are available in two overloaded versions, one
/// taking a constant vector and returning the same, and one
/// taking an AD type and returning the same. Derivatives are not
/// returned separately by any method, only implicitly with the AD
/// version of the methods.
class BlackoilPropsAdFromDeck : public BlackoilPropsAdInterface
{
Adds data redistribution capabilities and makes sim_fibo_ad_cp parallel. With this commit we add the possibility to start with a global representation of a simulator that is read on each process and afterwards this presentation is redistributed among the processors together with the properties and state data needed to initialize the simulation. There still is no parallel well handling and no parallel output. But with the equilibrium example of @dr-robertk and deactivated output we can already perform parallel runs.
2015-02-05 08:05:38 -06:00
friend class BlackoilPropsDataHandle;
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
public:
use the new parser to read the PVT and grid data from the deck the old code has not yet been removed, but in the long term, this is probably the way to go.
2013-12-19 11:22:20 -06:00
/// Constructor wrapping an opm-core black oil interface.
rename "newParserDeck" to "deck"
2014-04-15 04:51:44 -05:00
BlackoilPropsAdFromDeck(Opm::DeckConstPtr deck,
glue in support for property modifiers i.e. reading the grid properties from EclipseState instead of from the raw deck. This requires that all deck files exhibit a GRID and a SCHEDULE section or else EclipseState will throw in the constructor.
2014-06-06 07:28:40 -05:00
Opm::EclipseStateConstPtr eclState,
Fixes in BlackoilPropsAdFromDeck. Now compiles.
2013-05-27 15:01:20 -05:00
const UnstructuredGrid& grid,
const bool init_rock = true );
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
Removes the dependency of FullyImpliciteBlackoilSolver onto UnstructuredGrid. With these changes it will be possible to use CpGrid with FIBOS except for the output routines.
2014-02-20 06:15:02 -06:00
#ifdef HAVE_DUNE_CORNERPOINT
/// Constructor wrapping an opm-core black oil interface.
rename "newParserDeck" to "deck"
2014-04-15 04:51:44 -05:00
BlackoilPropsAdFromDeck(Opm::DeckConstPtr deck,
glue in support for property modifiers i.e. reading the grid properties from EclipseState instead of from the raw deck. This requires that all deck files exhibit a GRID and a SCHEDULE section or else EclipseState will throw in the constructor.
2014-06-06 07:28:40 -05:00
Opm::EclipseStateConstPtr eclState,
Removes the dependency of FullyImpliciteBlackoilSolver onto UnstructuredGrid. With these changes it will be possible to use CpGrid with FIBOS except for the output routines.
2014-02-20 06:15:02 -06:00
const Dune::CpGrid& grid,
const bool init_rock = true );
#endif
Adds a constructor to BlackoilPropsAdFromDeck that allows copy the grid independant part. In the parallel simulator we will have to be able adress only poperties on some part of the global grid. To create thos properties we need to be able to copy the grid independant data of the properties object and resize the rest. This commit adds a construct taking a properties object for reading and a new number of cells to accomplish this.
2015-02-03 09:42:09 -06:00
/// \brief Constructor to create properties for a subgrid
///
/// This copies all properties that are not dependant on the
/// grid size from an existing properties object
/// and the number of cells. All properties that do not depend
/// on the grid dimension will be copied. For the rest will have
/// the correct size but the values will be undefined.
///
/// \param props The property object to copy from.
/// \paramm number_of_cells The number of cells of the subgrid.
BlackoilPropsAdFromDeck(const BlackoilPropsAdFromDeck& props,
const int number_of_cells);
Removes the dependency of FullyImpliciteBlackoilSolver onto UnstructuredGrid. With these changes it will be possible to use CpGrid with FIBOS except for the output routines.
2014-02-20 06:15:02 -06:00
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
////////////////////////////
// Rock interface //
////////////////////////////
/// \return D, the number of spatial dimensions.
int numDimensions() const;
/// \return N, the number of cells.
int numCells() const;
implement multi-region PVT this requires the multi-region PVT patch for opm-core
2014-05-06 08:01:08 -05:00
/// Return an array containing the PVT table index for each
/// grid cell
virtual const int* cellPvtRegionIndex() const
{ return &cellPvtRegionIdx_[0]; }
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
/// \return Array of N porosity values.
const double* porosity() const;
/// \return Array of ND^2 permeability values.
/// The D^2 permeability values for a cell are organized as a matrix,
/// which is symmetric (so ordering does not matter).
const double* permeability() const;
////////////////////////////
// Fluid interface //
////////////////////////////
Rename AutoDiff::ForwardBlock -> Opm::AutoDiffBlock. Also moved AutoDiffHelpers.hpp content to Opm namespace, and modified other files as required by these two changes.
2013-09-19 05:53:28 -05:00
typedef AutoDiffBlock<double> ADB;
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
typedef ADB::V V;
typedef std::vector<int> Cells;
Fixes in BlackoilPropsAdFromDeck. Now compiles.
2013-05-27 15:01:20 -05:00
/// \return Number of active phases (also the number of components).
int numPhases() const;
/// \return Object describing the active phases.
PhaseUsage phaseUsage() const;
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
// ------ Density ------
/// Densities of stock components at surface conditions.
/// \return Array of 3 density values.
implement multi-region PVT this requires the multi-region PVT patch for opm-core
2014-05-06 08:01:08 -05:00
const double* surfaceDensity(const int cellIdx = 0) const;
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
// ------ Viscosity ------
/// Water viscosity.
/// \param[in] pw Array of n water pressure values.
PVT properties: allow them to be temperature dependent Note that this patch does not introduce any real temperature dependence but only changes the APIs for the viscosity and for the density related methods. Note that I also don't like the fact that this requires so many changes to so many files, but with the current design of the property classes I cannot see a way to avoid this...
2014-11-20 05:31:50 -06:00
/// \param[in] T Array of n temperature values.
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
/// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of n viscosity values.
V muWat(const V& pw,
PVT properties: allow them to be temperature dependent Note that this patch does not introduce any real temperature dependence but only changes the APIs for the viscosity and for the density related methods. Note that I also don't like the fact that this requires so many changes to so many files, but with the current design of the property classes I cannot see a way to avoid this...
2014-11-20 05:31:50 -06:00
const V& T,
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
const Cells& cells) const;
/// Oil viscosity.
/// \param[in] po Array of n oil pressure values.
PVT properties: allow them to be temperature dependent Note that this patch does not introduce any real temperature dependence but only changes the APIs for the viscosity and for the density related methods. Note that I also don't like the fact that this requires so many changes to so many files, but with the current design of the property classes I cannot see a way to avoid this...
2014-11-20 05:31:50 -06:00
/// \param[in] T Array of n temperature values.
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
/// \param[in] rs Array of n gas solution factor values.
make the phase-presence docstring understandable for mere mortals
2013-12-04 05:08:46 -06:00
/// \param[in] cond Array of n objects, each specifying which phases are present with non-zero saturation in a cell.
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
/// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of n viscosity values.
V muOil(const V& po,
PVT properties: allow them to be temperature dependent Note that this patch does not introduce any real temperature dependence but only changes the APIs for the viscosity and for the density related methods. Note that I also don't like the fact that this requires so many changes to so many files, but with the current design of the property classes I cannot see a way to avoid this...
2014-11-20 05:31:50 -06:00
const V& T,
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
const V& rs,
Switch condition interface to phase presence facility Commit 4aa0eaf introduced density and viscosity evaluators into the BlackoilPropsAdInterface that accepted an externally assignable condition to distinguish saturated from unsaturated cases. As a result of a few low-level technical problems with that approach, this commit changes those affected interfaces to use the black-oil specific 'PhasePresence' facility of opm-core's commit a033329. Update callers accordingly.
2013-12-03 11:12:54 -06:00
const std::vector<PhasePresence>& cond,
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
const Cells& cells) const;
/// Gas viscosity.
/// \param[in] pg Array of n gas pressure values.
PVT properties: allow them to be temperature dependent Note that this patch does not introduce any real temperature dependence but only changes the APIs for the viscosity and for the density related methods. Note that I also don't like the fact that this requires so many changes to so many files, but with the current design of the property classes I cannot see a way to avoid this...
2014-11-20 05:31:50 -06:00
/// \param[in] T Array of n temperature values.
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
/// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of n viscosity values.
V muGas(const V& pg,
PVT properties: allow them to be temperature dependent Note that this patch does not introduce any real temperature dependence but only changes the APIs for the viscosity and for the density related methods. Note that I also don't like the fact that this requires so many changes to so many files, but with the current design of the property classes I cannot see a way to avoid this...
2014-11-20 05:31:50 -06:00
const V& T,
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
const Cells& cells) const;
Implementation of live gas The simulator now handles live gas as well as live oil. The primary variables are Po,Sw and Rs,Rv or Sg depending on fluid condition State 1 Gas only (Undersaturated gas): Po, Sw and Rv State 2 Gas and oil: Po, Sw and Sg State 3 Oil only (Undersaturated oil): Po, Sw and Rs This commit includes: 1. New interfaces for the vapor oil/gas ratios (Rv) 2. Modifications in the equations to handle rvs 3. New definition of ADI variable to handle changing primary variables 4. Modifications in the solution updates to handle changing primary variable 5. Some changes in the appleyard process to sync with Mrsts livegas implementation. NOTE: The implementation is tested on the liveoil cases SPE1 and a simplified SPE9 and produces the same results as the old code. The simulator is not yet able to converge on SPE3 with livegas present. For SPE3 to converge a more robust well implementation is needed. The current simulator reproduce the results of Mrst when a similar well model is used in Mrst as is currently implemented OPM.
2014-01-10 07:19:37 -06:00
/// Oil viscosity.
/// \param[in] po Array of n oil pressure values.
PVT properties: allow them to be temperature dependent Note that this patch does not introduce any real temperature dependence but only changes the APIs for the viscosity and for the density related methods. Note that I also don't like the fact that this requires so many changes to so many files, but with the current design of the property classes I cannot see a way to avoid this...
2014-11-20 05:31:50 -06:00
/// \param[in] T Array of n temperature values.
Implementation of live gas The simulator now handles live gas as well as live oil. The primary variables are Po,Sw and Rs,Rv or Sg depending on fluid condition State 1 Gas only (Undersaturated gas): Po, Sw and Rv State 2 Gas and oil: Po, Sw and Sg State 3 Oil only (Undersaturated oil): Po, Sw and Rs This commit includes: 1. New interfaces for the vapor oil/gas ratios (Rv) 2. Modifications in the equations to handle rvs 3. New definition of ADI variable to handle changing primary variables 4. Modifications in the solution updates to handle changing primary variable 5. Some changes in the appleyard process to sync with Mrsts livegas implementation. NOTE: The implementation is tested on the liveoil cases SPE1 and a simplified SPE9 and produces the same results as the old code. The simulator is not yet able to converge on SPE3 with livegas present. For SPE3 to converge a more robust well implementation is needed. The current simulator reproduce the results of Mrst when a similar well model is used in Mrst as is currently implemented OPM.
2014-01-10 07:19:37 -06:00
/// \param[in] rv Array of n vapor oil/gas ratio
/// \param[in] cond Array of n objects, each specifying which phases are present with non-zero saturation in a cell.
/// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of n viscosity values.
V muGas(const V& po,
PVT properties: allow them to be temperature dependent Note that this patch does not introduce any real temperature dependence but only changes the APIs for the viscosity and for the density related methods. Note that I also don't like the fact that this requires so many changes to so many files, but with the current design of the property classes I cannot see a way to avoid this...
2014-11-20 05:31:50 -06:00
const V& T,
Implementation of live gas The simulator now handles live gas as well as live oil. The primary variables are Po,Sw and Rs,Rv or Sg depending on fluid condition State 1 Gas only (Undersaturated gas): Po, Sw and Rv State 2 Gas and oil: Po, Sw and Sg State 3 Oil only (Undersaturated oil): Po, Sw and Rs This commit includes: 1. New interfaces for the vapor oil/gas ratios (Rv) 2. Modifications in the equations to handle rvs 3. New definition of ADI variable to handle changing primary variables 4. Modifications in the solution updates to handle changing primary variable 5. Some changes in the appleyard process to sync with Mrsts livegas implementation. NOTE: The implementation is tested on the liveoil cases SPE1 and a simplified SPE9 and produces the same results as the old code. The simulator is not yet able to converge on SPE3 with livegas present. For SPE3 to converge a more robust well implementation is needed. The current simulator reproduce the results of Mrst when a similar well model is used in Mrst as is currently implemented OPM.
2014-01-10 07:19:37 -06:00
const V& rv,
const std::vector<PhasePresence>& cond,
const Cells& cells) const;
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
/// Water viscosity.
/// \param[in] pw Array of n water pressure values.
PVT properties: allow them to be temperature dependent Note that this patch does not introduce any real temperature dependence but only changes the APIs for the viscosity and for the density related methods. Note that I also don't like the fact that this requires so many changes to so many files, but with the current design of the property classes I cannot see a way to avoid this...
2014-11-20 05:31:50 -06:00
/// \param[in] T Array of n temperature values.
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
/// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of n viscosity values.
ADB muWat(const ADB& pw,
PVT properties: allow them to be temperature dependent Note that this patch does not introduce any real temperature dependence but only changes the APIs for the viscosity and for the density related methods. Note that I also don't like the fact that this requires so many changes to so many files, but with the current design of the property classes I cannot see a way to avoid this...
2014-11-20 05:31:50 -06:00
const ADB& T,
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
const Cells& cells) const;
/// Oil viscosity.
/// \param[in] po Array of n oil pressure values.
PVT properties: allow them to be temperature dependent Note that this patch does not introduce any real temperature dependence but only changes the APIs for the viscosity and for the density related methods. Note that I also don't like the fact that this requires so many changes to so many files, but with the current design of the property classes I cannot see a way to avoid this...
2014-11-20 05:31:50 -06:00
/// \param[in] T Array of n temperature values.
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
/// \param[in] rs Array of n gas solution factor values.
make the phase-presence docstring understandable for mere mortals
2013-12-04 05:08:46 -06:00
/// \param[in] cond Array of n objects, each specifying which phases are present with non-zero saturation in a cell.
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
/// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of n viscosity values.
ADB muOil(const ADB& po,
PVT properties: allow them to be temperature dependent Note that this patch does not introduce any real temperature dependence but only changes the APIs for the viscosity and for the density related methods. Note that I also don't like the fact that this requires so many changes to so many files, but with the current design of the property classes I cannot see a way to avoid this...
2014-11-20 05:31:50 -06:00
const ADB& T,
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
const ADB& rs,
Switch condition interface to phase presence facility Commit 4aa0eaf introduced density and viscosity evaluators into the BlackoilPropsAdInterface that accepted an externally assignable condition to distinguish saturated from unsaturated cases. As a result of a few low-level technical problems with that approach, this commit changes those affected interfaces to use the black-oil specific 'PhasePresence' facility of opm-core's commit a033329. Update callers accordingly.
2013-12-03 11:12:54 -06:00
const std::vector<PhasePresence>& cond,
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
const Cells& cells) const;
/// Gas viscosity.
/// \param[in] pg Array of n gas pressure values.
PVT properties: allow them to be temperature dependent Note that this patch does not introduce any real temperature dependence but only changes the APIs for the viscosity and for the density related methods. Note that I also don't like the fact that this requires so many changes to so many files, but with the current design of the property classes I cannot see a way to avoid this...
2014-11-20 05:31:50 -06:00
/// \param[in] T Array of n temperature values.
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
/// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of n viscosity values.
ADB muGas(const ADB& pg,
PVT properties: allow them to be temperature dependent Note that this patch does not introduce any real temperature dependence but only changes the APIs for the viscosity and for the density related methods. Note that I also don't like the fact that this requires so many changes to so many files, but with the current design of the property classes I cannot see a way to avoid this...
2014-11-20 05:31:50 -06:00
const ADB& T,
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
const Cells& cells) const;
Implementation of live gas The simulator now handles live gas as well as live oil. The primary variables are Po,Sw and Rs,Rv or Sg depending on fluid condition State 1 Gas only (Undersaturated gas): Po, Sw and Rv State 2 Gas and oil: Po, Sw and Sg State 3 Oil only (Undersaturated oil): Po, Sw and Rs This commit includes: 1. New interfaces for the vapor oil/gas ratios (Rv) 2. Modifications in the equations to handle rvs 3. New definition of ADI variable to handle changing primary variables 4. Modifications in the solution updates to handle changing primary variable 5. Some changes in the appleyard process to sync with Mrsts livegas implementation. NOTE: The implementation is tested on the liveoil cases SPE1 and a simplified SPE9 and produces the same results as the old code. The simulator is not yet able to converge on SPE3 with livegas present. For SPE3 to converge a more robust well implementation is needed. The current simulator reproduce the results of Mrst when a similar well model is used in Mrst as is currently implemented OPM.
2014-01-10 07:19:37 -06:00
/// Gas viscosity.
/// \param[in] pg Array of n gas pressure values.
PVT properties: allow them to be temperature dependent Note that this patch does not introduce any real temperature dependence but only changes the APIs for the viscosity and for the density related methods. Note that I also don't like the fact that this requires so many changes to so many files, but with the current design of the property classes I cannot see a way to avoid this...
2014-11-20 05:31:50 -06:00
/// \param[in] T Array of n temperature values.
Implementation of live gas The simulator now handles live gas as well as live oil. The primary variables are Po,Sw and Rs,Rv or Sg depending on fluid condition State 1 Gas only (Undersaturated gas): Po, Sw and Rv State 2 Gas and oil: Po, Sw and Sg State 3 Oil only (Undersaturated oil): Po, Sw and Rs This commit includes: 1. New interfaces for the vapor oil/gas ratios (Rv) 2. Modifications in the equations to handle rvs 3. New definition of ADI variable to handle changing primary variables 4. Modifications in the solution updates to handle changing primary variable 5. Some changes in the appleyard process to sync with Mrsts livegas implementation. NOTE: The implementation is tested on the liveoil cases SPE1 and a simplified SPE9 and produces the same results as the old code. The simulator is not yet able to converge on SPE3 with livegas present. For SPE3 to converge a more robust well implementation is needed. The current simulator reproduce the results of Mrst when a similar well model is used in Mrst as is currently implemented OPM.
2014-01-10 07:19:37 -06:00
/// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of n viscosity values.
ADB muGas(const ADB& pg,
PVT properties: allow them to be temperature dependent Note that this patch does not introduce any real temperature dependence but only changes the APIs for the viscosity and for the density related methods. Note that I also don't like the fact that this requires so many changes to so many files, but with the current design of the property classes I cannot see a way to avoid this...
2014-11-20 05:31:50 -06:00
const ADB& T,
Implementation of live gas The simulator now handles live gas as well as live oil. The primary variables are Po,Sw and Rs,Rv or Sg depending on fluid condition State 1 Gas only (Undersaturated gas): Po, Sw and Rv State 2 Gas and oil: Po, Sw and Sg State 3 Oil only (Undersaturated oil): Po, Sw and Rs This commit includes: 1. New interfaces for the vapor oil/gas ratios (Rv) 2. Modifications in the equations to handle rvs 3. New definition of ADI variable to handle changing primary variables 4. Modifications in the solution updates to handle changing primary variable 5. Some changes in the appleyard process to sync with Mrsts livegas implementation. NOTE: The implementation is tested on the liveoil cases SPE1 and a simplified SPE9 and produces the same results as the old code. The simulator is not yet able to converge on SPE3 with livegas present. For SPE3 to converge a more robust well implementation is needed. The current simulator reproduce the results of Mrst when a similar well model is used in Mrst as is currently implemented OPM.
2014-01-10 07:19:37 -06:00
const ADB& rv,
const std::vector<PhasePresence>& cond,
const Cells& cells) const;
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
// ------ Formation volume factor (b) ------
/// Water formation volume factor.
/// \param[in] pw Array of n water pressure values.
PVT properties: allow them to be temperature dependent Note that this patch does not introduce any real temperature dependence but only changes the APIs for the viscosity and for the density related methods. Note that I also don't like the fact that this requires so many changes to so many files, but with the current design of the property classes I cannot see a way to avoid this...
2014-11-20 05:31:50 -06:00
/// \param[in] T Array of n temperature values.
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
/// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of n formation volume factor values.
V bWat(const V& pw,
PVT properties: allow them to be temperature dependent Note that this patch does not introduce any real temperature dependence but only changes the APIs for the viscosity and for the density related methods. Note that I also don't like the fact that this requires so many changes to so many files, but with the current design of the property classes I cannot see a way to avoid this...
2014-11-20 05:31:50 -06:00
const V& T,
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
const Cells& cells) const;
/// Oil formation volume factor.
/// \param[in] po Array of n oil pressure values.
PVT properties: allow them to be temperature dependent Note that this patch does not introduce any real temperature dependence but only changes the APIs for the viscosity and for the density related methods. Note that I also don't like the fact that this requires so many changes to so many files, but with the current design of the property classes I cannot see a way to avoid this...
2014-11-20 05:31:50 -06:00
/// \param[in] T Array of n temperature values.
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
/// \param[in] rs Array of n gas solution factor values.
make the phase-presence docstring understandable for mere mortals
2013-12-04 05:08:46 -06:00
/// \param[in] cond Array of n objects, each specifying which phases are present with non-zero saturation in a cell.
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
/// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of n formation volume factor values.
V bOil(const V& po,
PVT properties: allow them to be temperature dependent Note that this patch does not introduce any real temperature dependence but only changes the APIs for the viscosity and for the density related methods. Note that I also don't like the fact that this requires so many changes to so many files, but with the current design of the property classes I cannot see a way to avoid this...
2014-11-20 05:31:50 -06:00
const V& T,
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
const V& rs,
Switch condition interface to phase presence facility Commit 4aa0eaf introduced density and viscosity evaluators into the BlackoilPropsAdInterface that accepted an externally assignable condition to distinguish saturated from unsaturated cases. As a result of a few low-level technical problems with that approach, this commit changes those affected interfaces to use the black-oil specific 'PhasePresence' facility of opm-core's commit a033329. Update callers accordingly.
2013-12-03 11:12:54 -06:00
const std::vector<PhasePresence>& cond,
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
const Cells& cells) const;
/// Gas formation volume factor.
/// \param[in] pg Array of n gas pressure values.
PVT properties: allow them to be temperature dependent Note that this patch does not introduce any real temperature dependence but only changes the APIs for the viscosity and for the density related methods. Note that I also don't like the fact that this requires so many changes to so many files, but with the current design of the property classes I cannot see a way to avoid this...
2014-11-20 05:31:50 -06:00
/// \param[in] T Array of n temperature values.
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
/// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of n formation volume factor values.
V bGas(const V& pg,
PVT properties: allow them to be temperature dependent Note that this patch does not introduce any real temperature dependence but only changes the APIs for the viscosity and for the density related methods. Note that I also don't like the fact that this requires so many changes to so many files, but with the current design of the property classes I cannot see a way to avoid this...
2014-11-20 05:31:50 -06:00
const V& T,
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
const Cells& cells) const;
Add interface for wet gas The pvt interface is extened to handle wet gas 1. A function for rvSat is added to the interface 2. An interface that takes rv and the fluid condition as an input for the gas properties is added. The old interface without rv and the fluid condition is kept in the file. 3. The new interface is implemented in BlackoilPropsAd and BlackoilPropsAdFromDeck. A simulator that tests wet gas is not yet implemented.
2013-12-13 10:01:43 -06:00
/// Gas formation volume factor.
/// \param[in] pg Array of n gas pressure values.
PVT properties: allow them to be temperature dependent Note that this patch does not introduce any real temperature dependence but only changes the APIs for the viscosity and for the density related methods. Note that I also don't like the fact that this requires so many changes to so many files, but with the current design of the property classes I cannot see a way to avoid this...
2014-11-20 05:31:50 -06:00
/// \param[in] T Array of n temperature values.
Add interface for wet gas The pvt interface is extened to handle wet gas 1. A function for rvSat is added to the interface 2. An interface that takes rv and the fluid condition as an input for the gas properties is added. The old interface without rv and the fluid condition is kept in the file. 3. The new interface is implemented in BlackoilPropsAd and BlackoilPropsAdFromDeck. A simulator that tests wet gas is not yet implemented.
2013-12-13 10:01:43 -06:00
/// \param[in] rv Array of n vapor oil/gas ratio
/// \param[in] cond Array of n objects, each specifying which phases are present with non-zero saturation in a cell.
/// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of n formation volume factor values.
V bGas(const V& pg,
PVT properties: allow them to be temperature dependent Note that this patch does not introduce any real temperature dependence but only changes the APIs for the viscosity and for the density related methods. Note that I also don't like the fact that this requires so many changes to so many files, but with the current design of the property classes I cannot see a way to avoid this...
2014-11-20 05:31:50 -06:00
const V& T,
Add interface for wet gas The pvt interface is extened to handle wet gas 1. A function for rvSat is added to the interface 2. An interface that takes rv and the fluid condition as an input for the gas properties is added. The old interface without rv and the fluid condition is kept in the file. 3. The new interface is implemented in BlackoilPropsAd and BlackoilPropsAdFromDeck. A simulator that tests wet gas is not yet implemented.
2013-12-13 10:01:43 -06:00
const V& rv,
const std::vector<PhasePresence>& cond,
const Cells& cells) const;
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
/// Water formation volume factor.
/// \param[in] pw Array of n water pressure values.
PVT properties: allow them to be temperature dependent Note that this patch does not introduce any real temperature dependence but only changes the APIs for the viscosity and for the density related methods. Note that I also don't like the fact that this requires so many changes to so many files, but with the current design of the property classes I cannot see a way to avoid this...
2014-11-20 05:31:50 -06:00
/// \param[in] T Array of n temperature values.
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
/// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of n formation volume factor values.
ADB bWat(const ADB& pw,
PVT properties: allow them to be temperature dependent Note that this patch does not introduce any real temperature dependence but only changes the APIs for the viscosity and for the density related methods. Note that I also don't like the fact that this requires so many changes to so many files, but with the current design of the property classes I cannot see a way to avoid this...
2014-11-20 05:31:50 -06:00
const ADB& T,
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
const Cells& cells) const;
/// Oil formation volume factor.
/// \param[in] po Array of n oil pressure values.
PVT properties: allow them to be temperature dependent Note that this patch does not introduce any real temperature dependence but only changes the APIs for the viscosity and for the density related methods. Note that I also don't like the fact that this requires so many changes to so many files, but with the current design of the property classes I cannot see a way to avoid this...
2014-11-20 05:31:50 -06:00
/// \param[in] T Array of n temperature values.
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
/// \param[in] rs Array of n gas solution factor values.
make the phase-presence docstring understandable for mere mortals
2013-12-04 05:08:46 -06:00
/// \param[in] cond Array of n objects, each specifying which phases are present with non-zero saturation in a cell.
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
/// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of n formation volume factor values.
ADB bOil(const ADB& po,
PVT properties: allow them to be temperature dependent Note that this patch does not introduce any real temperature dependence but only changes the APIs for the viscosity and for the density related methods. Note that I also don't like the fact that this requires so many changes to so many files, but with the current design of the property classes I cannot see a way to avoid this...
2014-11-20 05:31:50 -06:00
const ADB& T,
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
const ADB& rs,
Switch condition interface to phase presence facility Commit 4aa0eaf introduced density and viscosity evaluators into the BlackoilPropsAdInterface that accepted an externally assignable condition to distinguish saturated from unsaturated cases. As a result of a few low-level technical problems with that approach, this commit changes those affected interfaces to use the black-oil specific 'PhasePresence' facility of opm-core's commit a033329. Update callers accordingly.
2013-12-03 11:12:54 -06:00
const std::vector<PhasePresence>& cond,
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
const Cells& cells) const;
/// Gas formation volume factor.
/// \param[in] pg Array of n gas pressure values.
PVT properties: allow them to be temperature dependent Note that this patch does not introduce any real temperature dependence but only changes the APIs for the viscosity and for the density related methods. Note that I also don't like the fact that this requires so many changes to so many files, but with the current design of the property classes I cannot see a way to avoid this...
2014-11-20 05:31:50 -06:00
/// \param[in] T Array of n temperature values.
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
/// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of n formation volume factor values.
ADB bGas(const ADB& pg,
PVT properties: allow them to be temperature dependent Note that this patch does not introduce any real temperature dependence but only changes the APIs for the viscosity and for the density related methods. Note that I also don't like the fact that this requires so many changes to so many files, but with the current design of the property classes I cannot see a way to avoid this...
2014-11-20 05:31:50 -06:00
const ADB& T,
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
const Cells& cells) const;
Add interface for wet gas The pvt interface is extened to handle wet gas 1. A function for rvSat is added to the interface 2. An interface that takes rv and the fluid condition as an input for the gas properties is added. The old interface without rv and the fluid condition is kept in the file. 3. The new interface is implemented in BlackoilPropsAd and BlackoilPropsAdFromDeck. A simulator that tests wet gas is not yet implemented.
2013-12-13 10:01:43 -06:00
/// Gas formation volume factor.
/// \param[in] pg Array of n gas pressure values.
PVT properties: allow them to be temperature dependent Note that this patch does not introduce any real temperature dependence but only changes the APIs for the viscosity and for the density related methods. Note that I also don't like the fact that this requires so many changes to so many files, but with the current design of the property classes I cannot see a way to avoid this...
2014-11-20 05:31:50 -06:00
/// \param[in] T Array of n temperature values.
Add interface for wet gas The pvt interface is extened to handle wet gas 1. A function for rvSat is added to the interface 2. An interface that takes rv and the fluid condition as an input for the gas properties is added. The old interface without rv and the fluid condition is kept in the file. 3. The new interface is implemented in BlackoilPropsAd and BlackoilPropsAdFromDeck. A simulator that tests wet gas is not yet implemented.
2013-12-13 10:01:43 -06:00
/// \param[in] rv Array of n vapor oil/gas ratio
/// \param[in] cond Array of n objects, each specifying which phases are present with non-zero saturation in a cell.
/// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of n formation volume factor values.
ADB bGas(const ADB& pg,
PVT properties: allow them to be temperature dependent Note that this patch does not introduce any real temperature dependence but only changes the APIs for the viscosity and for the density related methods. Note that I also don't like the fact that this requires so many changes to so many files, but with the current design of the property classes I cannot see a way to avoid this...
2014-11-20 05:31:50 -06:00
const ADB& T,
Add interface for wet gas The pvt interface is extened to handle wet gas 1. A function for rvSat is added to the interface 2. An interface that takes rv and the fluid condition as an input for the gas properties is added. The old interface without rv and the fluid condition is kept in the file. 3. The new interface is implemented in BlackoilPropsAd and BlackoilPropsAdFromDeck. A simulator that tests wet gas is not yet implemented.
2013-12-13 10:01:43 -06:00
const ADB& rv,
const std::vector<PhasePresence>& cond,
const Cells& cells) const;
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
// ------ Rs bubble point curve ------
Fixes in BlackoilPropsAdFromDeck. Now compiles.
2013-05-27 15:01:20 -05:00
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
/// Bubble point curve for Rs as function of oil pressure.
/// \param[in] po Array of n oil pressure values.
/// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of n bubble point values for Rs.
Add interface for wet gas The pvt interface is extened to handle wet gas 1. A function for rvSat is added to the interface 2. An interface that takes rv and the fluid condition as an input for the gas properties is added. The old interface without rv and the fluid condition is kept in the file. 3. The new interface is implemented in BlackoilPropsAd and BlackoilPropsAdFromDeck. A simulator that tests wet gas is not yet implemented.
2013-12-13 10:01:43 -06:00
V rsSat(const V& po,
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
const Cells& cells) const;
/// Bubble point curve for Rs as function of oil pressure.
/// \param[in] po Array of n oil pressure values.
Support for kw VAPPARS. When this kw is active, BlackoilPropsAdFromDeck now modifies rvSat and rsSat curves cell-wise by a power of (sat_oil_cell / sat_oil_cell_historical_max). Currently, the associated jacobians do not reflect terms of type d/d_sat_oil, but code for doing this is given as comments to BlackoilPropsAdFromDeck::applyVap(ADB& r, ...).
2014-07-05 08:06:12 -05:00
/// \param[in] so Array of n oil saturation values.
/// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of n bubble point values for Rs.
V rsSat(const V& po,
const V& so,
const Cells& cells) const;
/// Bubble point curve for Rs as function of oil pressure.
/// \param[in] po Array of n oil pressure values.
/// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of n bubble point values for Rs.
ADB rsSat(const ADB& po,
const Cells& cells) const;
/// Bubble point curve for Rs as function of oil pressure.
/// \param[in] po Array of n oil pressure values.
/// \param[in] so Array of n oil saturation values.
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
/// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of n bubble point values for Rs.
Add interface for wet gas The pvt interface is extened to handle wet gas 1. A function for rvSat is added to the interface 2. An interface that takes rv and the fluid condition as an input for the gas properties is added. The old interface without rv and the fluid condition is kept in the file. 3. The new interface is implemented in BlackoilPropsAd and BlackoilPropsAdFromDeck. A simulator that tests wet gas is not yet implemented.
2013-12-13 10:01:43 -06:00
ADB rsSat(const ADB& po,
Support for kw VAPPARS. When this kw is active, BlackoilPropsAdFromDeck now modifies rvSat and rsSat curves cell-wise by a power of (sat_oil_cell / sat_oil_cell_historical_max). Currently, the associated jacobians do not reflect terms of type d/d_sat_oil, but code for doing this is given as comments to BlackoilPropsAdFromDeck::applyVap(ADB& r, ...).
2014-07-05 08:06:12 -05:00
const ADB& so,
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
const Cells& cells) const;
Fixes in BlackoilPropsAdFromDeck. Now compiles.
2013-05-27 15:01:20 -05:00
Add interface for wet gas The pvt interface is extened to handle wet gas 1. A function for rvSat is added to the interface 2. An interface that takes rv and the fluid condition as an input for the gas properties is added. The old interface without rv and the fluid condition is kept in the file. 3. The new interface is implemented in BlackoilPropsAd and BlackoilPropsAdFromDeck. A simulator that tests wet gas is not yet implemented.
2013-12-13 10:01:43 -06:00
// ------ Rv condensation curve ------
/// Condensation curve for Rv as function of oil pressure.
/// \param[in] po Array of n oil pressure values.
/// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of n bubble point values for Rs.
V rvSat(const V& po,
const Cells& cells) const;
/// Condensation curve for Rv as function of oil pressure.
/// \param[in] po Array of n oil pressure values.
Support for kw VAPPARS. When this kw is active, BlackoilPropsAdFromDeck now modifies rvSat and rsSat curves cell-wise by a power of (sat_oil_cell / sat_oil_cell_historical_max). Currently, the associated jacobians do not reflect terms of type d/d_sat_oil, but code for doing this is given as comments to BlackoilPropsAdFromDeck::applyVap(ADB& r, ...).
2014-07-05 08:06:12 -05:00
/// \param[in] so Array of n oil saturation values.
/// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of n bubble point values for Rs.
V rvSat(const V& po,
const V& so,
const Cells& cells) const;
/// Condensation curve for Rv as function of oil pressure.
/// \param[in] po Array of n oil pressure values.
/// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of n bubble point values for Rs.
ADB rvSat(const ADB& po,
const Cells& cells) const;
/// Condensation curve for Rv as function of oil pressure.
/// \param[in] po Array of n oil pressure values.
/// \param[in] so Array of n oil saturation values.
Add interface for wet gas The pvt interface is extened to handle wet gas 1. A function for rvSat is added to the interface 2. An interface that takes rv and the fluid condition as an input for the gas properties is added. The old interface without rv and the fluid condition is kept in the file. 3. The new interface is implemented in BlackoilPropsAd and BlackoilPropsAdFromDeck. A simulator that tests wet gas is not yet implemented.
2013-12-13 10:01:43 -06:00
/// \param[in] cells Array of n cell indices to be associated with the pressure values.
/// \return Array of n bubble point values for Rs.
ADB rvSat(const ADB& po,
Support for kw VAPPARS. When this kw is active, BlackoilPropsAdFromDeck now modifies rvSat and rsSat curves cell-wise by a power of (sat_oil_cell / sat_oil_cell_historical_max). Currently, the associated jacobians do not reflect terms of type d/d_sat_oil, but code for doing this is given as comments to BlackoilPropsAdFromDeck::applyVap(ADB& r, ...).
2014-07-05 08:06:12 -05:00
const ADB& so,
Add interface for wet gas The pvt interface is extened to handle wet gas 1. A function for rvSat is added to the interface 2. An interface that takes rv and the fluid condition as an input for the gas properties is added. The old interface without rv and the fluid condition is kept in the file. 3. The new interface is implemented in BlackoilPropsAd and BlackoilPropsAdFromDeck. A simulator that tests wet gas is not yet implemented.
2013-12-13 10:01:43 -06:00
const Cells& cells) const;
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
// ------ Relative permeability ------
/// Relative permeabilities for all phases.
/// \param[in] sw Array of n water saturation values.
/// \param[in] so Array of n oil saturation values.
/// \param[in] sg Array of n gas saturation values.
/// \param[in] cells Array of n cell indices to be associated with the saturation values.
/// \return An std::vector with 3 elements, each an array of n relperm values,
/// containing krw, kro, krg. Use PhaseIndex for indexing into the result.
std::vector<V> relperm(const V& sw,
const V& so,
const V& sg,
const Cells& cells) const;
/// Relative permeabilities for all phases.
/// \param[in] sw Array of n water saturation values.
/// \param[in] so Array of n oil saturation values.
/// \param[in] sg Array of n gas saturation values.
/// \param[in] cells Array of n cell indices to be associated with the saturation values.
/// \return An std::vector with 3 elements, each an array of n relperm values,
/// containing krw, kro, krg. Use PhaseIndex for indexing into the result.
std::vector<ADB> relperm(const ADB& sw,
const ADB& so,
const ADB& sg,
const Cells& cells) const;
include capillary pressure in the PDEs I'm neither sure that this is fully correct nor that I found all occurences (so far, the output writing code is missing in this patch), but it seems to work for SPE1...
2013-11-26 06:51:10 -06:00
/// Capillary pressure for all phases.
/// \param[in] sw Array of n water saturation values.
/// \param[in] so Array of n oil saturation values.
/// \param[in] sg Array of n gas saturation values.
/// \param[in] cells Array of n cell indices to be associated with the saturation values.
/// \return An std::vector with 3 elements, each an array of n capillary pressure values,
/// containing the offsets for each p_g, p_o, p_w. The capillary pressure between
/// two arbitrary phases alpha and beta is then given as p_alpha - p_beta.
std::vector<ADB> capPress(const ADB& sw,
const ADB& so,
const ADB& sg,
const Cells& cells) const;
Hysteresis. SimulatorFullyImplicitBlackoil reports saturation values at each completed time-step, allowing detection of hysteris behavior.
2014-02-18 07:50:29 -06:00
/// Saturation update for hysteresis behavior.
/// \param[in] cells Array of n cell indices to be associated with the saturation values.
void updateSatHyst(const std::vector<double>& saturation,
const std::vector<int>& cells);
include capillary pressure in the PDEs I'm neither sure that this is fully correct nor that I found all occurences (so far, the output writing code is missing in this patch), but it seems to work for SPE1...
2013-11-26 06:51:10 -06:00
Support for kw VAPPARS. When this kw is active, BlackoilPropsAdFromDeck now modifies rvSat and rsSat curves cell-wise by a power of (sat_oil_cell / sat_oil_cell_historical_max). Currently, the associated jacobians do not reflect terms of type d/d_sat_oil, but code for doing this is given as comments to BlackoilPropsAdFromDeck::applyVap(ADB& r, ...).
2014-07-05 08:06:12 -05:00
/// Update for max oil saturation.
void updateSatOilMax(const std::vector<double>& saturation);
Fix PR comments 1) swatinit() is changed to setSwatInitScaling() to make it obvious that we are modifying the props. 2) the descriptions of saturation and pc now makes more sense 3) the method is removed from the sibling class and the interface and the type of new_props is changed from BlackoilPropsAdInterface to BlackoilPropsAdFromDeck 5) The same modification is added to sim_fibo_ad_cp
2015-02-19 01:17:41 -06:00
/// Set capillary pressure scaling according to pressure diff. and initial water saturation.
/// \param[in] saturation Array of n*numPhases saturation values.
/// \param[in] pc Array of n*numPhases capillary pressure values.
void setSwatInitScaling(const std::vector<double>& saturation,
Apply the swatinit scaling to new_props The capillary pressure function in new_props is scaled to match the capillary pressure function in props. This is a temporary workaround while the simulator uses two different property object.
2015-02-18 01:23:17 -06:00
const std::vector<double>& pc);
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
private:
Removes the dependency of FullyImpliciteBlackoilSolver onto UnstructuredGrid. With these changes it will be possible to use CpGrid with FIBOS except for the output routines.
2014-02-20 06:15:02 -06:00
/// Initializes the properties.
completely remove the EclipseGridParser from the module
2014-04-11 04:54:16 -05:00
template <class CentroidIterator>
Removes the dependency of FullyImpliciteBlackoilSolver onto UnstructuredGrid. With these changes it will be possible to use CpGrid with FIBOS except for the output routines.
2014-02-20 06:15:02 -06:00
void init(Opm::DeckConstPtr deck,
glue in support for property modifiers i.e. reading the grid properties from EclipseState instead of from the raw deck. This requires that all deck files exhibit a GRID and a SCHEDULE section or else EclipseState will throw in the constructor.
2014-06-06 07:28:40 -05:00
Opm::EclipseStateConstPtr eclState,
Removes the dependency of FullyImpliciteBlackoilSolver onto UnstructuredGrid. With these changes it will be possible to use CpGrid with FIBOS except for the output routines.
2014-02-20 06:15:02 -06:00
int number_of_cells,
const int* global_cell,
const int* cart_dims,
completely remove the EclipseGridParser from the module
2014-04-11 04:54:16 -05:00
const CentroidIterator& begin_cell_centroids,
Removes the dependency of FullyImpliciteBlackoilSolver onto UnstructuredGrid. With these changes it will be possible to use CpGrid with FIBOS except for the output routines.
2014-02-20 06:15:02 -06:00
int dimension,
const bool init_rock);
completely remove the EclipseGridParser from the module
2014-04-11 04:54:16 -05:00
Support for kw VAPPARS. When this kw is active, BlackoilPropsAdFromDeck now modifies rvSat and rsSat curves cell-wise by a power of (sat_oil_cell / sat_oil_cell_historical_max). Currently, the associated jacobians do not reflect terms of type d/d_sat_oil, but code for doing this is given as comments to BlackoilPropsAdFromDeck::applyVap(ADB& r, ...).
2014-07-05 08:06:12 -05:00
/// Correction to rs/rv according to kw VAPPARS
void applyVap(V& r,
const V& so,
const std::vector<int>& cells,
const double vap) const;
void applyVap(ADB& r,
const ADB& so,
const std::vector<int>& cells,
const double vap) const;
Fix handling of multiple pvt-regions in BlackoilPropsAdFromDeck.
2015-02-23 07:05:33 -06:00
// Fills pvt_region_ with cellPvtRegionIdx_[cells].
void mapPvtRegions(const std::vector<int>& cells) const;
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
RockFromDeck rock_;
Adds a constructor to BlackoilPropsAdFromDeck that allows copy the grid independant part. In the parallel simulator we will have to be able adress only poperties on some part of the global grid. To create thos properties we need to be able to copy the grid independant data of the properties object and resize the rest. This commit adds a construct taking a properties object for reading and a new number of cells to accomplish this.
2015-02-03 09:42:09 -06:00
// This has to be a shared pointer as we must
// be able to make a copy of *this in the parallel case.
std::shared_ptr<SaturationPropsInterface> satprops_;
implement multi-region PVT this requires the multi-region PVT patch for opm-core
2014-05-06 08:01:08 -05:00
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
PhaseUsage phase_usage_;
Suppress warnings of various kinds.
2014-08-27 12:56:13 -05:00
// bool has_vapoil_;
// bool has_disgas_;
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
implement multi-region PVT this requires the multi-region PVT patch for opm-core
2014-05-06 08:01:08 -05:00
// The PVT region which is to be used for each cell
std::vector<int> cellPvtRegionIdx_;
Fixes in BlackoilPropsAdFromDeck. Now compiles.
2013-05-27 15:01:20 -05:00
Fix handling of multiple pvt-regions in BlackoilPropsAdFromDeck.
2015-02-23 07:05:33 -06:00
// Used for storing the region-per-cell array computed in calls
// to pvt functions.
mutable std::vector<int> pvt_region_;
Correct function comment.
2015-02-23 02:52:25 -06:00
// The PVT properties. One object per active fluid phase.
implement multi-region PVT this requires the multi-region PVT patch for opm-core
2014-05-06 08:01:08 -05:00
std::vector<std::shared_ptr<Opm::PvtInterface> > props_;
// The index of the PVT table which ought to be used for each
// cell. Eclipse does not seem to allow specifying fluid-phase
// specific table indices, so for the sake of simplicity, we
// don't do this either. (if it turns out that Eclipes does in
// fact support it or if it by some miracle gains this feature
// in the future, this attribute needs to become a vector of
// vectors of ints.)
std::vector<int> pvtTableIdx_;
std::vector<std::array<double, BlackoilPhases::MaxNumPhases> > densities_;
Support for kw VAPPARS. When this kw is active, BlackoilPropsAdFromDeck now modifies rvSat and rsSat curves cell-wise by a power of (sat_oil_cell / sat_oil_cell_historical_max). Currently, the associated jacobians do not reflect terms of type d/d_sat_oil, but code for doing this is given as comments to BlackoilPropsAdFromDeck::applyVap(ADB& r, ...).
2014-07-05 08:06:12 -05:00
// VAPPARS
double vap1_;
double vap2_;
std::vector<double> satOilMax_;
Guard against "too small" max saturation. This parameter might well be user configurable ...
2014-08-12 12:42:30 -05:00
double vap_satmax_guard_; //Threshold value to promote stability
Support for kw VAPPARS. When this kw is active, BlackoilPropsAdFromDeck now modifies rvSat and rsSat curves cell-wise by a power of (sat_oil_cell / sat_oil_cell_historical_max). Currently, the associated jacobians do not reflect terms of type d/d_sat_oil, but code for doing this is given as comments to BlackoilPropsAdFromDeck::applyVap(ADB& r, ...).
2014-07-05 08:06:12 -05:00
implement multi-region PVT this requires the multi-region PVT patch for opm-core
2014-05-06 08:01:08 -05:00
};
Add new interface to BlackoilPropsAdFromDeck -- not finished --
2013-05-27 07:55:32 -05:00
} // namespace Opm
Fixed error in include guard macros. Header file started life as a copy of another header, but include guard macro was not changed. Time to go for #pragma once?
2013-05-27 15:26:52 -05:00
#endif // OPM_BLACKOILPROPSADFROMDECK_HEADER_INCLUDED
Reference in New Issue Copy Permalink