Commit Graph

6085 Commits

Author SHA1 Message Date
Bård Skaflestad
efc2915b74
Merge pull request #1195 from akva2/quell_unhandled_warning
fixed: add ENERGY to switch to quell unhandled enum value warning
2017-12-05 19:51:17 +01:00
Arne Morten Kvarving
0c1ed25eb1 fixed: add ENERGY to switch to quell unhandled enum value warning 2017-12-05 17:13:08 +01:00
Atgeirr Flø Rasmussen
c9c4c81661
Merge pull request #1188 from totto82/handleWEFAC
Handle WEFAC
2017-12-05 08:37:44 +01:00
Atgeirr Flø Rasmussen
55348d6441
Merge pull request #1193 from akva2/move_utils_to_simulators
Move utils to simulators
2017-12-05 08:36:54 +01:00
Atgeirr Flø Rasmussen
54b5910921
Merge pull request #1194 from akva2/move_average_to_upscaling
remove Average.hpp (from build system)
2017-12-05 08:36:13 +01:00
Arne Morten Kvarving
0a4cc569aa remove Average.hpp (from build system)
moved to opm-upscaling
2017-12-04 16:48:18 +01:00
Arne Morten Kvarving
860e3d5831 remove some unused files 2017-12-04 16:32:14 +01:00
Arne Morten Kvarving
97098ac190 remove files moved to opm-simulators from build system 2017-12-04 16:25:27 +01:00
Tor Harald Sandve
bcd83025ec Add efficiencyFactor to GuideRate 2017-12-01 11:32:35 +01:00
Tor Harald Sandve
1b13f44e12 Handle WEFAC
Added test combining WEFAC and GEFAC
2017-11-30 13:45:05 +01:00
Atgeirr Flø Rasmussen
1d1347d2b3
Merge pull request #1190 from totto82/BUGFIX_equil
Fix pvtIndex map for cases with non-active eqlnum regions.
2017-11-28 07:31:04 +01:00
Tor Harald Sandve
19796e2ddc Fix pvtIndex map for cases with non-active eqlnum regions. 2017-11-27 13:40:09 +01:00
Atgeirr Flø Rasmussen
2a88805822
Merge pull request #1187 from totto82/removeBlackOilPropsFromInit
Remove black oil props from init
2017-11-27 07:26:45 +01:00
Atgeirr Flø Rasmussen
37421c62da
Merge pull request #1189 from andlaus/remove_configure
remove the configure wrapper script
2017-11-24 13:12:14 +01:00
Tor Harald Sandve
729d6cf30e Adress PR review issues 2 2017-11-24 10:52:57 +01:00
Andreas Lauser
f786d4749e remove the configure wrapper script
this used to provide autotools compatibility, but it has not been working for a while. Thus it is IMO better to remove it in order not to mislead people.
2017-11-24 10:36:46 +01:00
Tor Harald Sandve
d1a654f414 Fix 2p bug 2017-11-22 09:24:52 +01:00
Tor Harald Sandve
bce19d87dc Adress PR review issues 2017-11-22 08:31:57 +01:00
Tor Harald Sandve
833b019413 Remove the usage of partition_unif_idx() from opm-core 2017-11-21 15:01:52 +01:00
Tor Harald Sandve
3486e98ae3 Cleaning the initialization code
-remove whitespaces
-fix documentation
2017-11-21 12:52:07 +01:00
Tor Harald Sandve
e613f2b8c5 Use &ref not shared_pointer to MaterialLawManager 2017-11-21 12:08:10 +01:00
Tor Harald Sandve
12108d57ab Remove blackoilPhases and phaseUsage from the initialization code
Note 1: The initialization code now always consider 3 phases.
For 2-phase cases a trivial (0) state is returned.
Note 2: The initialization code does not compute a BlackoilStats,
but instead pass the initialization object with the initial state.
2017-11-21 12:08:10 +01:00
Tor Harald Sandve
8def11ff93 Remove BlackoilProps from equil initalization code
Use FluidSystem and materialLaw from opm-material
directly not via the BlackoilProps in opm-core
2017-11-21 12:08:10 +01:00
Atgeirr Flø Rasmussen
d049125205
Merge pull request #1186 from akva2/remove_param_group
remove ParameterGroup code
2017-11-18 09:14:11 +01:00
Arne Morten Kvarving
acc631f504 remove ParameterGroup code
moved to opm-common
2017-11-17 13:55:07 +01:00
Atgeirr Flø Rasmussen
d4bbaa1d3e
Merge pull request #1185 from akva2/more_removals
remove more sources which are unused after removals in opm-upscaling
2017-11-17 12:52:28 +01:00
Arne Morten Kvarving
476a64c370 remove more sources which are unused after removals in opm-upscaling 2017-11-17 10:47:15 +01:00
Atgeirr Flø Rasmussen
c3121f0a1a
Merge pull request #1184 from akva2/remove_unused_sources
remove unused code
2017-11-15 14:09:31 +01:00
Arne Morten Kvarving
b208db1b74 remove unused code 2017-11-15 11:56:40 +01:00
Atgeirr Flø Rasmussen
18e230a18b
Merge pull request #1122 from atgeirr/fix-type-bug-in-equil
Fix type bug in equil
2017-11-14 14:40:47 +01:00
Joakim Hove
c2dd80f6c5
Merge pull request #1182 from joakim-hove/use-wells
Updated NNC() constructor arguments.
2017-11-06 17:06:22 +01:00
Atgeirr Flø Rasmussen
c1f16be87b Merge pull request #1183 from akva2/update_rh_packaging
update redhat packaging
2017-10-25 13:06:37 +02:00
Arne Morten Kvarving
132cfc0ff7 update redhat packaging 2017-10-25 09:43:30 +02:00
Joakim Hove
210364ecde Schedule no longer part of EclipseState. 2017-10-24 20:38:15 +02:00
Andreas Lauser
10a07ef9a4 change version to 2018.04-pre 2017-10-19 19:30:31 +02:00
Atgeirr Flø Rasmussen
1e0135c9bd Update swatinit tests to account for bugfix. 2017-10-12 14:27:32 +02:00
Atgeirr Flø Rasmussen
ac9a20da20 Update equil regression reference after bugfix.
Also reduce some very coarse tolerances to more reasonable levels.
2017-10-12 14:27:32 +02:00
Atgeirr Flø Rasmussen
e5a7535a22 Bugfix: type for target capillary pressure. 2017-10-12 14:27:32 +02:00
Atgeirr Flø Rasmussen
e4a8fad29c Merge pull request #1180 from blattms/cleanup-version-ifs
[cleanup] Removes unnecessary if clauses for unsupported DUNE versions.
2017-10-12 13:28:50 +02:00
Atgeirr Flø Rasmussen
c8fc2bd336 Merge pull request #1177 from alfbr/master
Removing redundant checks from Nexus
2017-10-11 21:57:36 +02:00
Markus Blatt
a46e2c7121 [cleanup] Removes unnecessary if clauses for unsupported DUNE versions.
We are targetting DUNE 2.4.* and 2.5.* currently. Therefore this commit removes
the if checks for lower versions to cleanup the code.
2017-10-11 21:25:18 +02:00
Atgeirr Flø Rasmussen
e0fc476fbe Merge pull request #1179 from totto82/fixSwatInitTest
Update the swatinit test base on fix in opm-material#248
2017-10-11 18:53:21 +02:00
Alf B. Rustad
75ff5ea7d5 Cosmetic change 2017-10-11 10:45:18 +02:00
Alf B. Rustad
7e40af760f Cosmetic change 2017-10-11 10:45:18 +02:00
Alf B. Rustad
0a6baab957 Remove remaining Nexus checks 2017-10-11 10:45:17 +02:00
Alf B. Rustad
8f445699e9 Avoid false positives by introducing a tolerance 2017-10-11 10:45:17 +02:00
Alf B. Rustad
8321530c4e Removing redundant checks from Nexus 2017-10-11 10:44:59 +02:00
Tor Harald Sandve
75657ff482 Update the swatinit test base on fix in opm-material#248 2017-10-11 09:39:12 +02:00
Atgeirr Flø Rasmussen
417c5b2d46 Merge pull request #1178 from andlaus/fix_mcu
mark initHydroCarbonState() as inline
2017-10-05 09:06:57 +02:00
Andreas Lauser
2ab9b5de45 mark initHydroCarbonState() as inline
this allows it to be used in multiple compile units without the linker
running amok.
2017-10-04 19:24:20 +02:00