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

5912 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Markus Blatt
21de431eb1 Do exclude SHUT wells from lookup of deactivated wells. 
This should be prevent some unnecessary find calls in the set.
 2016-09-13 10:55:15 +02:00
Markus Blatt
c4f0539534 Revert "Use index according to eclipse schedule to identify deactivated wells." 
This reverts commit 09205dfa074af24b381595d02c15e799523ddb2b.

We cannot use the index as it might change for a well between different
report steps. Unfortunately the only persistent way to identify wells
over all report steps in the schedule seems to be the well name.
 2016-09-13 10:55:15 +02:00
Markus Blatt
05add1884f Use index according to eclipse schedule to identify deactivated wells. 2016-09-13 10:55:15 +02:00
Markus Blatt
17f93ce3bd Use provided set of deactivated wells in parallel. 
Before this commit we tried to compute whether a well is represented on
the processor using the grid information. Due to the overlap region and
possible completion on deactivated cells of the global grid this is not
even possible. E.g. we cannot distinguish whether a completion is just
not represented on the domain of a process or the corresponding cell is
not active in the simulation.

With this commit we refactor to passing the well manager an explicit
list of name of wells that should be completely neglected. This information
can easily by computed after the loadbalancer has computed partitions.
 2016-09-13 10:55:15 +02:00
Atgeirr Flø Rasmussen
474128fe2d Merge pull request #1060 from babrodtk/output_writer_celldata 
Output writer cell data
 2016-09-08 09:55:14 +02:00
Joakim Hove
19f6d540fc Merge pull request #1059 from joakim-hove/create-eclipsegrid 
Create eclipsegrid
 2016-09-07 11:11:10 +02:00
Joakim Hove
8666c8b687 UgGridHelpers::createEclipseGrid( ) 
- A new function createEclipsegrid has been added to the UgGridHelpers
  namespace.

- The UnstructuredGrid C structure has been augmented with a new member:
  double * zcorn which can be used to hold a copy of the zcorn
  value *after* minpv induced modifications.
 2016-09-07 10:56:29 +02:00
Atgeirr Flø Rasmussen
8efc75367b Merge pull request #1061 from babrodtk/warning_fixes 
Warning fixes
 2016-09-07 10:46:15 +02:00
babrodtk
466e721e0b Fixed warnings 2016-09-06 07:50:02 +02:00
Joakim Hove
b7bb01b77e shared_ptr<EclipseGrid> -> const EclipseGrid& 2016-09-03 17:49:46 +02:00
babrodtk
d71aceff0b Initial version for outputting cell data 2016-09-01 14:37:41 +02:00
Joakim Hove
9615f0e9d7 Using { .. } initialization. 2016-08-31 09:55:28 +02:00
babrodtk
aef10cc292 Merge branch 'master' of github.com:OPM/opm-core 2016-08-30 14:53:11 +02:00
Arne Morten Kvarving
8329dc7474 Merge pull request #1058 from akva2/add_multiconfiguration 
add multiconfiguration support to jenkins build script
 2016-08-24 16:02:08 +02:00
Arne Morten Kvarving
14cd4b0472 add multiconfiguration support to jenkins build script 
also unifies build.sh and build-pr.sh and gets rid of
build-opm-core.sh
 2016-08-23 14:09:18 +02:00
Joakim Hove
89a22c30b0 Merge pull request #1057 from akva2/simplify_after_ert_reorg 
simplify jenkins build scripts after ert reorganization
 2016-08-22 17:29:28 +02:00
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