Commit Graph

407 Commits

Author SHA1 Message Date
Arne Morten Kvarving
e6cad074c2 Remove adaptive time stepping and simulator timer classes and tests/examples
They have been moved to opm-simulators
2017-02-10 14:53:22 +01:00
Andreas Lauser
c5a0ea7524 do not explicitly pass the permeability to the well model anymore
this information is already part of the EclipseState. The reason why
this should IMO be avoided is that this enforces an implementation
(ordering of the permeability matrices) the simulator on the well
model. If this needs to be done for performance reasons, IMO it would
be smarter to pass an array of matrices, instead of passing a raw
array of doubles.  I doubt that this is necessary, though: completing
the full Norne deck takes about 0.25 seconds longer on my machine,
that's substantially less than 0.1% of the total runtime.

in order to avoid code duplication, the permeability extraction
function of the RockFromDeck class is now made a public static
function and used as an implementation detail of the WellsManager.

finally, the permfield_valid_ attribute is removed from the
RockFromDeck class because this data was unused and not accessible via
the class' public API.
2017-01-27 12:51:12 +01:00
Jørgen Kvalsvik
ad4033b9dc Read ROCK from EclipseState, not Deck 2016-12-20 12:24:27 +01:00
Atgeirr Flø Rasmussen
fd552926d8 Remove more files moved to opm-grid. 2016-11-30 14:29:37 +01:00
Jørgen Kvalsvik
1057e6d3d0 Update to shared_ptr-less parser interface. 2016-10-20 10:14:41 +02:00
Andreas Lauser
07707ecc30 consolidate the unit system to opm-parser
since the unit code within opm-parser is now a drop-in replacement,
this simplifies things and make them less error-prone.

unfortunately, this requires quite a few PRs. (most are pretty
trivial, though.)
2016-10-10 17:50:26 +02:00
Joakim Hove
b7bb01b77e shared_ptr<EclipseGrid> -> const EclipseGrid& 2016-09-03 17:49:46 +02:00
Pål Grønås Drange
2a773b735e transmult and initconfig are ref's, use ref for EclipseState constructor 2016-08-08 10:02:53 +02:00
Markus Blatt
dbf425411f Fix incomplete type error for std::ofstream in examples
On my system I got
```c++
error: variable ‘std::ofstream file’ has initializer but incomplete type
         std::ofstream file(fname.str().c_str());
```
This is fixed with this commit by including fstream. Previously,
this include might have happened implicitely.
2016-05-27 08:59:00 +00:00
Liu Ming
b3db61bf7e remove the prefix from raw string, using OpmLog format. 2016-05-19 10:07:36 +08:00
Liu Ming
b5e78ab1ec use StreamLog to output messages. 2016-05-19 09:48:12 +08:00
Pål Grønås Drange
973438128c Using getInputGrid API from Parser, changed GridManager to no longer accept Deck in constructor 2016-04-20 08:51:10 +02:00
Atgeirr Flø Rasmussen
78a927c859 Update CMake list with deleted files. 2016-04-14 11:29:17 +02:00
Liu Ming
88d41057c0 refactor relperm diagnostics using OpmLog functions. 2016-04-01 12:27:03 +08:00
Joakim Hove
c360079926 Replaced SimulatorState -> SimulationDatacontainer
Have removed the SimulatorState base class, and instead replaced with
the SimulationDatacontainer class from opm-common. The SimulatorState
objects were typcially created with a default constructor, and then
explicitly initialized with a SimulatorState::init() method. For the
SimulationDataContainer RAII is employed; the init( ) has been removed -
and there is no default constructor.
2016-03-29 10:44:49 +02:00
Liu Ming
81f6c2dd8e rename ParseMode as ParseContext. 2016-03-17 09:57:59 +08:00
Liu Ming
0a5be9ba52 rename ParseMode in examples folder. 2016-03-17 09:46:12 +08:00
Liu Ming
58f53cae2a make grid as template parameter. 2016-03-04 09:09:38 +08:00
Atgeirr Flø Rasmussen
a703bfbcf1 Merge pull request #958 from qilicun/rename_logfile
use standard filename for output log file.
2016-03-02 08:29:20 +01:00
Liu Ming
e12ca5a825 change .LOG to .SATFUNCLOG. 2016-03-02 14:58:37 +08:00
Liu Ming
61ebad5bba use standard filename for output log file. 2016-02-19 09:35:15 +08:00
Jørgen Kvalsvik
b8edc8b5b4 Change Deck access methods/types to references
opm-parser#677 changes the return types for the Deck family of classes.
This patch fixes all broken code from that patch set.

https://github.com/OPM/opm-parser/pull/677
2016-02-18 08:50:26 +01:00
Bård Skaflestad
6365167109 Merge pull request #946 from jokva/clean-up-header
Improve includes from opm-parser
2016-01-26 15:58:25 +01:00
Jørgen Kvalsvik
697763a4b9 Improve includes from opm-parser
Adopting to opm-parser PR#661, add previously missing includes.

https://github.com/OPM/opm-parser/pull/661
2016-01-26 13:30:58 +01:00
Liu Ming
56868d8a6e Add more parser mode options. 2016-01-25 11:13:19 +08:00
Jørgen Kvalsvik
c7349b5586 Fixes includes wrt opm-parser PR-656
Several files stopped compiling due to relying on opm-parser headers
doing includes. From opm-parser PR-656
https://github.com/OPM/opm-parser/pull/656 this assumption is no longer
valid.
2016-01-21 09:42:51 +01:00
Liu Ming
8d393ac816 remove unused object. 2015-12-08 16:02:36 +08:00
Liu Ming
252af19e4b Use OpmLog to output messages.
return messages and opmLog.
2015-12-02 10:58:06 +08:00
Liu Ming
944e1565fd rename variables and remove some unnecessary check and comments. 2015-12-01 13:49:49 +08:00
Liu Ming
6d06c36f64 1. Move implemtation to .cpp file.
2. Delete constructors.
3. Add config.h
2015-11-30 10:11:43 +08:00
Liu Ming
df6043ace6 add endpoints scaling consistency check. 2015-11-26 15:22:51 +08:00
Liu Ming
c128e218da use commandline instead of paramGroup. 2015-11-19 16:08:26 +08:00
Liu Ming
9e7d287212 use more relax ParseMode. 2015-11-19 13:31:19 +08:00
Liu Ming
1db1bf6fd6 initial RelpermDiagnostics. 2015-11-19 09:21:00 +08:00
Atgeirr Flø Rasmussen
62f59fa624 In sim_2p_incomp, avoid running everything twice.
There were loops (over all timesteps) both in the
main() function and the simulator class.

Note:
This simulator cannot properly handle changing
well configurations, and will now use only the
initial configuration (first report step), instead
of possibly crashing later.
2015-10-21 15:28:27 +02:00
Andreas Lauser
c8000272bf use the error macros from opm-common 2015-10-08 11:42:15 +02:00
babrodtk
12afe501fc Fixed warning, double=>int 2015-08-19 13:12:14 +02:00
babrodtk
104159af15 Minor fixes 2015-08-19 13:12:14 +02:00
babrodtk
ac0e72ea1d Refactoring 2015-08-19 13:12:14 +02:00
babrodtk
1dab5351c2 Initial integration of VFP 2015-08-19 13:10:48 +02:00
Joakim Hove
7b6172a1f8 Updated to use ParseMode. 2015-08-06 15:56:51 +02:00
Atgeirr Flø Rasmussen
37904a3e74 Make some programs stricter about parameter parsing.
This applies to programs which always require at least one parameter.
2015-04-14 15:32:19 +02:00
Atgeirr Flø Rasmussen
c56d69cb8a Fix treatment of source terms for backwards tracing. 2015-02-12 11:13:29 +01:00
Atgeirr Flø Rasmussen
0de85da487 Compute and output well pairs.
Only if already computing tracer information.
2015-02-12 10:13:33 +01:00
Atgeirr Flø Rasmussen
fbdc0ab9bb Compute both directions always in compute_tof. 2015-02-11 16:00:24 +01:00
Atgeirr Flø Rasmussen
9f4da3ad03 Rename directory opm/core/tof -> opm/core/flowdiagnostics. 2015-02-03 21:44:24 +01:00
Atgeirr Flø Rasmussen
e14d01b9b4 Fix bug relating to well control manipulation. 2015-01-21 21:15:26 +01:00
Atgeirr Flø Rasmussen
2a8beb1abc Parameter trace_start now controls trace direction.
Allowable values are Injectors or Producers.
This affects both tof and tracer, and properly switches
flux directions for Producers.
2015-01-21 20:55:23 +01:00
Atgeirr Flø Rasmussen
79ad0c1417 Can specify injector or producer tracers. 2015-01-21 15:28:27 +01:00
Atgeirr Flø Rasmussen
da9651f409 Remove unneeded output (also to file). 2015-01-21 15:04:41 +01:00