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

4896 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen
dc35524986 Make compatible with C++98, silence warnings. 2014-11-27 14:38:43 +01:00
Atgeirr Flø Rasmussen
532d4148f2 Merge pull request #691 from alfbr/master 
This commit introduces mirror_grid, a small application that mirrors gri...
 2014-11-27 13:58:40 +01:00
Alf B. Rustad
3180570262 This commit introduces mirror_grid 
Fixed various nits
 2014-11-27 12:28:29 +01:00
Atgeirr Flø Rasmussen
75d19de0c6 Avoid using VLAs (C99 feature). 
Regular C fixed-size arrays are sufficient here, although in general
std::vector is the preferred replacement (if needing the dynamic size).
 2014-11-24 10:55:10 +01:00
Atgeirr Flø Rasmussen
b352e7ca3a Suppress unused argument warning in release mode. 2014-11-24 10:54:51 +01:00
Atgeirr Flø Rasmussen
91baeea8d3 Rename variable to avoid shadowing. 2014-11-24 10:54:30 +01:00
Bård Skaflestad
fcf8c156aa Merge pull request #687 from blattms/remove-superlfluous-if-in-wellstate-check 
[cleanup] Removes a superfluous if-check of the well state.
 2014-11-20 14:53:36 +01:00
Markus Blatt
e22795e920 [cleanup] Removes a superfluous if-check of the well state. 
There were to identical if statements and the second one was followed
by an else branch. While in this case (if statement just throws) it is not
a bug, this commit cleans up one of the if statements.
 2014-11-20 14:47:21 +01:00
Bård Skaflestad
d26363db52 Merge pull request #684 from blattms/fixes-missing-return-value-in-wellsmanager 
Fixes missing return value in non-void function of WellsManager.
 2014-11-20 12:29:45 +01:00
Markus Blatt
06a83e76f5 Fixes missing return value in non-void function of WellsManager. 
gcc warned about the following

/home/mblatt/src/dune/opm/opm-core/opm/core/wells/WellsManager.cpp: In function ‘std::array<long unsigned int, 3ul> WellsManagerDetail::directionIndices(Opm::CompletionDirection::DirectionEnum)’:
/home/mblatt/src/dune/opm/opm-core/opm/core/wells/WellsManager.cpp:191: warning: control reaches end of non-void function

To calm it I introduced a throw clause after the switch statements. Thus adding a new
enum value will raise a warning on smart compilers, hopefully.
 2014-11-20 11:53:23 +01:00
Atgeirr Flø Rasmussen
61905a2a29 Merge pull request #681 from akva2/fix_opmparser 
fix opm-parser find rule
 2014-11-19 08:54:40 +01:00
Arne Morten Kvarving
e09f40b05c fix opm-parser find rule 
deals with the fallout of opm-parser #365 and #366
 2014-11-18 13:21:45 +01:00
Bård Skaflestad
a27b9a785d Merge pull request #680 from akva2/debian_packaging 
update debian packaging
 2014-11-17 17:39:14 +01:00
Arne Morten Kvarving
6028e1dbe1 update debian packaging 2014-11-17 17:29:27 +01:00
Atgeirr Flø Rasmussen
66b217a732 Merge pull request #678 from totto82/fix_eclipseWriter 
Do not include shut wells in the well name to index map
 2014-11-13 08:29:54 +01:00
Jørgen Kvalsvik
114b335ce6 Moved KSPCreate to the Data constructor 
This is where it was always intended to be called, so this fixes a mistake in
earlier development.
 2014-11-12 20:41:21 +01:00
Tor Harald Sandve
75749c3dab Do not include shut wells in the well name to index map 
The name to index map is used to make sure the correct wellstate values
are associated with the corresponding well. Shut wells should be
excluded from this mapping as no date is for shut wells are found in the
wellstates, instead 0 is outputed for the shut wells.
 2014-11-07 12:22:19 +01:00
Atgeirr Flø Rasmussen
665f08592c Merge pull request #646 from osae/satFunc-eclState-swl 
Initialization of SWL-family from EclipseState.  (Needs PR opm-parser/#278.)
 2014-11-06 10:51:51 +01:00
osae
b3b15188d9 Made hysteresis variant of gwseg consistent ... 
... with the base gwseg behaviour.  Added test.
 2014-11-05 17:00:11 +01:00
osae
2b865a992e Consistency between scaled and unscaled gwseg. 
Modified the endpoint scaled version of SatFuncGwseg and updated
the tests accordingly.
 2014-11-05 16:10:05 +01:00
osae
830273db7a Forgot to list the DATA-files ... 2014-11-05 16:10:05 +01:00
osae
18c8927334 Added some tests for the endpoint scaled relperm. 
- satfuncStandard: Unscaled curves, using standard version of the
Gwseg model.
- satfuncEPSBase: Unscaled curves, but using the EPS version of
the Gwseg model.  There are some differences between this and the
standard version of Gwseg for derivatives at critical saturations.
The scheme for calculating the derivatives should be discussed.
(Will file a separate issue on this.)
- satfuncEPS_A: Scaled curves.  Scaling parameters specified via
SWL family.
- satfuncEPS_B: Scaled curves.  Scaling parameters identical to _A
but this time specified via the ENPTVD table.  Test currently
suspended due problems with eclipse-state.
- satfuncEPS_C: Scaled curves.  Scaling parameters identical to _A
but this time specified via Norne-like syntax (EQUALS, COPY etc.).
 2014-11-05 16:10:05 +01:00
osae
92ee3cd86b Rename eclState to eclipseState. 2014-11-05 16:10:05 +01:00
osae
8f8450f018 Base initialisation of SWL etc on EclipseState ... 
Thus allowing an unmodified Norne deck.
 2014-11-05 16:10:05 +01:00
osae
ba6de11151 Bugfix: Actually use column index ... 2014-11-05 16:10:05 +01:00
osae
877b501659 Cleaning up and preparation for eclipseState. 2014-11-05 16:10:05 +01:00
Atgeirr Flø Rasmussen
e2fdf14ee3 Suppress unused argument warning. 2014-11-05 07:51:21 +01:00
Andreas Lauser
1ee4bc514b Merge pull request #676 from atgeirr/bugfix-simple-simulator 
Bugfix: avoid using TimeMap without deck.
 2014-11-03 16:24:19 +01:00
Atgeirr Flø Rasmussen
495699fde6 Use existing TimeMap, instead of creating new. 2014-11-03 13:33:30 +01:00
Atgeirr Flø Rasmussen
702859c5e3 Bugfix: avoid using TimeMap without deck. 
This made the simulator crash when there is no deck involved.
 2014-11-03 11:15:37 +01:00
Atgeirr Flø Rasmussen
1d7b5f2217 Merge pull request #673 from totto82/shut_wells_fix 
BUGFIX Shut wells
 2014-10-27 10:13:43 +01:00
Tor Harald Sandve
0dd70b1416 The wellmanager test is modified to account for not adding shut wells 
Shut wells are not added to the well list and the well manager test is
modified accordinly.
 2014-10-27 07:23:58 +01:00
Tor Harald Sandve
401b193854 BUGFIX. Do not increase well index for shut wells. 
Shut wells are not added to the well list and the well index should
therefore not be increased when well control is set. This is similar to
whats is done for shut wells in createWellsFromSpecs.
 2014-10-27 07:20:03 +01:00
Atgeirr Flø Rasmussen
b7a6680ef4 Merge pull request #672 from dr-robertk/PR/remove-unused-typedef-warning 
remove unused typedef to avoid compiler warning and keep code clean.
 2014-10-24 14:28:55 +02:00
Atgeirr Flø Rasmussen
ad8310543e Merge pull request #671 from dr-robertk/PR/timestepcontrol-fixrestart 
Fix solver restart counter.
 2014-10-24 14:27:49 +02:00
Robert K
81d3281999 remove unused typedef to avoid compiler warning and keep code clean. 2014-10-24 12:51:57 +02:00
Robert K
12891f668b fix problem with solver reastart, variable was not reset. 
Also, the time step does only grow moderately after a solver restart.
 2014-10-24 12:32:00 +02:00
Atgeirr Flø Rasmussen
12cd6d9f1e Merge pull request #670 from totto82/shut_wells 
Fix SHUT wells
 2014-10-24 11:30:06 +02:00
Tor Harald Sandve
2b1dc85804 Make the comment in test_wellsmanager more precise 
The comment now precisly says that Shut wells are not added instead to
the well list instead of removed.
 2014-10-24 07:05:43 +02:00
Tor Harald Sandve
2ff42c327b SHUT wells returns 0 
Shut wells returns 0 for bhp and rates in the EclipseWriter
 2014-10-24 07:01:36 +02:00
Tor Harald Sandve
c659c080cb Fix SHUT wells 
Shut wells are not added to the well list and thus not considered in the
simulator.

The shut well test in test_wellsmanager is modified to assert this
behaviour.

BUG: This change provokes an assert in the EclipeWriter as number of
wells in wellstate is different from number of wells in the schedule.
 2014-10-24 06:57:38 +02:00
Bård Skaflestad
bc862c8125 Merge pull request #663 from akva2/check_commits 
add check-commits target
 2014-10-21 13:43:48 +02:00
Arne Morten Kvarving
be2ab082ad add check-commits target 2014-10-20 14:52:52 +02:00
Atgeirr Flø Rasmussen
978e32de16 Merge pull request #662 from dr-robertk/timestepcontrol 
Timestepcontrol
 2014-10-20 12:40:21 +02:00
Robert Kloefkorn
42bcb5f0c8 address Atgeirs comments. 2014-10-20 12:32:11 +02:00
Robert Kloefkorn
e552acc244 Merge remote-tracking branch 'upstream/master' into timestepcontrol 2014-10-17 11:28:04 +02:00
Joakim Hove
7e1eb963f3 Merge pull request #666 from joakim-hove/WCONDPROD-SHUT 
Wcondprod shut
 2014-10-17 08:06:01 +02:00
Joakim Hove
68b915530e Minor whitespace fixup 2014-10-17 08:05:13 +02:00
Joakim Hove
5720e5e785 Updated WellsManager testing 2014-10-16 16:34:00 +02:00
Robert Kloefkorn
f8e61c0267 also catch std::runtime_error, i.e. convergence of linear solver failed. 2014-10-14 15:18:36 +02:00