Andreas Lauser
4571a8f841
add an energy "phase"
...
This is quite a hack: Even though energy is not a "phase" and it is
also not considered in MaxNumPhases and pu.num_phases because this
would break a lot of assumptions in old code, it is nevertheless
assigned an "canonical index" that can be translated "active index"
via PhaseUsage::phase_pos[]. This awkwardness is needed because much
of the legacy OPM code conflates the concepts of "fluid phase" and
"conserved quantity" and fixing that issue would basically mean an
almost complete rewrite of much of the legacy code. That said, the
same statement applies to polymer and solvent, but these are currently
handled as even more second-class citizens because they are not even
given a canonical index and also cannot be translated into an active
one.
2017-12-11 10:30:14 +01:00
Atgeirr Flø Rasmussen
0b6ac6c87b
Merge pull request #1365 from akva2/import_tutorials
...
Import tutorials from opm-core
2017-12-06 12:33:10 +01:00
Arne Morten Kvarving
efce6ef3da
add imported tutorials to build system
2017-12-06 12:06:49 +01:00
Arne Morten Kvarving
b5b6a8ad97
adjust separate build system for tutorials
2017-12-06 12:01:48 +01:00
Arne Morten Kvarving
fd86f664e1
Import tutorials from opm-core
2017-12-06 12:00:05 +01:00
Atgeirr Flø Rasmussen
8a5712a5d5
Merge pull request #1361 from totto82/add_gasoil_test
...
Add SPE1CASE2_OILGAS test case
2017-12-05 20:22:32 +01:00
Atgeirr Flø Rasmussen
7ba38de135
Merge pull request #1364 from akva2/quell_warnings
...
Quell warnings
2017-12-05 20:18:06 +01:00
Arne Morten Kvarving
075d518bea
fixed: add ENERGY to switch to quell unhandled enum value warning
2017-12-05 17:13:08 +01:00
Arne Morten Kvarving
dfd91d162b
quell signed/unsigned comparison mismatch warning
2017-12-05 16:50:58 +01:00
Arne Morten Kvarving
b702d3834b
remove unused variable
2017-12-05 16:50:52 +01:00
Atgeirr Flø Rasmussen
03a0baf447
Merge pull request #1343 from GitPaean/single_phase_resv
...
making the single phase RESV injection work.
2017-12-05 14:06:44 +01:00
Tor Harald Sandve
d099d88625
Add SPE1CASE2_OILGAS test case
2017-12-05 09:38:21 +01:00
Atgeirr Flø Rasmussen
8f1adadeae
Merge pull request #1355 from totto82/removeInitDupl
...
Only compute the initial solution once.
2017-12-05 08:44:11 +01:00
Atgeirr Flø Rasmussen
4c8f1c2ce4
Merge pull request #1359 from akva2/import_utils_from_core
...
Import some utils from opm-core
2017-12-05 08:37:00 +01:00
Arne Morten Kvarving
933fc4a089
add files imported from opm-core to build system
2017-12-04 16:30:59 +01:00
Roland Kaufmann
5284497bad
Remove superfluous backing class for share_obj
...
I originally wanted to make share_obj a class so that I could hide the
helper function, but it turned out that I needed a function after all
since a function template can be inferred from the parameters but the
type cannot from the constructor.
By returning a shared_ptr directly, the compiler can do return object
optimization.
2017-12-04 16:24:14 +01:00
Roland Kaufmann
f173dad56e
Provide stream that ignores everything written to it
...
Use this stream when you want a straight code path, but also be able
to disable output at will.
2017-12-04 16:24:14 +01:00
Roland Kaufmann
9193105410
Change from pass-by-value to pass-by-const-ref
...
The object is copied when put into the list, so there should be no
danger of dangling references.
2017-12-04 16:24:14 +01:00
Roland Kaufmann
0c53ac1509
Add classes for event-handling
...
The new classes Event and EventSource can be used as a simple mechanism
for implementing event-based callbacks in the simulators.
2017-12-04 16:24:14 +01:00
Atgeirr Flø Rasmussen
a767e166ae
Make DataMap.hpp properly include its dependencies.
2017-12-04 16:24:14 +01:00
Joakim Hove
3725ac8f7d
Added DataMap.hpp
2017-12-04 16:24:14 +01:00
Tor Harald Sandve
095b82212c
Use the initial solution from Ebos
2017-12-04 10:35:30 +01:00
Atgeirr Flø Rasmussen
65034250d1
Merge pull request #1356 from dr-robertk/PR/fix-minor-issue-gridview
...
[bugfix] make code compile when GridView is not Grid::LeafGridView.
2017-12-04 09:25:43 +01:00
Tor Harald Sandve
31657a5d1c
Add efficiencyFactor to GuideRate
2017-12-01 11:32:35 +01:00
Atgeirr Flø Rasmussen
95c8a0e673
Merge pull request #1358 from GitPaean/cleaningup_well_models
...
Cleaningup well models
2017-12-01 10:51:30 +01:00
Kai Bao
9317c1f023
removing the current argument in updateWellStateWithTarget
...
and some other cleaning up.
2017-11-30 17:14:29 +01:00
Kai Bao
ea3cbd1fe8
removing numComponents() from WellInterface
...
which is dumplicated from BlackoilWellModel.
2017-11-30 16:31:48 +01:00
Tor Harald Sandve
c787f5a251
Handle WEFAC
...
Added test combining WEFAC and GEFAC
2017-11-30 13:45:05 +01:00
Atgeirr Flø Rasmussen
7c3893016e
Merge pull request #1357 from totto82/changeMaxIterTest
...
Increase max_iter for ctests SPE5 and 2D_THREEPHASE_POLY_HETER
2017-11-30 13:01:16 +01:00
Tor Harald Sandve
8ae24f7f02
Increase max_iter for ctests SPE5 and 2D_THREEPHASE_POLY_HETER
2017-11-30 08:45:03 +01:00
Robert Kloefkorn
3a35a495a8
[bugfix] make code compile when GridView is not Grid::LeafGridView.
2017-11-29 23:26:38 +01:00
Atgeirr Flø Rasmussen
277a7809ac
Merge pull request #1354 from akva2/remove_polymer_int
...
remove polymer integration test
2017-11-29 20:50:10 +01:00
Atgeirr Flø Rasmussen
eef7b8ea94
Merge pull request #1348 from totto82/refactorBlackoilModelEbos
...
Put the ebosSimulator start and end methods where it belongs
2017-11-29 20:49:18 +01:00
Arne Morten Kvarving
70584b4a55
remove polymer integration test
2017-11-29 14:00:38 +01:00
Atgeirr Flø Rasmussen
29370f7962
Merge pull request #1353 from akva2/missing_msw_3d
...
fixed: missing msw_3d in commit message for the opm-data PR
2017-11-29 10:59:32 +01:00
Atgeirr Flø Rasmussen
2bf880fadd
Merge pull request #1351 from totto82/changeDefaultTimeStep
...
Use 1 day as default initial time step
2017-11-29 10:01:15 +01:00
Arne Morten Kvarving
937e8afb77
fixed: missing msw_3d in commit message for the opm-data PR
2017-11-29 09:45:09 +01:00
Atgeirr Flø Rasmussen
9cffa946f6
Merge pull request #1350 from totto82/onlyReadTuningParamOnce
...
Only read use_TUNING param once.
2017-11-28 20:43:35 +01:00
Atgeirr Flø Rasmussen
3d698cabcf
Merge pull request #1347 from totto82/fixLargeTime
...
Fix date for long simulation times
2017-11-28 16:54:48 +01:00
Tor Harald Sandve
a1dbeec4d4
Use 1 day as default initial time step
2017-11-28 15:12:48 +01:00
Tor Harald Sandve
2d2f9285c5
Only read use_TUNING param once.
...
Just to clean up the .DEBUG file.
2017-11-28 14:25:25 +01:00
Tor Harald Sandve
e350c04871
Fix date for long simulation times
2017-11-28 13:37:00 +01:00
Atgeirr Flø Rasmussen
14cedcf434
Merge pull request #1349 from akva2/polymer_fix
...
fixed: run polymer integration test with flow, not recently removed flow_polymer
2017-11-28 12:42:40 +01:00
Arne Morten Kvarving
425c7c2d66
fixed: run polymer integration test with flow, not recently removed flow_polymer
2017-11-28 09:51:37 +01:00
Tor Harald Sandve
90fcf0b132
Fix pvtIndex map for cases with non-active eqlnum regions.
2017-11-27 13:40:09 +01:00
Atgeirr Flø Rasmussen
9db16ad9dc
Merge pull request #1342 from GitPaean/fixing_polymer
...
fixing a polymer running with both shear and non-fully mixed polymer.
2017-11-27 13:33:38 +01:00
Kai Bao
7b61f3e692
moving polymer related to updateWaterMobilityWithPolymer
...
in StandardWell.
And not calculating the shear effect for the injecting wells when the
injection wells do not inject polymer.
2017-11-27 09:24:02 +01:00
Atgeirr Flø Rasmussen
46e958af43
Merge pull request #1337 from totto82/removeBlackOilPropsFromInit
...
Adapt to the refactoring of the Equil initialization code
2017-11-27 07:26:22 +01:00
Atgeirr Flø Rasmussen
f62275cb06
Merge pull request #1339 from blattms/write-ranks-without-nonactive
...
Disregard non-active cells when writing MPI_RANK in writeInitial.
2017-11-27 07:22:34 +01:00
Atgeirr Flø Rasmussen
401aa28c08
Merge pull request #1340 from totto82/solventAndResv
...
Make it possible to combine solvent and RESV
2017-11-27 07:20:24 +01:00
