OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-16 20:24:48 -06:00
Code Issues Packages Projects Releases Wiki Activity
68 Commits 24 Branches 102 Tags 90 MiB
fb09c4b7a1
Commit Graph

68 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen
fb09c4b7a1 Modify solve() interface, fix source term bug in implicit solver. 2013-03-15 08:21:55 +01:00
Atgeirr Flø Rasmussen
3b1346173e Minor adjustments. 2013-03-15 08:05:23 +01:00
Atgeirr Flø Rasmussen
1868285f23 Modified TransportSolverTwophaseInterface::solve(), general cleanup. 
Move output arguments last in argument list.
 2013-03-14 22:51:44 +01:00
Atgeirr Flø Rasmussen
2b4cb11ebc Rename ImplicitTwoPhaseTransportSolver -> TransportSolverTwophaseImplicit. 2013-03-14 22:39:08 +01:00
Atgeirr Flø Rasmussen
d4f5338358 Rename TwoPhaseTransportSolver -> TransportSolverTwophaseInterface. 
To be more consistent with naming practices elsewhere in opm-core.
 2013-03-14 22:24:36 +01:00
Atgeirr Flø Rasmussen
1106538d85 Merge remote-tracking branch 'hnil/hnil_class' into combined. 
Conflicts:
	CMakeLists.txt
	examples/sim_wateroil.cpp
	opm/core/grid/cpgpreprocess/geometry.c
	opm/core/transport/reorder/ReorderSolverInterface.hpp
	opm/core/transport/reorder/TofDiscGalReorder.cpp
	opm/core/transport/reorder/TofDiscGalReorder.hpp
	opm/core/transport/reorder/TofReorder.cpp
	opm/core/transport/reorder/TofReorder.hpp
	opm/core/transport/reorder/TransportSolverCompressibleTwophaseReorder.cpp
	opm/core/transport/reorder/TransportSolverTwophaseReorder.cpp
 2013-03-14 16:18:39 +01:00
Atgeirr Flø Rasmussen
6127afc1c6 Adapt include statements to moved headers. 2013-03-14 10:29:42 +01:00
Atgeirr Flø Rasmussen
2d871c1402 Moved writeECLData and writeVtkData to opm/core/io subdirs. 2013-03-08 08:06:18 +01:00
Halvor Møll Nilsen
772aae6a62 Corrected include statements after renaming files. 2012-11-16 16:24:54 +01:00
Halvor Møll Nilsen
523ca56ef1 Changes needed to for makeing a simulator using ImplicitTransport. Several changes in names to highlight what is reorder simulator classes 2012-11-16 13:38:03 +01:00
Halvor Møll Nilsen
c090eb618b Added wrapper in code in separate file. Continued to change ../simulator/SimulatorIncompTwophase.cpp 2012-11-15 15:01:12 +01:00
Halvor Møll Nilsen
6c666f90a8 Changes to try to make naming and classes more consistent. This is a start to make devide models and tranport solvers so that VE models is more easely handled 2012-11-15 13:20:49 +01:00
Bård Skaflestad
77fbdcf8d3 Merge branch 'ert' 2012-10-12 14:50:23 +02:00
Bård Skaflestad
0b86366e8e Merge remote-tracking branch 'origin/ert' into ert 
Conflicts:
	Makefile.am
 2012-10-12 11:04:20 +02:00
Atgeirr Flø Rasmussen
b9fc9896d3 Rename function argument and variable. 
rock_comp -> rock_comp_props
 2012-10-12 09:21:52 +02:00
Atgeirr Flø Rasmussen
280590a012 Bugfix: order of function arguments. 
Order of arguments for computePhaseFlowRatesPerWell() was wrong.
This fix was done previously for SimulatorCompressibleTwophase,
but the incompressible sim was ignored.

Also added an ASSERT that may help catch some misuse.
 2012-10-10 14:09:09 +02:00
Atgeirr Flø Rasmussen
2fbdf9bd0a Fix order of arguments in function call. 
Rate and fractional flow were switched in call
to computePhaseFlowRatesPerWell().
 2012-10-08 14:26:46 +02:00
Bård Skaflestad
0134c4bada Merge remote-tracking branch 'upstream/master' 2012-10-02 20:30:13 +02:00
Bård Skaflestad
e169273b50 Merge remote-tracking branch 'upstream/master' 2012-10-02 19:30:31 +02:00
Atgeirr Flø Rasmussen
7fd95d7333 Fix mass balance reporting. 
Multiple issues:
  - now reporting surface volumes, not reservoir volumes,
  - fixed reporting for the case of multiple transport steps.
 2012-10-02 15:47:47 +02:00
Atgeirr Flø Rasmussen
e9b2fc0ac9 Fix volume reporting with multiple transport substeps. 2012-10-02 15:47:21 +02:00
Atgeirr Flø Rasmussen
69f8d98f8f Increase output precision for ascii dumps. 2012-10-02 14:39:12 +02:00
Atgeirr Flø Rasmussen
bcc03ef41d Change interface for (blackoil) computeInjectedProduced(). 
Also use new computeInjectedProduced() and computeTransportSource()
functions in SimulatorCompressibleTwophase.
 2012-10-02 11:12:23 +02:00
Bård Skaflestad
b314f4ed3a Merge remote-tracking branch 'upstream/master' 2012-09-19 15:32:43 +02:00
Atgeirr Flø Rasmussen
d74f0a9c52 Add output of surface volume. 2012-09-14 09:51:28 +02:00
Bård Skaflestad
0c092be788 Merge remote-tracking branch 'upstream/master' 2012-09-05 19:48:21 +02:00
Xavier Raynaud
7f1a1d7e24 Merge remote-tracking branch 'upstream/master' 2012-09-05 13:35:48 +02:00
Bård Skaflestad
8b209c088f Merge remote-tracking branch 'upstream/master' 2012-09-05 11:46:54 +02:00
Xavier Raynaud
38bcaeb362 Changed solvegravity interface. Fixed bug. 2012-09-05 10:10:02 +02:00
Atgeirr Flø Rasmussen
a6d3e2eef4 Merge branch 'master' into nonuniform_fluid_tables 
Conflicts:
	Makefile.am
	opm/core/fluid/BlackoilPropertiesFromDeck.hpp
	opm/core/fluid/SaturationPropsFromDeck.cpp
	opm/core/fluid/SaturationPropsFromDeck.hpp
	opm/core/fluid/blackoil/BlackoilPvtProperties.cpp
	opm/core/fluid/blackoil/BlackoilPvtProperties.hpp
	opm/core/fluid/blackoil/SinglePvtDead.cpp

This merge combines three more-or-less orthogonal features
for saturation tables: the option to use StoneII or Simple
three-phase behaviour, the option to fit a spline or not,
and finally setting the number of samples used (if spline
fitting).

Interfaces have changed, the most top-level one being
that BlackoilPropertiesFromDeck::init() now also takes
a ParameterGroup argument.
 2012-09-04 11:42:31 +02:00
Xavier Raynaud
845c100dcd Fixed order of arguments in function call. 2012-09-04 11:39:17 +02:00
Xavier Raynaud
76e517516f Added missing initialization of gravity in constructor. 2012-09-03 14:55:19 +02:00
Xavier Raynaud
e1a5c1dc94 Removed redundant header file include. 2012-09-03 12:55:10 +02:00
Atgeirr Flø Rasmussen
77270f4a25 Added class SinglePvtDead, add parameter 'props_use_spline' to simulators. 
Recall that the class that used to be called SinglePvtDead has
been renamed to SinglePvtDeadSpline. If 'props_use_spline' is true,
that class is used (this is the default), which makes a monotone
spline that is uniformly, densely sampled. The new class simply
uses linear interpolation in the input tables.
 2012-08-27 16:48:21 +02:00
Bård Skaflestad
21be5b1387 Merge remote-tracking branch 'upstream/master' 2012-08-27 15:37:07 +02:00
Atgeirr Flø Rasmussen
ba042c7241 Minor revision, mostly whitespace cleanup and comments. 2012-08-27 09:48:06 +02:00
Bård Skaflestad
aeb878cfa1 Merge remote-tracking branch 'upstream/master' 2012-08-24 20:44:05 +02:00
Halvor Møll Nilsen
5004f3c4b9 Corrected typing pointed out by atgeirr in respose to pullrequest 2012-08-24 20:31:13 +02:00
Halvor Møll Nilsen
423b5074b5 added writing of reorder iterations for each cell 2012-08-24 20:31:13 +02:00
Atgeirr Flø Rasmussen
ac1ec3e9ac Merge remote-tracking branch 'upstream/master' 
Conflicts:
	opm/core/simulator/SimulatorIncompTwophase.cpp
 2012-08-24 13:31:05 +02:00
Halvor Møll Nilsen
0ed597fee9 Corrected typing pointed out by atgeirr in respose to pullrequest 2012-08-24 12:52:41 +02:00
Halvor Møll Nilsen
7f3cbc476a Merge remote-tracking branch 'upstream/master' 
Conflicts:
	opm/core/simulator/SimulatorIncompTwophase.cpp
 2012-08-24 12:26:27 +02:00
Atgeirr Flø Rasmussen
def904c6d6 Use the start-of-timestep pore volume in transport solver. 
This is to improve consistency with other solvers, and relates
to the expression that is converted into a finite difference when
discretising:
  (phi s) - (phi s)^0 = phi^0(s - s^0) + (phi - phi^0)s
                        ^^^^^
The above marks the spot where we now use phi^0 instead of phi.
 2012-08-23 14:58:32 +02:00
Atgeirr Flø Rasmussen
cf3511663c Fixed solveGravity(): now properly modifies surfacevolume. 
Also:
  - solveGravity() interface changed to take surface volume as a parameter,
  - gravity vector is now given in initGravity() instead of
    solveGravity(), for consistency with the incompressible solver.
 2012-08-23 14:45:23 +02:00
Atgeirr Flø Rasmussen
638eee501b Added compressible 2-phase simulator, to replace sim_wateroil.cpp. 2012-08-23 14:07:11 +02:00
Atgeirr Flø Rasmussen
4cdb2a43a3 Fixed renormalization conditions. 2012-08-23 14:05:28 +02:00
Atgeirr Flø Rasmussen
70d33843e4 Chase changes to some interfaces after merging. 2012-08-22 11:16:51 +02:00
Atgeirr Flø Rasmussen
1fc5c8988f Merge branch 'rock_comp_tpfa' 2012-08-22 11:13:16 +02:00
Atgeirr Flø Rasmussen
87e4b017ed New class SimulatorCompressibleTwophase. 2012-08-22 10:37:52 +02:00
Atgeirr Flø Rasmussen
7c313282c0 Minor comment fix. 2012-08-22 09:05:54 +02:00