OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-16 07:51:56 -06:00
Code Issues Packages Projects Releases Wiki Activity
7,812 Commits 24 Branches 102 Tags 90 MiB
516d0237d5
Commit Graph

5423 Commits

Author SHA1 Message Date
Arne Morten Kvarving
2da361414e changed: relocate the remaining files in opm/core/utility 
move to opm/common/utility/numeric
 2018-01-30 16:33:46 +01:00
Arne Morten Kvarving
141186ad1d changed: opm/[core -> common]/utility/parameters 2018-01-30 16:33:45 +01:00
Arne Morten Kvarving
e9e5c15e99 changed: opm/[core/linalg -> common/utility/numeric]/blas_lapack.h 2018-01-30 12:47:10 +01:00
Arne Morten Kvarving
e9404486bb changed: opm/common/[->utility]/ResetLocale.hpp 2018-01-30 12:34:04 +01:00
Arne Morten Kvarving
742d2d2158 changed: opm/common/[util->utility]/numeric/cmp.hpp 2018-01-30 12:13:30 +01:00
Arne Morten Kvarving
4945c9b2ed changed: pass the mcmg element layout as a parameter for dune 2.6 
the template parameter is deprecated
 2018-01-22 17:25:14 +01:00
Arne Morten Kvarving
2aa0043550 changed: use Dune::createScalarProduct for dune 2.6 
ScalarProductChooser is no more
 2018-01-22 17:24:58 +01:00
Arne Morten Kvarving
4315665b64 changed: expose category as member for dune 2.6 
the enum can only be used with a define, and that would
just be a temporary solution in any case
 2018-01-22 17:23:22 +01:00
Arne Morten Kvarving
83d4dae117 changed: do not ifdef the entire implementation 
better to handle this in build system
 2018-01-17 18:16:26 +01:00
Arne Morten Kvarving
c03a980199 Import the remaining code from opm-core 2018-01-17 15:18:56 +01:00
Andreas Lauser
f34cfafc22
Merge pull request #1377 from totto82/useEbosEclOutput 
Start using ecl output from Ebos
 2018-01-10 15:01:27 +01:00
Atgeirr Flø Rasmussen
6c8b0d68ca Remove use of old implicit imcomp 2p transport. 2018-01-08 17:23:43 +01:00
Atgeirr Flø Rasmussen
8ad9c979f8 Remove old 2p simulator. 2018-01-08 17:22:50 +01:00
Atgeirr Flø Rasmussen
aca95895c9 Fix: set precision of the correct stream. 2018-01-08 17:18:47 +01:00
Tor Harald Sandve
0e6fe26a61 Start using ecl output from Ebos 
The wells, FIP and initial output of NNCs is still handled
by code in opm-simulators. The plan is to move more of the
functionality to ebos.

All tests pass and MPI restart works
 2018-01-04 09:29:58 +01:00
Tor Harald Sandve
969d8f238d Use phase and comp info from FluidSystem 
TODO: The output, fip and restart still uses a mixture of old and
new phase indices. This needs to be adressed in future PRs
 2018-01-03 08:44:37 +01:00
Atgeirr Flø Rasmussen
9f14b63b82
Merge pull request #1370 from totto82/changeDpMaxDefault 
Change dp_max_rel default from 1.0 to 0.3
 2017-12-20 16:59:43 +01:00
Tor Harald Sandve
7567748f2d Adapt to changed initial FluidState type in ebos 2017-12-15 08:19:01 +01:00
Tor Harald Sandve
4097a07572 Change dp_max_rel default from 1.0 to 0.3 2017-12-14 11:16:16 +01:00
Andreas Lauser
5bf53148c0 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-12-11 11:33:52 +01:00
Andreas Lauser
db1f257184 make call_umfpack.c compile even if UMFPACK is not available 
That said, don't try to call any of its functions or you'll regret it
at runtime!
 2017-12-11 11:33:52 +01:00
Andreas Lauser
503c7d1ca8 make the PETSc code compile even if PETSc is not available 
if PETSc is not available, the .cpp file will compile fine because it
will be reduced to be empty, but trying to include
LinearSolverPetsc.hpp in this case will result in an error.
 2017-12-11 11:33:52 +01:00
Andreas Lauser
244871829d PhaseUsage: handle polymer and solvent the same way as energy 2017-12-11 10:30:14 +01:00
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
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
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
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
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
Robert Kloefkorn
3a35a495a8 [bugfix] make code compile when GridView is not Grid::LeafGridView. 2017-11-29 23:26:38 +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
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
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
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
Tor Harald Sandve
90fcf0b132 Fix pvtIndex map for cases with non-active eqlnum regions. 2017-11-27 13:40:09 +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