OilfieldToolsNet/opm-upscaling
4
0
Fork 0
mirror of https://github.com/OPM/opm-upscaling.git synced 2026-08-27 05:27:10 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,819 Commits 29 Branches 91 Tags
d05a95b033da7c4b433e4840c74ddd05cdc2ec91
Commit Graph
368 Commits
Author SHA1 Message Date
Atgeirr Flø Rasmussen d05a95b033 Deleting more files not needed after the impes sims were removed. 2017-11-16 14:03:31 +01:00
Arne Morten Kvarving a3f7e8f104 remove sim_blackoil_impes and sim_co2_impes 2017-11-15 16:22:40 +01:00
Arne Morten Kvarving cfc70fc075 fixed: look for last dot, not first 
resulted in unexpected file names if path held a dot.
 2017-10-16 13:37:05 +02:00
Arne Morten Kvarving 5946fb2f37 Merge pull request #221 from akva2/req_dune_2.4 
Require Dune 2.4
 2017-09-22 11:41:07 +02:00
Arne Morten Kvarving d001093c58 fixed/added: make sure wave speed calculation in elasticity upscaling is tested 2017-08-17 14:14:19 +02:00
Arne Morten Kvarving 7d9ccbd620 fixed: catch Dune::exception before std::exception 
Dune::exception extends std::exception in dune 2.5, meaning it will be
caught by the std::exception catch
 2017-08-16 11:27:39 +02:00
Arne Morten Kvarving b2d29b7209 adjust for changed ParameterGroup namespacing 2017-04-28 15:35:33 +02:00
Jørgen Kvalsvik d3f08246b0 Get CornerpointChopper.hpp; remove shared_ptrs 
opm-parser no longer exposes shared_ptr or shared_ptr aliases.
 2016-10-20 15:35:20 +02:00
Andreas Lauser 8af1929965 adapt to the removal of the unit system of opm-core 
the one which is in opm-parser is now a drop-in replacement.
 2016-10-10 17:31:02 +02:00
Joakim Hove 24459b4801 shared_ptr<EclipseGrid> -> const EclipseGrid& 2016-08-31 20:28:07 +02:00
Joakim Hove 063de95365 Changed grid initialisation. 
The routines invoking EclipseGrids parsing are implemented here in
opm-upscaling.
 2016-05-08 07:17:56 +02:00
Bård Skaflestad ba0174ccd6 Upscaling Examples: Centralise ECLIPSE File Parsing 
This commit moves the parseEclipseFile() function from the
upscale_relperm.cpp example to the RelPermUpscalerHelper class[%].
This, in turn, enables using the same implementation in most
relevant example utilities.

While here, also call the centralised {get,set}VoigtValue()
functions rather than local implementations.

[%] Suggested by: Arne Morten Kvarving
 2016-04-20 10:12:14 +02:00
Bård Skaflestad 17fe369853 Upscaling Examples: Spring cleaning 
Mostly:
  - Sort headers
  - Re-indent to fix white-space
  - Remove long-disabled code
 2016-04-19 17:51:08 +02:00
Bård Skaflestad 39eb707355 Gravity Capillary Pressure Adjustment: Use Active Grid Only 
We already know the grid's number of active cells and its Cartesian
dimensions once we've called method tesselateGrid().  There's no
need to recompute that information.  Using the values already in the
active grid enables simplifying and generalising the calculation of
the model thickness based on all the model's layers.
 2016-04-19 17:51:08 +02:00
Bård Skaflestad 5cdd0f1218 upscale_relperm: Split setup out to helper functions 2016-04-18 13:59:25 +02:00
Bård Skaflestad 4b461fa7f5 Extra Keywords: Use Reference Rather Than Pointer API 
This commit switches function addNonStandardUpscalingKeywords() to
using a reference to a modifiable Parser rather than ParserPtr.
While here, also switch to using std::make_shared<>() when
constructing the parser object.
 2016-04-18 13:59:25 +02:00
Bård Skaflestad 9fe93eea71 Examples: Adjust White-space and Sort Includes 
No functional changes.
 2016-04-18 13:59:25 +02:00
Atgeirr Flø Rasmussen d2924d0eee Renaming dune-cornerpoint -> opm-grid. 2016-04-06 13:44:02 +02:00
Atgeirr Flø Rasmussen 41db142a09 Avoid shadowing warnings, simple cases. 2016-04-04 13:01:54 +02:00
Atgeirr Flø Rasmussen c02108a3f7 Disable more warnings from third-party headers. 2016-04-04 12:55:37 +02:00
Atgeirr Flø Rasmussen 71bb454e50 Use new include paths. 2016-03-31 17:22:13 +02:00
Atgeirr Flø Rasmussen 792908b428 Dodge Dune changes by using CpGrid for this test. 
YaspGrid requires changes to the GridInterfaceEuler class, which is not
prioritized.
 2016-03-31 17:19:35 +02:00
Arne Morten Kvarving 3c45a3cf2f Import opm-porsol with history 2016-03-18 12:18:08 +01:00
Bård Skaflestad 3a7573370a Chase ParseMode -> ParseContext Renaming in Examples 2016-03-17 10:34:59 +01:00
Liu Ming 5b24e0755e rename ParseMode as ParseContext. 2016-03-17 09:12:12 +08:00
Jørgen Kvalsvik a5c9b39c8f Change Deck access methods/types to references 
opm-parser#677 changes the return types for the Deck family of classes.
This patch fixes all broken code from that patch set.

https://github.com/OPM/opm-parser/pull/677
 2016-02-16 16:52:28 +01:00
Jørgen Kvalsvik d061aa6b12 Change Deck access methods/types to references 
opm-parser#677 changes the return types for the Deck family of classes.
This patch fixes all broken code from that patch set.

https://github.com/OPM/opm-parser/pull/677
 2016-02-16 16:30:52 +01:00
Jørgen Kvalsvik 30fe95e3d0 Improve includes from opm-parser 
Adopting to opm-parser PR#661, add previously missing includes.

http://github.com/OPM/opm-parser/pull/661
 2016-01-26 13:36:12 +01:00
Arne Morten Kvarving f9ea2ef47a fixed: mpi build 2015-09-14 13:08:42 +02:00
Arne Morten Kvarving 2969bb295f changed: make internal data private 2015-09-14 11:34:32 +02:00
Arne Morten Kvarving 4f342d9958 changed: hold on to a reference to options structure 
avoid having to pass it to (almost) all functions
 2015-09-14 11:34:32 +02:00
Arne Morten Kvarving c0b2fe3590 changed: make the dP vector a private member 
not needed on application side
 2015-09-14 11:34:32 +02:00
Arne Morten Kvarving 5afba719cb changed: make conversion factor a private member in helper class 
and remove it from applications
 2015-09-14 11:34:32 +02:00
Arne Morten Kvarving e43d5c5e5b changed: remove cut-and-paste "coding" 2015-09-14 11:34:32 +02:00
Arne Morten Kvarving 6548d6b724 changed: move all error handling to exceptions 2015-09-14 11:34:32 +02:00
Arne Morten Kvarving 2e3d2b91c6 changed: move permeability upscaling to a function 
- was duplicated in upscale_relperm / upscale_relperm_benchmark
 2015-09-14 11:34:31 +02:00
Arne Morten Kvarving 3749f061ff changed: replace loops with push_back with proper calls to resize 2015-09-14 11:34:31 +02:00
Arne Morten Kvarving 0f87352e92 changed: put upscaling of capillary pressure in a function 
- was duplicated across upscale_relperm / upscale_relperm_benchmark
 2015-09-14 11:34:31 +02:00
Arne Morten Kvarving ddf8819f94 changed: move eclipse output to a function 
- increases main function readability
- avoids duplication for each component
 2015-09-14 11:34:31 +02:00
Arne Morten Kvarving 46db96d245 changed: put calculation of min/max capillary pressures in a function 
- was duplicated across upscale_relperm / upscale_relperm_benchmark
 2015-09-14 11:34:31 +02:00
Arne Morten Kvarving 1e7f059dca changed: move some initialization code to helper constructor 2015-09-14 11:34:31 +02:00
Arne Morten Kvarving 95a6461107 changed: move calculation of cell center pressure gradients to a function 
- was duplicated across upscale_relperm / upscale_relperm_benchmark
 2015-09-14 11:34:31 +02:00
Arne Morten Kvarving 15d47ef70e changed: put grid resolutions in an array instead of 3 loose variables 2015-09-14 11:34:31 +02:00
Arne Morten Kvarving 2fb08e4f2b changed: move tesselation of grid to a function 
- was duplicated across upscale_relperm / upscale_relperm_benchmark
 2015-09-14 11:34:31 +02:00
Arne Morten Kvarving eef1a51f56 changed: move boundary condition initialization to a function 
- was duplicated across upscale_relperm / upscale_relperm_benchmark
 2015-09-14 11:34:31 +02:00
Arne Morten Kvarving 24bfed5228 changed: put check for critical saturation in a function 
- duplicated across upscale_relperm / upscale_relperm_benchmark
- code was duplicated for each component
- code was duplicated for each phase
 2015-09-14 11:34:31 +02:00
Arne Morten Kvarving b9ac1b0177 changed: use an array for relperm curves instead of loose members 2015-09-14 11:34:31 +02:00
Arne Morten Kvarving da60be1620 changed: move sanity checking of grid input to a function 
- was duplicated across upscale_relperm / upscale_relperm_benchmark
- improves main function readability
 2015-09-14 11:34:31 +02:00
Arne Morten Kvarving aa486d7e42 changed: move upscaling of single phase permeability to a function 
- was duplicated in upscale_relperm and upscale_relperm_benchmark
- improves readability of main function
 2015-09-14 11:34:31 +02:00
Arne Morten Kvarving 970abafddf changed: put command line parsing in separate function 
improves readability of main function
 2015-09-14 11:34:31 +02:00