Atgeirr Flø Rasmussen
4f414b78ed
Ensure we do not dereference nullptr.
2018-02-13 16:22:11 +01:00
Atgeirr Flø Rasmussen
cf9b7c39b9
Adapt to moved opm-grid headers.
2018-02-10 08:33:33 +01:00
Andreas Lauser
3d0fca2f08
adapt to the gridManager() -> vanguard() change in ewoms
2018-02-08 16:27:42 +01:00
Andreas Lauser
7f3a9f1f43
catch NumericalIssue instead of NumericalProblem
...
the underlying problem is that the OPM build system does not define a
HAVE_OPM_COMMON macro in config.h.
2018-02-08 12:02:25 +01:00
Andreas Lauser
58a1b7df1f
adapt to the move of infrastructure from opm-common to opm-material
2018-02-07 13:32:52 +01:00
Atgeirr Flø Rasmussen
532403c5fb
Merge pull request #1391 from totto82/RFIP
...
Use FIP, EGRID and INIT output code in ebos.
2018-02-06 12:54:01 +01:00
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
Tor Harald Sandve
cdeefc3a34
Fix command line argument for double precision restart output
2018-01-29 08:56:55 +01:00
Tor Harald Sandve
84a8b8eca6
Pass empty regionSummaryData and blockSummaryData to output
2018-01-29 08:56:55 +01:00
Tor Harald Sandve
b38430ea2e
Output TCPU for every substep.
2018-01-29 08:56:55 +01:00
Tor Harald Sandve
6d0c716d76
Clean-up FIP
2018-01-29 08:56:55 +01:00
Tor Harald Sandve
36f6b7ad00
Remove writInit()
...
The EGRID and INIT files are written using ebos
2018-01-29 08:56:55 +01:00
Andreas Lauser
386ade39f4
flow: let core ebos handle the output directory for the result files
...
this adds a new parameter --ecl-output-dir=$FOO to the "virtual"
command line arguments of the ebos simulator.
2018-01-29 08:54:30 +01:00
Tor Harald Sandve
137ff53ae7
Remove output of FIP
2018-01-29 08:54: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