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

63 Commits

Author SHA1 Message Date
Tor Harald Sandve
09a15c6e58 BUG: use the scaled water saturation 2015-02-18 08:13:49 +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
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
Andreas Lauser
c7dfd096aa SatFuncBase.hpp: convert DOS line endings to unix ones 
i.e. \r\n -> \n
 2014-09-19 14:40:52 +02:00
Andreas Lauser
bd0bfc172b adapt the the table related API changes of opm-parser 2014-09-19 14:40:35 +02:00
Atgeirr Flø Rasmussen
e1be710526 Suppress unused argument warning. 
The eclState argument was added in PR#634, and may be needed later.
Until then, this silences the warning generated.
 2014-08-28 14:14:22 +02:00
osae
96823e04a3 Provide eclipse state to saturation property init. 2014-08-22 15:36:07 +02:00
Bård Skaflestad
6b36dab2ee swatInitScaling(): Abide by OPM coding conventions 
This commit attaches the reference-signifying ampersand to the type
as is preferred in the OPM code base.

Suggested by: [at] atgeirr
 2014-08-07 18:50:07 +02:00
Bård Skaflestad
c047a6c9dc swatInitScaling(): Remove EOL whitespace 
This commit removes several instances of EOL whitespace in function
'swatInitScaling()'.  Aesthetic only.  No functional changes.

Suggested by: [at] atgeirr
 2014-08-07 18:50:07 +02:00
Bård Skaflestad
f8492aeb64 swatInitScaling(): Name magic constant 
The constant 1.0e-8 was used as a threshold to distinguish "low"
from "high" capillary pressure values.  Introduce acutual constant
"pc_low_threshold" to clarify that role.

Suggested by: [at] atgeirr
 2014-08-07 18:50:07 +02:00
Bård Skaflestad
e8901775cd swatInitScaling(): Rename array size parameter 
This commit renames the 'np' parameter used to allocate small arrays
for saturations and capillary pressures to 'max_np' to better
reflect its purpose.

Suggested by: [at] atgeirr
 2014-08-07 18:50:06 +02:00
Bård Skaflestad
4da2c5862d Initialise saturation points for Pc scaling 
This gives predictable failure modes although the actual behaviour
is (probably) unchanged.
 2014-08-07 18:50:06 +02:00
Bård Skaflestad
6f75afc62b Consistently refer to BlackoilPhases::Aqua 
This avoids confusion.
 2014-08-07 18:50:06 +02:00
Bård Skaflestad
62f654b52c Don't use variable-length arrays 
We only support up to 'BlackoilPhases::MaxNumPhases' different
phases (and components), so there's no need to pretend otherwise.
 2014-08-07 18:50:06 +02:00
osae
d3ee5dc20a SWATINIT: Initialisation and capillary pressure scaling. 2014-06-25 18:03:17 +02:00
osae
6e00befef6 Scaling of capillary pressure. 2014-06-25 18:03:17 +02:00
Andreas Lauser
f96417e81c rename all "newParserDeck" objects to "deck" 
The "new" parser is now "the" parser...
 2014-05-21 11:22:43 +02:00
Andreas Lauser
3941fbc5f1 remove EclipseGridParser compatibility methods from all classes 2014-05-21 11:22:43 +02:00
Atgeirr Flø Rasmussen
9690ccc978 Supress signed-unsigned comparison warning. 2014-05-12 09:18:52 +02:00
osae
f0069c7868 Removing a few bugs ... 2014-05-06 18:15:03 +02:00
osae
57b694f66a Proper interpretation of ENDNUM and IMBNUM fields. 
Made consistent with grid discretization.
 2014-05-06 14:41:17 +02:00
osae
7280ce2517 ENDNUM: changed default value and jtab-logic 
Default value changed from 'no scaling' to 'use table 1'.
Range of jtab changed to [-1,#tables-1].
 2014-05-05 10:33:04 +02:00
osae
7f04384b10 Make use of keywords SATOPTS and EHYSTR. 2014-05-05 10:33:04 +02:00
osae
003b37ad88 Use ENDNUM and prepare for IMBNUM. 2014-05-05 10:33:04 +02:00
osae
f7d2468d79 Added missing line (parser conversion). 2014-05-05 10:33:04 +02:00
Andreas Lauser
89f4a6db5b adapt to the renames of the table classes in opm-parser 
basically, "Opm::SimpleTable" becomes "Opm::SingleRecordTable".
 2014-04-28 18:47:28 +02:00
Andreas Lauser
7917295923 add opm-parser variants for the incompressible property classes 2014-04-25 14:25:54 +02:00
Markus Blatt
ebc86bc624 Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support 
Manually resolved conflicts in:
	opm/core/io/eclipse/EclipseWriter.cpp
	opm/core/io/eclipse/EclipseWriter.hpp
	opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp
 2014-04-08 21:50:00 +02:00
osae
498555fcdd New parser; proper handling of ENPTVD/ENKRVD. 2014-04-05 10:56:30 +02:00
Markus Blatt
8668ce7b71 Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support 
Manually resolved conflicts:
	opm/core/io/eclipse/EclipseWriter.cpp
	opm/core/io/eclipse/EclipseWriter.hpp
	opm/core/props/BlackoilPropertiesFromDeck.cpp
	opm/core/simulator/initState_impl.hpp
	opm/core/wells/WellsManager.cpp
	opm/core/wells/WellsManager.hpp
 2014-03-27 15:27:11 +01:00
Andreas Lauser
83dcf17d5b endpoint scaling: invert condition 
yeah, true and false are difficult things sometimes...
 2014-03-18 15:11:38 +01:00
Markus Blatt
a6fb099fbb Fixed SaturationPropsFromDeck::initEPSKey for new parser and non-UG 
There the cell_centroids where still treated like double*. This patch
uses the UgGridHelpers instead.
 2014-03-13 15:41:59 +01:00
Markus Blatt
eeb0039683 Merge branch 'refactor-for-cpgrid-support' into master-refactor-for-cpgrid-support 
Manually resolved conflicts in:
	opm/core/props/BlackoilPropertiesFromDeck.cpp
	opm/core/wells/WellsManager.cpp
 2014-03-13 13:41:45 +01:00
Atgeirr Flø Rasmussen
9edbe36b58 Remove extra semicolon. 2014-03-06 08:24:00 +01:00
Atgeirr Flø Rasmussen
f35c193b38 Suppress unused argument warnings. 2014-03-04 11:32:32 +01:00
Atgeirr Flø Rasmussen
73926a1b21 Merge pull request #495 from osae/endscale 
Endpoint scaling and hysteresis for gwseg.
 2014-03-04 10:29:50 +01:00
Markus Blatt
38ab6e7f78 Remove ambiguous functions increment and getCoordinate from unnamed namespace in favor to those from namespace UgGridHelpers 2014-02-25 15:45:50 +01:00
Markus Blatt
e5b1feb2d5 Assume begin_cell_centroid to what the name tells us: an iterator over then centroids. 
Therfore we do not need to call center() in getCoordinate. This is done in the iterator
class returned from CpGrid.
 2014-02-20 10:45:08 +01:00
Markus Blatt
3aad1a6cc5 Merge remote-tracking branch 'origin/opm-parser-integrate' into refactor-for-cpgrid-support 
Resolved Conflicts:
	opm/core/props/BlackoilPropertiesFromDeck.cpp
	opm/core/props/rock/RockFromDeck.hpp
	opm/core/props/satfunc/SaturationPropsFromDeck.hpp
	opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp
 2014-02-19 15:22:18 +01:00
osae
dbe6d2911d Endpoint scaling and hysteresis for gwseg. 
Activation of eps and hysteresis treatment for gwseg. Also some
additional initialization.
 2014-02-18 13:49:35 +01:00
Markus Blatt
8da99e11c5 Refactored parts needed for Blackoil in autodiff to get rid of UG dependency. 
This patch refactors (hopefully) all parts of opm-core that are needed
by the fully implicite black oil solver in opm-autodiff and that inherently
relied on UnstructuredGrid.

We added a new simple grid interface consisting out of free functions
that will allow us to use CpGrid without copying it to an UnstructuredGrid
by the means of the GridAdapter. Using this interface we have add methods that
allow specifying the grid information (global_cell, cartdims, etc.) wherever
possible to prevent introducing grid parameters for the type of the grid.
Unfortunately this was not possible everywhere.
 2014-02-17 13:23:01 +01:00
Andreas Lauser
88541d8762 make the saturation functions work with opm-parser 2014-02-10 14:50:37 +01:00
Kristian Flikka
5cc903bbe0 Initializing do_hyst_ to false, this caused random segfaults in sim_fibo_ad 2014-02-06 21:17:36 +01:00
Atgeirr Flø Rasmussen
45b080b5be Merge pull request #489 from atgeirr/fix-more-warnings 
Fix more warnings found by clang
 2014-02-05 18:26:57 +01:00
Atgeirr Flø Rasmussen
9396d8b3ed Fix unused argument warnings. 2014-02-05 15:04:56 +01:00
Atgeirr Flø Rasmussen
543230c8cf Suppress warnings in unimplemented functions. 
This prevents warnings from functions that are right now just
a throw statement. Also cleaned up a few whitespace issues nearby.
 2014-02-05 14:27:51 +01:00