Commit Graph

958 Commits

Author SHA1 Message Date
Arne Morten Kvarving
0d01dfc395 update packaging tags for final release 2015-11-04 14:52:46 +01:00
Atgeirr Flø Rasmussen
68601abdc1 Update package release tags. 2015-10-28 15:56:27 +01:00
Atgeirr Flø Rasmussen
2aaffe0ae9 Merge pull request #163 from akva2/release/2015.10
Bump version and unify format of dune.module.
2015-10-26 12:37:17 +01:00
Atgeirr Flø Rasmussen
e091e8cd38 Bump version and unify format of dune.module.
Backports relevant parts of 0f1f9abece
2015-10-26 11:38:16 +01:00
Arne Morten Kvarving
6496119195 update versions 2015-10-26 10:26:53 +01:00
Atgeirr Flø Rasmussen
fda4f3bdf9 Merge pull request #161 from akva2/update_redhat_packaging
update redhat packaging
2015-10-20 18:34:33 +02:00
Arne Morten Kvarving
12d721900b update redhat packaging 2015-10-20 15:59:29 +02:00
Atgeirr Flø Rasmussen
25c3272e30 Merge pull request #160 from akva2/update_debian_packaging
Update debian packaging
2015-10-20 10:41:01 +02:00
Arne Morten Kvarving
604f2a4d2f update debian packaging 2015-10-20 09:51:28 +02:00
Arne Morten Kvarving
127ea79494 added: option to install benchmarks
defaults to off. used for packaging
2015-10-20 09:51:08 +02:00
Bård Skaflestad
e337895692 Merge pull request #158 from akva2/fix_sibling_builds
fixed: make sure opm-common can be (re-)found
2015-09-16 16:25:10 +02:00
Arne Morten Kvarving
06981c153e Merge pull request #159 from flikka/add-cfloat
Added cfloat include, build failed on some systems
2015-09-16 15:05:13 +02:00
Kristian Flikka
711cdb9ac0 Added cfloat include, build failed on some systems 2015-09-16 15:03:14 +02:00
Arne Morten Kvarving
3d4a7fc43a fixed: make sure opm-common can be (re-)found
see https://github.com/OPM/opm-common/issues/40#issuecomment-140720316
2015-09-16 14:28:24 +02:00
Bård Skaflestad
9a3a6f2877 Merge pull request #157 from akva2/fix_mpi_build
Fix mpi build
2015-09-14 13:10:44 +02:00
Arne Morten Kvarving
add320f783 benchmark: sync with opm-parser change 2015-09-14 13:09:59 +02:00
Arne Morten Kvarving
f9ea2ef47a fixed: mpi build 2015-09-14 13:08:42 +02:00
Atgeirr Flø Rasmussen
086b528613 Merge pull request #153 from akva2/refactor_relperm_upscaling_apps
Refactor relperm upscaling apps
2015-09-14 11:37:34 +02:00
Arne Morten Kvarving
0a46c04ddf changed: quell / remove cause of unused variable warnings 2015-09-14 11:34:32 +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
e8ae00d425 changed: remove debug function 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
b98b50f23a changed: use a loop instead of cut-and-paste 2015-09-14 11:34:32 +02:00
Arne Morten Kvarving
8194d1b7cd changed: put phase permeability (and the diagonal) in an array 2015-09-14 11:34:32 +02:00
Arne Morten Kvarving
915b94a11c changed: put minimum permability values in an array 2015-09-14 11:34:32 +02:00
Arne Morten Kvarving
88a16eb9b3 changed: put maximum permability values in an array 2015-09-14 11:34:31 +02:00
Arne Morten Kvarving
bb8c21cf66 changed: remove unused average permeabilities
if debug code is needed later, it can be added in your build tree.
2015-09-14 11:34:31 +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
4ecd4ed293 changed: unify option structure with main relperm application
- to factor out common code, it needs to be similiar.
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
Arne Morten Kvarving
4af2620535 changed: use a c++11 initializer list instead of repeated inserts 2015-09-14 11:34:31 +02:00
Arne Morten Kvarving
b33d938b0c changed: move eclipse sanity check of relperm values into helper function
- avoids duplication per phase
- avoids duplication in upscale_relperm / upscale_relperm_benchmark
2015-09-14 11:34:31 +02:00
Arne Morten Kvarving
f1f1df5c4f refactor: move phase perm to relperm calculations to helper class
- avoids duplication per phase
- avoids duplication in upscale_relperm / upscale_relperm_benchmark
2015-09-14 11:34:31 +02:00