OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,226 Commits 9 Branches 35 Tags
28f5eabcbcd3b8fbb5bb59f81f7989d61dfe1dea
Commit Graph

81 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
7f9a47d64c Use markup for parameter lists. 2013-03-22 11:09:38 +01:00
Atgeirr Flø Rasmussen
b32674f3ea Moved ColumnExtract and initState. 
ColumnExtract -> opm/core/grid/ and initState -> opm/core/simulator/.
 2013-03-18 12:47:23 +01:00
Atgeirr Flø Rasmussen
987aa5b6fd Further reorganising of opm-core. 
Deleted some unused code (or moved to opm-porsol), moved all code dealing with
time-of-flight to opm/core/tof, moved code for implicit transport solver to
opm/core/transport/implicit, spu_[im|ex]plicit.[ch] to opm/core/transport/minimal.
 2013-03-18 12:38:04 +01:00
Atgeirr Flø Rasmussen
2405758e2d Renamed newwells.h -> wells.h. 
Also moved implementation file to subdir.
 2013-03-18 10:33:34 +01:00
Atgeirr Flø Rasmussen
911a16e157 Reinstate correct porevolume usage. 
The porevolume at the start of the timestep should be provided to
the solver.
 2013-03-15 15:10:16 +01:00
Atgeirr Flø Rasmussen
af62639513 Bugfix: check for null ptr before use. 2013-03-15 15:02:42 +01:00
Atgeirr Flø Rasmussen
e2893a5696 Bugfix: order of arguments in function call. 2013-03-15 15:00:18 +01:00
Atgeirr Flø Rasmussen
8c47ad970f Removed unneeded simulator class, renamed a simulator. 2013-03-15 14:22:26 +01:00
Atgeirr Flø Rasmussen
df556f08f9 Make SimulatorIncompTwophase flexible w.r.t. transport solver. 
It can now use the reordering or the full Newton-Raphson solvers.
 2013-03-15 14:16:59 +01:00
Atgeirr Flø Rasmussen
b304105b4f Make initGravity() to private, call from constructor. 
Also modify interface of solveGravity() to be minimal,
construcing columns for segregations solver at construction time.
 2013-03-15 13:53:37 +01:00
Atgeirr Flø Rasmussen
aadae49b41 Removed unused rock compressibilty objects from interface. 2013-03-15 11:45:53 +01:00
Atgeirr Flø Rasmussen
d13fed6cab Remove unused well objects from TransportSolverTwophaseImplicit. 2013-03-15 11:38:37 +01:00
Atgeirr Flø Rasmussen
e2afd671f0 Make TransportSolverTwophaseReorder inherit TransportSolverTwophaseInterface. 
This changes the solve() interface, which requires clients to change.
 2013-03-15 11:31:31 +01:00
Atgeirr Flø Rasmussen
7f1a06cfb3 Fixed implicit transport solver interface. 
There were significant lifetime issues, now handled by moving
objects inside the class. Work in progress.
 2013-03-15 11:15:17 +01:00
Atgeirr Flø Rasmussen
7019eb2c32 Modify solve() interface, fix source term bug in implicit solver. 2013-03-15 08:21:55 +01:00
Atgeirr Flø Rasmussen
aee974ef77 Minor adjustments. 2013-03-15 08:05:23 +01:00
Atgeirr Flø Rasmussen
86b51c80b8 Modified TransportSolverTwophaseInterface::solve(), general cleanup. 
Move output arguments last in argument list.
 2013-03-14 22:51:44 +01:00
Atgeirr Flø Rasmussen
e532250867 Rename ImplicitTwoPhaseTransportSolver -> TransportSolverTwophaseImplicit. 2013-03-14 22:39:08 +01:00
Atgeirr Flø Rasmussen
d607849293 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
4ef30e694d Modified for added files and changed class names. 2013-03-14 21:43:21 +01:00
Atgeirr Flø Rasmussen
c23898efa7 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
34f523339d Adapt include statements to moved headers. 2013-03-14 10:29:42 +01:00
Atgeirr Flø Rasmussen
c2a7ce9a45 Moved writeECLData and writeVtkData to opm/core/io subdirs. 2013-03-08 08:06:18 +01:00
Atgeirr Flø Rasmussen
25867007ed Moved opm/core/eclipse/* to opm/core/io/eclipse/*. 2013-03-07 22:59:06 +01:00
Bård Skaflestad
a93532e1ce Opm::WellState::init(): Handle shut wells 
This is a minor bugfix to account for the presence of shut wells
(characterised by "ctrls[w]->current < 0").  The existing code would
lead to indexing outside the "ctrls" array in the context of a shut
well.
 2013-01-18 13:23:37 +01:00
Atgeirr Flø Rasmussen
0526657355 Document function currentDateTime(). 2012-11-26 10:49:15 +01:00
Halvor Møll Nilsen
b6301d37e0 Corrected include statements after renaming files. 2012-11-16 16:24:54 +01:00
Halvor Møll Nilsen
2003ea5887 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
aaa10cf17b 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
a30e42b962 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
Joakim Hove
43adfaeda5 Added start_date_ property to the SimulatorTimer class 2012-11-07 14:53:26 +01:00
Atgeirr Flø Rasmussen
27b8314521 Rename function argument and variable. 
rock_comp -> rock_comp_props
 2012-10-12 09:21:52 +02:00
Atgeirr Flø Rasmussen
f5359936e0 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
52d97cfc1c 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
Atgeirr Flø Rasmussen
64aab3cc49 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
66fe242280 Fix volume reporting with multiple transport substeps. 2012-10-02 15:47:21 +02:00
Atgeirr Flø Rasmussen
594d2a68da Increase output precision for ascii dumps. 2012-10-02 14:39:12 +02:00
Atgeirr Flø Rasmussen
490b8c01d1 Change interface for (blackoil) computeInjectedProduced(). 
Also use new computeInjectedProduced() and computeTransportSource()
functions in SimulatorCompressibleTwophase.
 2012-10-02 11:12:23 +02:00
Atgeirr Flø Rasmussen
7f9ea9041a Added perfPress() to WellState. 2012-10-01 16:39:35 +02:00
Atgeirr Flø Rasmussen
b90b803b80 Changed well initialization and property calculation. 
Bhp is now initialized to bhp target for bhp-controlled wells.
Mobilities and pvt properties are now calculated from
well perforation pressure and injection specifications for
injectors, producers still use cell properties as before.
 2012-09-14 09:53:11 +02:00
Atgeirr Flø Rasmussen
373f628095 Add output of surface volume. 2012-09-14 09:51:28 +02:00
Xavier Raynaud
19c7f516b1 Changed solvegravity interface. Fixed bug. 2012-09-05 10:10:02 +02:00
Xavier Raynaud
b53c983fc4 Fixed order of arguments in function call. 2012-09-04 11:39:17 +02:00
Xavier Raynaud
5aeb24433d Added missing initialization of gravity in constructor. 2012-09-03 14:55:19 +02:00
Atgeirr Flø Rasmussen
86962d6230 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	opm/core/simulator/SimulatorIncompTwophase.cpp
 2012-08-24 13:31:05 +02:00
Halvor Møll Nilsen
fd0d060ed8 Corrected typing pointed out by atgeirr in respose to pullrequest 2012-08-24 12:52:41 +02:00
Halvor Møll Nilsen
bf082c57b6 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	opm/core/simulator/SimulatorIncompTwophase.cpp
 2012-08-24 12:26:27 +02:00
Atgeirr Flø Rasmussen
af5cc531ef 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
26149c30a2 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
bab4f8cb57 Fixed renormalization conditions. 2012-08-23 14:05:28 +02:00