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
5,075 Commits 24 Branches 102 Tags
dd453d3e501178d0a52da8d5a9542e80ee840fca
Commit Graph

3269 Commits

Author SHA1 Message Date
Roland Kaufmann
d3db4922b4 Subtract time spend in callbacks from total 
Since this is not time spent on the simulation itself, it is "unfair"
that this is accounted on the simulator.
 2013-05-14 11:38:09 +02:00
Roland Kaufmann
37906058f5 Notify callbacks when a timestep has completed 
Client code can do additional processing for the output of each
timestep.
 2013-05-14 11:36:13 +02:00
Roland Kaufmann
f240e79880 Make implementation class "package" visible 
Since a definition of the class is not in the header, no other
compilation units can safely access the internals of the Impl class
anyway, so it may as well be a regular struct so that the outer class
(SimulatorIncompTwophase) can access it.
 2013-05-14 11:11:18 +02:00
Andreas Lauser
a2065b4101 make config.h the first header to be included in any compile unit 
this is required for consistency amongst the compile units which are
linked into the same library and seems to be forgotten quite
frequently.
 2013-04-10 12:56:14 +02:00
Atgeirr Flø Rasmussen
7d5d314fc0 Update to match opm-core changes. 2013-03-18 13:10:32 +01:00
Atgeirr Flø Rasmussen
4fc8f52fb2 Moved ColumnExtract and initState. 
ColumnExtract -> opm/core/grid/ and initState -> opm/core/simulator/.
 2013-03-18 12:47:23 +01:00
Atgeirr Flø Rasmussen
44fa7ec920 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
e319fd1e38 Renamed newwells.h -> wells.h. 
Also moved implementation file to subdir.
 2013-03-18 10:33:34 +01:00
Atgeirr Flø Rasmussen
c16cb6987b Renames classes in line with opm-core changes. 2013-03-15 18:33:41 +01:00
Atgeirr Flø Rasmussen
04abba4d5e Adapt to changed opm-core header name. 2013-03-15 17:55:24 +01:00
Atgeirr Flø Rasmussen
e42cfc1303 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
63c7380d04 Bugfix: check for null ptr before use. 2013-03-15 15:02:42 +01:00
Atgeirr Flø Rasmussen
3a063e22d9 Bugfix: order of arguments in function call. 2013-03-15 15:00:18 +01:00
Atgeirr Flø Rasmussen
25bacfd231 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
b8ed52d89e Removed unused rock compressibilty objects from interface. 2013-03-15 11:45:53 +01:00
Atgeirr Flø Rasmussen
8a6e8fd8fa Remove unused well objects from TransportSolverTwophaseImplicit. 2013-03-15 11:38:37 +01:00
Atgeirr Flø Rasmussen
6579abb853 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
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
864cce5f5e Adapt to moved opm-core headers. 2013-03-14 13:59:31 +01:00
Atgeirr Flø Rasmussen
6127afc1c6 Adapt include statements to moved headers. 2013-03-14 10:29:42 +01:00
Atgeirr Flø Rasmussen
23cef788fc Adapt to changed include paths for some opm-core headers. 2013-03-12 11:08:33 +01:00
Atgeirr Flø Rasmussen
2d871c1402 Moved writeECLData and writeVtkData to opm/core/io subdirs. 2013-03-08 08:06:18 +01:00
Atgeirr Flø Rasmussen
ddd41bfcd7 Moved opm/core/eclipse/* to opm/core/io/eclipse/*. 2013-03-07 22:59:06 +01:00
Atgeirr Flø Rasmussen
b4d5e03c61 Add eclipse output to simulator. 
Note: so far only for incompressible fluid simulator.
 2012-11-26 11:01:23 +01:00
Atgeirr Flø Rasmussen
b6b59918e1 Suppress output of multi-cell-block sizes and #iterations. 2012-11-26 11:00:20 +01:00
Atgeirr Flø Rasmussen
f893adbda6 Document function currentDateTime(). 2012-11-26 10:49:15 +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
Joakim Hove
09b3ef785c Added start_date_ property to the SimulatorTimer class 2012-11-07 14:53:26 +01:00
Atgeirr Flø Rasmussen
bcfcfdc930 Use minimum 5 digits for step numbers in output file names. 
Was 3 digits, created trouble for certain scripts reading
the files when more than 1000 steps were taken.
 2012-11-05 15:37:14 +01:00
Atgeirr Flø Rasmussen
2b292108ad Added well management to SimulatorCompressiblePolymer. 
Another polymer-specific overload of computeFractionalFlow()
has been added in support of this (this overload deals with
compressible properties.

Also added pressure normalization for situations with arbitrary
absolute pressure.
 2012-10-15 14:23:13 +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
f5861f0cc8 Added well management to SimulatorPolymer. 
A polymer-specific overload of computeFractionalFlow()
has been added in support of this.

Also added a minor feature: pressure normalization for
situations with arbitrary absolute pressure.
 2012-10-10 23:19:35 +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
Xavier Raynaud
9cf746b0b0 Removed TAB spaces. 2012-10-08 15:00:19 +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
Xavier Raynaud
20d7cf80ea Reintroduced Newton Simple (in s, c variables). 2012-10-08 13:07:22 +02:00
Xavier Raynaud
ef053a1883 Cleaned up single cell Newton solver. 2012-10-08 10:29:45 +02:00
Atgeirr Flø Rasmussen
2f14ed70c4 Modified compressible transport src term. 
Using surface volume for injection rather than reservoir volume.
Chase change in class TransportModelCompressiblePolymer and
function computeInjectedProduced().

Also changed interface to computeInjectedProduced() to take state
rather than individual state variables.
 2012-10-04 22:32:55 +02:00
Atgeirr Flø Rasmussen
f4abfd6cbb Fix mass balance report for multi-epoch case. 
Compute initial polymer amount instead of setting it to zero.
Error obvious with multiple epochs.
 2012-10-04 20:02:34 +02:00
Atgeirr Flø Rasmussen
e13e77a7bb Simulators handle WPOLYMER keyword. 
They do this by using the class PolymerInflowFromDeck
instead of PolymerInflowBasic if there is a WPOLYMER
keyword somewhere in the deck epochs. If there is no
WPOLYMER, the parameters 'poly_start_days' etc. will
be used to construct an instance of PolymerInflowBasic
instead.
 2012-10-04 16:00:33 +02:00
Atgeirr Flø Rasmussen
f2e7c0bece Made getInflowValues() a const method. 2012-10-04 15:59:15 +02:00
Atgeirr Flø Rasmussen
0428c4abb4 Moved PolymerInflow* classes to separate file. 
Also, implemented PolymerInflowFromDeck (but not yet used).
 2012-10-04 15:15:32 +02:00