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

4794 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
chflo
89b53ed681 OPM-139: Linked in small ert library ecl_well to be used in unitttest test_writenumwells.cpp 2014-12-08 12:04:05 +01:00
Atgeirr Flø Rasmussen
933e4d7376 Merge pull request #696 from dr-robertk/PR/eclipsewriter-support-cell-reordering 
EclipseWriter: support reordering of compressed cells.
 2014-12-08 11:30:27 +01:00
Robert K
488c9ca7ff remove unused restrictToActive method and rewrite the other one to cover both, restrict 
and reorder.
 2014-12-08 11:24:57 +01:00
Robert K
d504007030 EclipseWriter: fix docu of convertToEclipseOrder function. 2014-12-08 10:40:52 +01:00
Robert K
207f4bfd30 EclipseWriter: support reordering of compressed cells, e.g. space filling curves. 2014-12-05 15:44:39 +01:00
Atgeirr Flø Rasmussen
cfc3afd01a Merge pull request #694 from atgeirr/silence-warning 
Silence unused argument warning.
 2014-12-02 09:18:03 +01:00
Atgeirr Flø Rasmussen
98cf664b3f Silence unused argument warning. 2014-12-02 09:17:11 +01:00
Atgeirr Flø Rasmussen
fdad6860cb Merge pull request #688 from andlaus/temperature_dependent_PVT 
PVT properties: allow them to be temperature dependent
 2014-12-02 08:48:57 +01:00
Andreas Lauser
e530ce03d8 PVT properties: allow them to be temperature dependent 
Note that this patch does not introduce any real temperature
dependence but only changes the APIs for the viscosity and for the
density related methods. Note that I also don't like the fact that
this requires so many changes to so many files, but with the current
design of the property classes I cannot see a way to avoid this...
 2014-12-01 20:06:31 +01:00
Bård Skaflestad
2a4a7eb61e Merge pull request #685 from atgeirr/vertex-neighbours 
Add free function vertexNeighbours() and test.
 2014-12-01 17:10:07 +01:00
Atgeirr Flø Rasmussen
48439d6420 Use proper way to access pi() from boost::math. 2014-12-01 14:55:06 +01:00
Atgeirr Flø Rasmussen
8af3b17c68 Simplify formula with atan2(). 2014-12-01 14:38:08 +01:00
Atgeirr Flø Rasmussen
35a8bd4791 Fix more whitespace tab->space issues. 2014-12-01 14:21:16 +01:00
Atgeirr Flø Rasmussen
9e26afaaba Fix comment referencing renamed function. 2014-12-01 13:43:34 +01:00
Atgeirr Flø Rasmussen
6bc74bd746 Replace M_PI with boost usage. 2014-12-01 12:11:27 +01:00
Atgeirr Flø Rasmussen
3eb3000248 Rename vertexNeighbours() -> cellNeighboursAcrossVertices(). 2014-12-01 11:37:49 +01:00
Atgeirr Flø Rasmussen
e7bdb72ce3 Whitespace: tabs to spaces. 2014-12-01 11:28:28 +01:00
Atgeirr Flø Rasmussen
e807834a3c Use GridHelpers in implementation of vertexNeighbours(). 2014-12-01 11:27:39 +01:00
Atgeirr Flø Rasmussen
700d49ac91 Minor fixes for FaceCellsProxy::operator(). 
Fixes are:
 - Made the method const.
 - Corrected argument name cell_index -> face_index.
 2014-12-01 11:22:33 +01:00
Atgeirr Flø Rasmussen
b26bfc51f6 Add orderCounterClockwise() and test. 2014-11-27 14:49:32 +01:00
Atgeirr Flø Rasmussen
9bf36c37d4 Fix BOOST_TEST_MODULE macro. 2014-11-27 14:49:32 +01:00
Atgeirr Flø Rasmussen
578f467b59 Add free function vertexNeighbours() and test. 2014-11-27 14:49:32 +01:00
Atgeirr Flø Rasmussen
960dac3caf Merge pull request #690 from atgeirr/fix-warnings 
Fix warnings
 2014-11-27 14:44:09 +01:00
Atgeirr Flø Rasmussen
e6446e54d2 Merge pull request #692 from atgeirr/fix-mirror-grid 
Make compatible with C++98, silence warnings.
 2014-11-27 14:40:32 +01:00
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
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