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
668 Commits 24 Branches 102 Tags 90 MiB
fb3824e0da
Commit Graph

668 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Hove
fb3824e0da Raised the opm-core boost dependency to 1.44 to reflect parser requirement 2014-02-28 17:52:14 +01:00
Joakim Hove
b834cfb899 Removed explicit cJSON dependency from opm-core 2014-02-28 17:52:13 +01:00
Joakim Hove
c3c3817d80 Added required dependencies on opm-parser and CJSON 2014-02-28 17:50:20 +01:00
Atgeirr Flø Rasmussen
c7efc85568 Merge pull request #91 from OPM/opm-parser-integrate 
Opm parser integrate
 2014-02-27 15:31:03 +01:00
Joakim Hove
3208c61472 Merge pull request #89 from andlaus/parser-integrate_new_simulatortimer 
Parser integrate new simulatortimer
 2014-02-27 14:43:00 +01:00
Andreas Lauser
5de11630d5 use the SimulatorTimer which is based on opm-parser's TimeMap 
at least if the USE_NEW_PARSER preprocessor macro in sim_fibo_ad.cpp
is set to 1. (if it is false, nothing changes.)
 2014-02-27 11:56:33 +01:00
Joakim Hove
745c62a551 Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2014-02-26 23:31:13 +01:00
Andreas Lauser
dd080c4515 first write out the result of a time step, then increment the timer 
if done the other way round we would make an assertation in TimeMap
false and also the values returned by SimulationTimer would be for the
next time step and not the current one...
 2014-02-21 16:06:26 +01:00
Joakim Hove
7b7726700e Merge pull request #72 from andlaus/parser-integrate-read_pvt_and_grid 
Parser integrate: read pvt and grid
 2014-02-18 11:33:39 +01:00
Andreas Lauser
c23b38f60b re-add the epoch stuff 
this is required until the new time step handling code lands...
 2014-02-14 17:57:08 +01:00
Andreas Lauser
d7d25253f3 adapt to the changes in the APIs of the parser-integrate branch in opm-core 
Since the SimulationTimer, EclipseWriter and WellsManager stuff has
not (yet?) been merged, the old parser is required to be around. Use
my parser-integrate-hacks_for_norne branches to test your stuff on the
Norne deck...
 2014-02-14 17:57:08 +01:00
Andreas Lauser
09f56b416f sim_fibo_ad: add macro to easily switch between the old and the new parser 2014-02-14 17:56:25 +01:00
Andreas Lauser
f7541aa27a BlackoilPropsAdFromDeck: Add support for PVTO 2014-02-14 17:56:20 +01:00
Andreas Lauser
6b0e1d4562 sim_fibo_ad: completely replace the old eclipse parser by the new one 
this required to abandon the "Epoch" stuff which the new parser does
not have (as well as the ECLIPSE file format knows nothing about
epochs). Handling well controls properly thus has to wait until Joakim
and Kristian finish refurbishing the WellsManager, so as a stop-gap
measure, only the first "epoch" is run.
 2014-02-14 17:56:20 +01:00
Andreas Lauser
198f805c2a switch to the new parser's table utility classes 2014-02-14 17:56:08 +01:00
Andreas Lauser
2deeeef4e4 really use the new parser 
in the previous commit this was #if 0'ed...
 2014-02-14 17:56:08 +01:00
Andreas Lauser
7f485626a2 use the new parser to read the PVT and grid data from the deck 
the old code has not yet been removed, but in the long term, this is
probably the way to go.
 2014-02-14 17:56:07 +01:00
Andreas Lauser
627b1f3906 make the deck from opm-parser available to the black-oil PVT property classes 2014-02-14 17:56:07 +01:00
Bård Skaflestad
9d9fed2a5f Merge pull request #84 from atgeirr/remove-unused-residual-part 
Remove rs_or_sg_eq from the residual.
 2014-02-08 00:29:12 +01:00
Atgeirr Flø Rasmussen
f84b0a6a4d Remove rs_or_sg_eq from the residual. 
This has not been used since the introduction of live gas changed
the treatment of rs (and rv) values to make a more compact system.
 2014-02-07 16:33:19 +01:00
Bård Skaflestad
3aa75c5bc8 Merge pull request #83 from atgeirr/fix-warning-struct-class 
Forward declare PhaseUsage as struct, not class.
 2014-02-07 15:08:21 +01:00
Atgeirr Flø Rasmussen
0b14af943b Forward declare PhaseUsage as struct, not class. 2014-02-07 14:38:57 +01:00
Joakim Hove
0a8430690f Merge pull request #82 from flikka/fix-sim_fibo_ad_test 
Trying to get the test back running, by looking at the sim_fib_ad main m...
 2014-02-06 09:07:59 +01:00
Kristian Flikka
269a2bbd24 Reverting some const_casting, that was introduced with no real reason 2014-02-05 21:24:38 +01:00
Kristian Flikka
2b47f0364b Const-ref of parameter to the runWithXParser() functions 2014-02-05 21:18:03 +01:00
Kristian Flikka
5309ba793b Removed comment 2014-02-05 19:46:27 +01:00
Kristian Flikka
79c3a38d24 Changed back arguments of runWithXParser to use ParameterGroup 2014-02-05 19:43:43 +01:00
Kristian Flikka
8d7e7cc731 Trying to get the test back running, by looking at the sim_fib_ad main method. Please advice if the string casting on line 335 is bad stuff, not my strongest side 2014-02-05 18:22:16 +01:00
Joakim Hove
3318f506b3 Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2014-02-04 21:35:27 +01:00
Bård Skaflestad
b43d331119 Merge pull request #81 from blattms/fix-fibs-initialization-order 
Fixes warning about initialization order in FullyImpliciteBlackOilSolver...
 2014-02-03 12:51:11 -08:00
Markus Blatt
e05675bd41 Fixes warning about initialization order in FullyImpliciteBlackOilSolver. 2014-02-03 18:14:49 +01:00
Bård Skaflestad
3971862065 Merge pull request #79 from atgeirr/initial-summary-output 
Initial summary output, remove dead code.
 2014-01-31 03:54:49 -08:00
Atgeirr Flø Rasmussen
0de82f3172 Remove more unused code. 2014-01-31 12:29:15 +01:00
Atgeirr Flø Rasmussen
614c3f35af Removed dead code. 
The code was partially kept as a reminder to implement
proper well reporting and mass balance reporting. Now
well reporting has been taken care of, so we remove
the code.
 2014-01-31 09:07:53 +01:00
Atgeirr Flø Rasmussen
436624f662 Write initial values to eclipse format output. 
This yields output files that have the same behaviour as
eclipse in terms of number of steps, and what the steps mean.
 2014-01-30 14:57:58 +01:00
Joakim Hove
0138fc43ef Merged upstream/master 2014-01-29 15:25:21 +01:00
Bård Skaflestad
f159aeaa7c Merge pull request #78 from atgeirr/seg-well-model 
Segmented well model
 2014-01-27 06:19:18 -08:00
Atgeirr Flø Rasmussen
d5ebe3c685 Use correct number of items in initialiser. 2014-01-27 10:42:35 +01:00
Atgeirr Flø Rasmussen
38a48dd149 Fix indexing error in if-test. 2014-01-27 10:42:17 +01:00
Atgeirr Flø Rasmussen
924080d8dc Proper memorymanagement in test program. 2014-01-27 08:32:24 +01:00
Atgeirr Flø Rasmussen
f9ea03fe67 Renamed SegmentedWellModel->WellDensitySegmented. 2014-01-24 15:54:01 +01:00
Atgeirr Flø Rasmussen
2f7697e00d Merge branch 'master' into seg-well-model 2014-01-24 15:48:49 +01:00
Atgeirr Flø Rasmussen
27e616e668 Merge pull request #77 from blattms/fix-debian-eigen 
[cmake,bugfix] Corrects required version and make Eigen3 download work.
 2014-01-24 06:29:45 -08:00
Atgeirr Flø Rasmussen
b9e392934f Merge pull request #74 from totto82/wetgas 
Implemention of live gas
 2014-01-24 06:25:47 -08:00
Tor Harald Sandve
cdd312fa55 Comment out unused code 
Part of the code that is no longer in use is commented out.
 2014-01-24 13:35:04 +01:00
Tor Harald Sandve
825c9be0db Fixed white spaces 2014-01-24 13:27:32 +01:00
Tor Harald Sandve
19f0a81db1 Fixed from bitwise to logical operator 
The && is used instead of &
 2014-01-24 13:15:29 +01:00
Tor Harald Sandve
b2ac4c7aac Fixed missing documentation 2014-01-24 13:14:08 +01:00
Atgeirr Flø Rasmussen
5d386f2a49 Bugfixes in treatment of perforation depths and final accumulation. 2014-01-23 12:42:57 +01:00
Atgeirr Flø Rasmussen
a4b2044e14 Modified test case to match MRST test case. 2014-01-23 12:42:17 +01:00