OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,113 Commits 9 Branches 35 Tags 15 MiB
a23f8d1706
Commit Graph

2113 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Halvor M. Nilsen
f31bbf5b48 Merge from upstream 2012-06-19 13:38:51 +02:00
Halvor M. Nilsen
4eb1457c61 Added inizialization of ok, which correct error for solves without wells. The only thing which is check is if the well object have incompressible form. 2012-06-19 13:37:22 +02:00
Bård Skaflestad
6cf71b3ba4 Prune an unused header. 2012-06-19 09:34:34 +02:00
Bård Skaflestad
9133e73a33 *Control::mode(): Defer control-mode look-up to std::map. 2012-06-19 00:30:32 +02:00
Bård Skaflestad
f300a9736e Sort includes. 2012-06-19 00:01:30 +02:00
Bård Skaflestad
149e1952a5 *Control::mode(): Defer keyword look-up to std::find() algorithm. 
This is simpler than implementing our own version of the same.
 2012-06-18 15:21:27 +02:00
Bård Skaflestad
a913bfffe9 Document add_well()s "name" parameter. 
Forgotten in cset 728302a69229.
 2012-06-18 10:18:14 +02:00
Bård Skaflestad
0156c2d4f9 Dispose of "Wells" object at end of simulation. 
Discovered by valgrind.
 2012-06-18 10:16:28 +02:00
Bård Skaflestad
b8a6a14747 Add support for storing well names in "Wells" structure. 
The well name must be passed as a parameter to add_well(), so update
callers accordingly.
 2012-06-18 10:15:53 +02:00
Bård Skaflestad
0abd570864 Sort _SOURCES and _HEADERS. 
No functional change.
 2012-06-16 19:18:04 +02:00
Bård Skaflestad
02458422c6 Restore a blank line that was lost in cset 9c4e97ff2ed5. 2012-06-16 18:55:50 +02:00
Kjetil Olsen Lye
4bee8b2d45 Removed errors on trying to open a shut well (or shut an open well). 2012-06-15 15:16:32 +02:00
Kjetil Olsen Lye
ba2729bff7 Handle WellOpen has both open and shut. 2012-06-15 14:29:43 +02:00
Kjetil Olsen Lye
c64ddca287 Made the grouptree respect the new convention of tilde. 2012-06-15 14:08:28 +02:00
Kjetil Olsen Lye
26b5d1ea39 Correct a const error. 2012-06-15 13:57:35 +02:00
Kjetil Olsen Lye
6bde0a03cd Added welshut for production wells. Also added wellopen-handling. 2012-06-15 13:49:58 +02:00
Kjetil Olsen Lye
407582b437 Added initial shutting of injection wells. 2012-06-15 13:38:07 +02:00
Atgeirr Flø Rasmussen
8cd85b0438 Fix output from SimulatorReport. 2012-06-15 10:51:34 +02:00
Atgeirr Flø Rasmussen
b99ef7a25a Bugfix: must have map for special fields for first epoch available after construction. 2012-06-15 10:49:44 +02:00
Atgeirr Flø Rasmussen
6c4b799925 WellsManager now handles multiple WELSPECS, WCONINJE, WCONPROD-lines referring to the same well. 
This is mostly relevant for schedule handling. The last occurence of a well
is the one used.
 2012-06-15 10:12:36 +02:00
Atgeirr Flø Rasmussen
dd83ac3b87 Update porosities before calling transport solver. 2012-06-14 21:51:44 +02:00
Atgeirr Flø Rasmussen
95bf53cc30 Moved SimulatorReport class into its own file, for reusability. 2012-06-14 14:13:03 +02:00
Atgeirr Flø Rasmussen
3f630b8d6b Moved SimulatorTimer class to opm/core/simulator directory. 2012-06-14 14:02:22 +02:00
Atgeirr Flø Rasmussen
136a2bf892 Removed unneeded code, improved reporting output. 2012-06-14 11:57:45 +02:00
Atgeirr Flø Rasmussen
f0aec74997 SimulatorTwophase::run() returns a timing report. Refined output. 2012-06-14 11:57:03 +02:00
Atgeirr Flø Rasmussen
294ce0b579 In SimulatorTimer: added setTotalTime(), made setCurrentStepNum() update current time. 2012-06-14 11:55:33 +02:00
Halvor M. Nilsen
1a95fe8199 Fixed one use of wells, when wells=NULL 2012-06-14 09:06:58 +02:00
Atgeirr Flø Rasmussen
5398ae169e Merged. 2012-06-13 19:45:32 +02:00
Atgeirr Flø Rasmussen
ed12b9ffff Enable inheritance from IncompTpfa for limited purposes. 2012-06-13 19:45:23 +02:00
Bård Skaflestad
2988b48bd3 computeFractionalFlow(): Reuse the output array in all intermediate calculations. 
This eliminates a number of free-store operations and data movements.
 2012-06-13 17:07:56 +02:00
Atgeirr Flø Rasmussen
3ccd149fbd Remove unused code. 2012-06-13 14:55:54 +02:00
Atgeirr Flø Rasmussen
4564068da6 Update documentation. 2012-06-13 14:55:44 +02:00
Atgeirr Flø Rasmussen
9faf5e2d71 Removed unused code. 2012-06-13 14:52:28 +02:00
Atgeirr Flø Rasmussen
431ae02f5d Added necessary include, suppressed a warning. 2012-06-13 10:59:48 +02:00
Atgeirr Flø Rasmussen
f2eff8837d Change default pressure residual tolerance to 0, to preserve behaviour. 2012-06-13 10:59:09 +02:00
Atgeirr Flø Rasmussen
b152c1c5c8 Merged. 2012-06-13 10:39:51 +02:00
Atgeirr Flø Rasmussen
5fa9b9e110 Initialise state variables. 2012-06-13 10:34:45 +02:00
Atgeirr Flø Rasmussen
b9afae7ef6 Bugfixes: correct sign for pressure increment, initialise rock_comp. 2012-06-13 10:34:15 +02:00
Bård Skaflestad
2a1561a246 Insert a few blank lines for grouping purposes. 2012-06-12 23:10:38 +02:00
Bård Skaflestad
37b49e31ed Use canonical library set for LAPACK. 2012-06-12 23:09:55 +02:00
Bård Skaflestad
91fb55af2c Libraries must follow the pertinent "-L" flags. 2012-06-12 23:08:59 +02:00
Bård Skaflestad
833268a33f Remove a per-target LDADD that's automatically satisfied. 2012-06-12 23:05:33 +02:00
Bård Skaflestad
ed24f7d43d Sort list of test executables (and _SOURCES). 2012-06-12 23:05:04 +02:00
Atgeirr Flø Rasmussen
92f1ce9b83 Examples and tutorials follow change to IncompTpfa interface. 2012-06-12 15:28:53 +02:00
Atgeirr Flø Rasmussen
e1d5e55f1b Added constructor for incompressible cases. 
Also added computeStaticData() helper called by both constructors.
It is still possible to use the other constructor for an incompressible case,
by passing a null pointer for the rock_comp argument.
 2012-06-12 15:24:31 +02:00
Atgeirr Flø Rasmussen
cc0f374137 Reindent. 2012-06-12 15:22:23 +02:00
Halvor M. Nilsen
97415da35d Merge from upstream. 2012-06-12 12:47:45 +02:00
Halvor M. Nilsen
c550e8b4a2 Small cleanup in code. 2012-06-12 12:46:19 +02:00
Halvor M. Nilsen
843163fb4b Add genetion of edges. This maybe unsafe for general grids. There should be more testing 2012-06-12 12:35:35 +02:00
Atgeirr Flø Rasmussen
57e2d62513 Merged. 2012-06-12 11:17:02 +02:00