Commit Graph

8101 Commits

Author SHA1 Message Date
Arne Morten Kvarving
a9fc6b1a27 update redhat packaging 2018-05-14 12:50:16 +02:00
Atgeirr Flø Rasmussen
ffd1f76c7c
Merge pull request #1474 from akva2/data_to_tests
data -> tests
2018-05-14 07:36:33 +02:00
Andreas Lauser
483e04c5da
Merge pull request #1471 from totto82/implement_blackoil_energy_PR
Add blackoil + energy specialization to Flow
2018-05-08 11:30:12 +02:00
Arne Morten Kvarving
7f32dad6c7 data -> tests 2018-05-08 10:39:48 +02:00
Kai Bao
45023f304e
Merge pull request #1465 from atgeirr/fix-ilu-serial
Make sure we (re-)throw MatrixBlockError also in the serial case.
2018-05-08 10:39:15 +02:00
Tor Harald Sandve
54c8a48481 code clean-up based on review 2018-05-08 10:22:47 +02:00
Tor Harald Sandve
f00ad22d98 Fix thermal debug run 2018-05-02 09:15:52 +02:00
Tor Harald Sandve
936220f85c Add test case for thermal simulator in flow 2018-04-30 13:56:15 +02:00
Tor Harald Sandve
ee88790dea Add a flow specialization for blackoil with energy conservation
The energy conservation is enabled by specifying either TEMP or
THERMAL in the deck. The deck also needs to contatin relevant fluid and rock
heat properties.

The blackoil + energy equations are solved fully implicit.
2018-04-30 13:45:18 +02:00
Arne Morten Kvarving
81dcc011a3
Merge pull request #1468 from andlaus/update_version
dune.module: update version to 2018.10-pre
2018-04-27 10:45:34 +02:00
Andreas Lauser
5ea9de7d47 dune.module: update version to 2018.10-pre 2018-04-26 17:47:23 +02:00
Arne Morten Kvarving
53ee44f089 build with mpi on redhat 2018-04-25 09:35:13 +02:00
Tor Harald Sandve
dee7d97b8f
Merge pull request #1464 from totto82/fixilu
keep using the block inversion algorithm in OPM
2018-04-24 15:18:17 +02:00
Atgeirr Flø Rasmussen
f9c1fbcbe6 Make sure we (re-)throw MatrixBlockError also in the serial case. 2018-04-24 14:32:43 +02:00
Tor Harald Sandve
f66fb298db keep using the block inversion algorithm in OPM 2018-04-24 11:25:33 +02:00
Joakim Hove
e012363abc
Merge pull request #1462 from GitPaean/fixing_vfp_running_2
adapting to the interface change of VFP related in parser.
2018-04-23 16:30:11 +02:00
Joakim Hove
8965fc3138
Merge pull request #1460 from lars-petter-hauge/restart_timestep
Only load wells that have simulated data
2018-04-23 12:21:58 +02:00
Atgeirr Flø Rasmussen
950148d66e
Merge pull request #1463 from akva2/update_banners
bring banners into the new ssl enabled world
2018-04-20 12:33:57 +02:00
Arne Morten Kvarving
25fda55778 bring banners into the new ssl enabled world 2018-04-20 11:31:15 +02:00
Kai Bao
78cc2b8ca4 adapting to the interface change of VFP related in parser. 2018-04-20 11:29:22 +02:00
Lars Petter Øren Hauge
0ea2b9afe2 Only load wells that have simulated data
Wells that are added at the same time step as RESTART is initiated will
not be present in a restart file. Use the previous time step to retrieve
wells
2018-04-17 14:09:11 +02:00
Atgeirr Flø Rasmussen
d9b215ec70
Merge pull request #1459 from atgeirr/update-changelog
Updated to reflect changes from the last few months.
2018-04-13 14:57:29 +02:00
Atgeirr Flø Rasmussen
07cdb7d4be Updated to reflect changes from the last few months. 2018-04-13 14:33:11 +02:00
Arne Morten Kvarving
45f70f1a38
Merge pull request #1451 from akva2/missing_tests_to_root
fixed: missing OPM_DATA_ROOT -> OPM_TESTS_ROOT
2018-04-13 11:48:20 +02:00
Arne Morten Kvarving
ae8445a049
Merge pull request #1458 from akva2/various_fixes
Various small fixes
2018-04-13 11:47:32 +02:00
Atgeirr Flø Rasmussen
6f72e325f1
Merge pull request #1457 from joakim-hove/vfp-no-init
Use VFPProdTable constructor
2018-04-13 11:31:58 +02:00
Arne Morten Kvarving
351c495388 fixed: pass by reference as intended 2018-04-13 11:25:10 +02:00
Arne Morten Kvarving
33d2095b07 initialize variable 2018-04-13 11:25:10 +02:00
Arne Morten Kvarving
4933c10035 reduce scope of variable 2018-04-13 11:25:10 +02:00
Arne Morten Kvarving
ee57c82834 changed: mark constructors explicit 2018-04-13 11:25:10 +02:00
Arne Morten Kvarving
fddad72a3e fixed: quell signed/unsigned comparison warning 2018-04-13 11:25:10 +02:00
Joakim Hove
4e7213b97a Use VFPProdTable constructor 2018-04-12 20:04:26 +02:00
Atgeirr Flø Rasmussen
63dabb4777
Merge pull request #1450 from GitPaean/update_VFP_related
adapting to the change related to VFP from the parser.
2018-04-12 11:20:21 +02:00
Tor Harald Sandve
6a3b869331
Merge pull request #1452 from andlaus/dissolve_aux
adapt to the removal of the `ewoms/aux` directory
2018-04-11 12:50:12 +02:00
Kai Bao
ed49fd1e88 adapting to the change related to VFP from the parser. 2018-04-11 09:22:52 +02:00
Andreas Lauser
55093b4918 adapt to the removal of the ewoms/aux directory 2018-04-10 10:17:31 +02:00
Arne Morten Kvarving
e163c97fc2
Merge pull request #1441 from totto82/fix_co2case
Some minor fixes to RESV and initial well composition
2018-04-09 14:30:41 +02:00
Arne Morten Kvarving
2f3996cc15 fixed: missing OPM_DATA_ROOT -> OPM_TESTS_ROOT 2018-04-09 10:40:34 +02:00
Atgeirr Flø Rasmussen
d211c1927f
Merge pull request #1393 from andlaus/minimal_changes_for_blackoil_energy
Minimal changes for blackoil energy
2018-04-06 16:11:57 +02:00
Andreas Lauser
3924bb1e6e explicitly disable all extensions supported by black oil model for the base simulator
this should not really be necessary because they are supposed to be
disabled by default, but it makes things a bit more explicit
2018-04-06 11:01:33 +02:00
Andreas Lauser
b74d39f2e1 make flow compile in face of the energy conservation changes of the eWoms black oil model
with this, flow does *not* yet support thermal simulations, this patch
merely makes it compile while nothing user-facing is supposed to
change.
2018-04-06 11:01:33 +02:00
Atgeirr Flø Rasmussen
a32a5b24eb
Merge pull request #1448 from bska/missing-include
Include <sstream> for Class "ostringstream"
2018-04-04 19:41:17 +02:00
Bård Skaflestad
0f4354d8fd Include <sstream> for Class "ostringstream"
Some implementations do not get a transitive definition of class
"ostringstream" in scope through the other headers and therefore
fail to compile the member function

  SimulatorReport::reportStep(std::ostringstream&)
2018-04-04 19:00:51 +02:00
Atgeirr Flø Rasmussen
9897ae361e
Merge pull request #1428 from totto82/relax_convergence
Add option for relaxed CNV tolerance
2018-04-04 16:38:47 +02:00
Atgeirr Flø Rasmussen
ce308455ab
Merge pull request #1433 from totto82/fix_reportStep
Add reportStep method in SimulatorReport and use it
2018-04-04 15:23:01 +02:00
Atgeirr Flø Rasmussen
4f39cdc9c9
Merge pull request #1439 from GitPaean/silencing_warning_extra_
silencing warning related to extra ; from BlackoilAmg
2018-04-04 14:32:18 +02:00
Atgeirr Flø Rasmussen
482c63e274
Merge pull request #1446 from GitPaean/removing_flowmainpolymer
Removing flowmainpolymer
2018-04-04 14:30:37 +02:00
Joakim Hove
024472b773
Merge pull request #1445 from joakim-hove/missing-LGR-features
Mark LGR related keywords as unsupported
2018-04-03 14:35:44 +02:00
Atgeirr Flø Rasmussen
b9c5d26cdc
Merge pull request #1447 from akva2/fix_tests_data
setup-opm-data -> setup-opm-tests
2018-04-03 13:16:42 +02:00
Arne Morten Kvarving
b7f791c623 setup-opm-data -> setup-opm-tests 2018-04-03 12:40:45 +02:00