Commit Graph

684 Commits

Author SHA1 Message Date
Joakim Hove
e125334847 Merge pull request #1315 from joakim-hove/extract-schedule
Use Schedule constructor.
2017-11-06 17:06:49 +01:00
Joakim Hove
566f4fbb02 Use Schedule constructor. 2017-11-06 14:20:41 +01:00
Andreas Lauser
e65790224e replace #if HAVE_CONFIG_H by #ifdef HAVE_CONFIG_H
it seems like most build systems pass a -DHAVE_CONFIG_H flag to the
compiler which still causes `#if HAVE_CONFIG_H` to be false while it
clearly is supposed to be triggered.

That said, I do not really see a good reason why the inclusion of the
`config.h` file should be guarded in the first place: the file is
guaranteed to always available by proper build systems, and if it was
not included the build either breaks at the linking stage or -- at the
very least -- the runtime behavior of the resulting libraries will be
very awkward.
2017-10-27 17:48:26 +02:00
Joakim Hove
19318e5019 Schedule no longer part of EclipseState. 2017-10-24 20:38:15 +02:00
Kai Bao
ba8eb708d1 fixing reviewing comments from PR 1279. 2017-10-16 17:01:15 +02:00
Atgeirr Flø Rasmussen
9021571c05 Update swatinit tests to account for bugfix. 2017-10-12 14:27:32 +02:00
Atgeirr Flø Rasmussen
8779937d3d Update equil regression reference after bugfix.
Also reduce some very coarse tolerances to more reasonable levels.
2017-10-12 14:27:32 +02:00
Kai Bao
fc06923c50 changing StandardWellsDense to BlackoilModelEbos
for a better naming.
2017-10-12 13:39:58 +02:00
Atgeirr Flø Rasmussen
bbfd5b6413 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
Markus Blatt
2bdafdb602 [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
Markus Blatt
56cd0f5d24 Removed unnecessary version if in transmult test 2017-10-11 16:20:36 +02:00
Tor Harald Sandve
4b123f839a Update the swatinit test base on fix in opm-material#248 2017-10-11 09:39:12 +02:00
Atgeirr Flø Rasmussen
63b38cfe20 Merge pull request #1281 from totto82/fixRESV
Use pore volume weighted averaged hydrocarbon state in rateConverted.
2017-10-09 13:42:43 +02:00
Arne Morten Kvarving
2acb886292 add flow simulators to the data update script 2017-10-09 11:21:55 +02:00
Arne Morten Kvarving
02b4644612 workaround eigen 3.3.2 issue
eigen returns a matrix with all coefficients stored from the operator/
this makes the comparison fail as x has no nonzeros
2017-10-06 12:48:43 +02:00
Tor Harald Sandve
ebc2f46967 Use pore volume weighted averaged hydrocarbon state in rateConverted.
- pressure, rs and rv is averaged using hydrocarbon pore volume weights.
- pvtRegions is used as input in the conversion factor calculations.
- the pvt cell of the first well cell is used as the pvt index.
(Completing a well in two different PVT regions sounds like a very bad
idea anyway)
- FIP region support is added to the rate converter also for the ebos
interface.
2017-10-03 10:25:56 +02:00
Joakim Hove
b6b2f12142 Updated NNC() constructor. 2017-09-26 14:30:50 +02:00
Arne Morten Kvarving
0b2fa89e69 fixed: spe1_2p is not run with flow_ebos, it is run with flow_ebos_2p 2017-09-26 08:05:42 +02:00
Kai Bao
f982faed05 not using std::make_unique in test_wellmodel
to avoid using C++14 specific functions.
2017-09-04 15:50:01 +02:00
Atgeirr Flø Rasmussen
77f3bdaeda Merge pull request #1257 from totto82/add_invert4x4
Add invert4x4 specialization for invertMatrix()
2017-09-04 09:08:32 +02:00
Tor Harald Sandve
210f1edf25 Add test for invert 4x4 matrix specialization 2017-08-29 11:01:20 +02:00
Kai Bao
9accb56c86 adding a test for well model.
It is just test for StandardWell.
2017-08-25 14:09:26 +02:00
Arne Morten Kvarving
86bc690ea4 add spe9group to reference data update script
was missing in 1950052684
2017-08-22 14:28:58 +02:00
Atgeirr Flø Rasmussen
1679078c51 Make scripts run on older bash versions. 2017-06-13 14:11:19 +02:00
Arne Morten Kvarving
cdf25e1a9e add spe5 flow_solvent regression test 2017-06-12 10:24:30 +02:00
Arne Morten Kvarving
09cbcee62c add regression test for flow_polymer 2017-06-09 13:11:05 +02:00
Atgeirr Flø Rasmussen
33025d752e Clarified notation in test. 2017-06-01 14:07:57 +02:00
Atgeirr Flø Rasmussen
f707abae36 Add unit test for connectionMultiPhaseUpwind(). 2017-06-01 13:55:11 +02:00
Atgeirr Flø Rasmussen
e07ddfccee Merge pull request #1170 from akva2/2p
Add 2 phase regression test for flow_ebos and flow_legacy
2017-05-12 13:02:46 +02:00
Joakim Hove
8b36daa7aa Merge pull request #1173 from joakim-hove/use-libecl
Use libecl in jenkins build.
2017-05-10 13:37:05 +02:00
Joakim Hove
dc65d43109 Use libecl in jenkins build. 2017-05-08 15:03:12 +02:00
Andreas Lauser
f3e0b9c692 Merge pull request #1169 from totto82/prepare_solvent
Prepare for 2p and  extended models.
2017-05-08 13:47:43 +02:00
Tor Harald Sandve
6084721812 Prepare for extended models.
Let the code loop over number of components instead of phase
Pass TypeTag as template parameter instead of all the properties.
2017-05-08 09:52:30 +02:00
Arne Morten Kvarving
6812d9619e add 2 phase case to update_reference_data.sh
ie jenkins update_data trigger support
2017-05-04 21:24:48 +02:00
Arne Morten Kvarving
3c0cb9e950 adjust for changed ParameterGroup namespacing 2017-04-28 15:36:25 +02:00
Arne Morten Kvarving
ca2288ac37 changed: remove embedded 'parameters' namespace in ParamGroup
inconsistent and unnecessary.

this is purely a cosmetic change, the only exception was a function with
the generic name 'split', which was renamed to splitParam to avoid confusion.
2017-04-28 15:34:11 +02:00
Atgeirr Flø Rasmussen
2b5000bf06 Merge pull request #1137 from andlaus/jenkins-update-flow_ebos-data
update update_reference_data.sh to also update the flow_ebos reference solutions
2017-04-19 13:04:47 +02:00
Kai Bao
8d96d835b3 removing the well potential from WellsManager constructor. 2017-04-11 16:51:16 +02:00
Andreas Lauser
0b84a89a1d update update_reference_data.sh to also update the flow_ebos reference solutions
maybe this even works.
2017-04-11 15:56:02 +02:00
Atgeirr Flø Rasmussen
f166c9e15c Fix data update directory for flow_sequential test. 2017-04-10 13:54:49 +02:00
Atgeirr Flø Rasmussen
db8523e849 Merge pull request #1082 from totto82/satTableIdWells
Support for saturation table for each well completion
2017-04-07 14:43:28 +02:00
Arne Morten Kvarving
7bbb4a2a28 update scripts to use new paths for reference data
reference data paths have been updated to reflect simulator
data is for.
2017-04-07 11:40:45 +02:00
Tor Harald Sandve
cd564ade5f Support for saturation table for each well completion
Compute relperms for each well completion based on saturation table ids
(satnums)

Does not work in combination with hysteresis.
2017-04-06 14:21:59 +02:00
Tor Harald Sandve
214e9764b2 Add sat table id to well struct 2017-04-06 13:52:27 +02:00
Arne Morten Kvarving
866001d148 fixed: paths in data update script
forgot to update these in https://github.com/OPM/opm-simulators/pull/1096
2017-04-05 12:04:26 +02:00
Tor Harald Sandve
df74d7e696 Enable swatinit equil test 2017-03-22 10:26:03 +01:00
Tor Harald Sandve
02122a60ce FIX swatinit test in test_equil
The capillarySwatinit.DATA is updated to make it possible to run in Ecl.
Referance solutions is updated accordingly.
2017-03-22 10:20:59 +01:00
Joakim Hove
d237c91b8d Temporarily disabled EQUIL + SWATINIT test. 2017-03-21 16:49:14 +01:00
Atgeirr Flø Rasmussen
a89af9c92f Updated output_dir in test driver scripts/ 2017-03-16 17:18:14 +01:00
Atgeirr Flø Rasmussen
78995a7f61 Merge pull request #949 from akva2/move_msw_test
convert MSW_2D_H__ into a regression test
2017-03-15 09:56:33 +01:00