OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,745 Commits 9 Branches 35 Tags 15 MiB
8ea0b62b33
Commit Graph

5745 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arne Morten Kvarving
8ea0b62b33 simplify jenkins build scripts after ert reorganization 2016-08-22 13:23:30 +02:00
Joakim Hove
a6a95eeac1 Merge pull request #1056 from pgdr/downstream-transmult-and-shared_ptrs 
TransMult and InitConfig are references
 2016-08-09 09:33:06 +02:00
Pål Grønås Drange
77a93abcac Minor tweaks and updates in test blackoilstate 2016-08-08 15:58:17 +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
Atgeirr Flø Rasmussen
6f264781b0 Merge pull request #1053 from andlaus/print_linearizations 
also keep track of the number of linearizations needed for the simulation
 2016-08-02 15:01:19 +02:00
Andreas Lauser
d3ff659437 also keep track of the number of linearizations needed for the simulation 2016-08-02 14:05:14 +02:00
Atgeirr Flø Rasmussen
a6f08d13d5 Merge pull request #1052 from andlaus/pass_timer_instead_of_dt 
pass the timer object instead of the time step size to the simulators
 2016-08-02 11:05:33 +02:00
Bård Skaflestad
bc0977ec3d Merge pull request #1054 from qilicun/fix-output-well-iterations 
Drop useage of std::numeric_limits
 2016-07-22 00:47:23 +02:00
Bård Skaflestad
bb387e16f9 Merge pull request #1055 from andlaus/fix_rock_compressibility 
fix incorrect derivative  of rock compressibility w.r.t. pressure
 2016-07-20 11:32:19 +02:00
Andreas Lauser
25c4a8c156 fix incorrect derivative of rock compressibility w.r.t. pressure 
since

f(x) = 1 + 0.5*g(x)*g(x)

the derivative is

f'(x) = 0 + 2*0.5*g(x) * g'(x) = g(x)*g'(x)

note that the previous incorrect values do not affect the quality of
the obtained results (if the tolerance of the non-linear solver is
chosen to be small enough), but it may have deteriorated convergence
rates.
 2016-07-19 18:19:30 +02:00
Liu Ming
65c7a2c197 fix indentation. 2016-07-14 10:30:20 +08:00
Liu Ming
a792c29f00 drop useage of std::numeric_limits 2016-07-14 10:27:13 +08:00
Atgeirr Flø Rasmussen
dae94b5041 Merge pull request #1051 from GitPaean/support_WECON 
Support of the keyword WECON
 2016-07-05 21:56:48 +02:00
Andreas Lauser
ff899f3c53 pass the timer object instead of the time step size to the simulators 2016-07-05 12:23:55 +02:00
Kai Bao
6f8acf49f8 adding default constructor for DynamicListEconLimited 2016-07-04 16:21:55 +02:00
Kai Bao
1fc189065c adding a initialStep() function to SimulatorTimer 
to indicate if the current step is the inital step.
 2016-07-04 11:12:53 +02:00
Kai Bao
c58a0fce43 addressing comments. 
no functional change.
 2016-06-30 16:20:38 +02:00
Kai Bao
30bc54ba4a removing some commented lines. 2016-06-30 15:17:13 +02:00
Kai Bao
4b4492e877 adding stopped wells list to DynamicListEconLimited 
when well is closed due to rate economic limits, based on the auto
shut-in configuration, the well can be STOP or SHUT.

When well is closed due to all the connections are closed, it should be
SHUT.
 2016-06-30 14:41:14 +02:00
Kai Bao
a07f628469 handling connection closing in DynamicListEconLimited 
due to econ limits.
 2016-06-30 14:41:14 +02:00
Kai Bao
c7c38374ec adding list_econ_limited to setupWellControls 2016-06-30 14:41:14 +02:00
Kai Bao
bc1fb8e477 WIP in adding class DynamicListEconLimited 
to handle the closed wells and connection dynamically based on the
economic limits provied by keyword WECON
 2016-06-30 14:41:14 +02:00
Atgeirr Flø Rasmussen
9c6eeae068 Merge pull request #1045 from qilicun/time-messages-to-PRT-file 
Change adaptive time stepping message type to OpmLog::note
 2016-06-30 09:19:49 +02:00
Liu Ming
50573d1168 output well iterations if it is a valid number. 2016-06-30 09:03:30 +08:00
Liu Ming
2c25bb8262 Add space. 2016-06-28 15:26:06 +08:00
Liu Ming
745666468f output well iterations and non-linear iterations. 2016-06-28 13:40:32 +08:00
Bård Skaflestad
c1b4ed8bc8 Merge pull request #1050 from blattms/make-wells_equal-work-for-null-wells 
Make wells_equal work for null wells.
 2016-06-27 15:18:09 +02:00
Markus Blatt
cd32e65632 Use NULL instead of 0 in null comparison. 2016-06-27 14:38:30 +02:00
Markus Blatt
7d97ef7e4a Make wells_equal work for only one null pointer. 2016-06-27 13:29:44 +02:00
Markus Blatt
f66f699fca Make wells_equal work for null wells. 
This is needed to run test cases without wells with debugging on.
Without this commit we get segmentation fault in an assert statement.
 2016-06-27 12:21:45 +02:00
Atgeirr Flø Rasmussen
2177aa745e Merge pull request #1027 from totto82/fix_2p_equil_init 
Fix two phase equil initialization
 2016-06-24 14:42:48 +02:00
Tor Harald Sandve
fd049a6962 Fixing some nitpicks 2016-06-24 13:36:05 +02:00
Atgeirr Flø Rasmussen
3d5689dc72 Merge pull request #1046 from pgdr/add-dimens-to-norne-deck-test 
Added DX/DY/DZ to norne_pvt.data
 2016-06-21 22:45:36 +02:00
Pål Grønås Drange
f1024bb210 Added DX/DY/DZ to norne_pvt.data 2016-06-21 16:10:32 +02:00
Liu Ming
afc9e4453a get current date time. 2016-06-21 11:25:05 +08:00
Liu Ming
49d5d4c79a mark time stepping messages type as OpmLog::note 2016-06-21 08:44:32 +08:00
Atgeirr Flø Rasmussen
bdebcf48a3 Merge pull request #1043 from pgdr/remove-return-type-warn 
Remove warnings (by throwing), added copyright header
 2016-06-20 22:34:40 +02:00
Pål Grønås Drange
06cd6c85f3 Using OPM_THROW to log messages, fixed Copyright headers 2016-06-20 17:20:33 +02:00
Atgeirr Flø Rasmussen
7ddf390bf8 Merge pull request #1044 from akva2/fix_jenkins_again 
fixed: broken array loop in jenkins script
 2016-06-20 15:00:25 +02:00
Joakim Hove
c686ec69d7 Merge pull request #1041 from jokva/removal-shared_ptr-well 
WellPtr and GroupPtr deprecated
 2016-06-20 14:57:10 +02:00
Arne Morten Kvarving
08e8297b47 fixed: broken array loop in jenkins script 
python, bash, c++, fortran. sometimes you get lost in the syntax jungle.
 2016-06-20 14:44:37 +02:00
Pål Grønås Drange
4323b2f4fa Remove [-Wreturn-type] warnings (added throw), added copyright header 2016-06-20 14:13:29 +02:00
Tor Harald Sandve
db03e88090 Fix bug for OIL-GAS case 
- Differentiate between active and canonical phase index
 2016-06-20 11:14:36 +02:00
Tor Harald Sandve
bd9c514457 Fix reference pressure for oil-water problem 
In opm-material the wetting phase is the reference phase for two-phase
problems i.e water for oil-water system, but for flow it is always oil.
Add oil capillary pressure value to shift the reference phase to oil
 2016-06-20 10:36:24 +02:00
Tor Harald Sandve
4db70d1902 Fix two phase EQUIL initialization 2016-06-20 10:36:24 +02:00
Atgeirr Flø Rasmussen
d9c33cbcb6 Merge pull request #1039 from atgeirr/fix-compile-maxabs-unsigned 
Avoid ambiguous calls to abs with unsigned integers.
 2016-06-17 08:02:20 +02:00
Atgeirr Flø Rasmussen
9b2acf96bf Merge pull request #1042 from andlaus/update_dune.module 
add opm-output as a dependency to dune.module
 2016-06-16 15:21:21 +02:00
Andreas Lauser
aee0020a98 add opm-output as a dependency to dune.module 
without it, building with dunecontrol fails...
 2016-06-16 14:09:02 +02:00
Atgeirr Flø Rasmussen
f3f6170881 Merge pull request #1038 from qilicun/equil-check 
Rise up a warning if equil region has no active cells.
 2016-06-16 10:02:49 +02:00
Jørgen Kvalsvik
6e2099d293 WellPtr and GroupPtr deprecated 
shared_ptr aliases are considered deprecated and has largely been
removed upstream (and replaced by raw pointers).
 2016-06-16 09:33:43 +02:00