OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-30 11:06:55 -06:00
Code Issues Packages Projects Releases Wiki Activity
11,562 Commits 24 Branches 102 Tags 84 MiB
4be4c543e7
Commit Graph

11562 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bård Skaflestad
4be4c543e7
Merge pull request #2753 from akva2/janitoring 
use std::make_unique where applicable
 2020-09-02 16:24:21 +02:00
Arne Morten Kvarving
7305f84351 use std::make_unique where applicable 2020-09-02 15:35:39 +02:00
Joakim Hove
4b45623333
Merge pull request #2748 from joakim-hove/add-udq-state 
Add UDQState argument to output writer
 2020-09-01 15:07:21 +02:00
Bård Skaflestad
a0601b23eb
Merge pull request #2750 from akva2/avoid_unncessary_copies 
fixed: use const refs in foreach constructs
 2020-09-01 14:46:42 +02:00
Arne Morten Kvarving
182ec130b1 fixed: use const refs in foreach constructs 
avoids unnecessary copies
 2020-09-01 13:25:26 +02:00
Joakim Hove
c2f7e900b6 Add UDQState argument to output writer 2020-08-31 18:40:39 +02:00
Bård Skaflestad
cb067869bd
Merge pull request #2749 from bska/fix-debug-build 
Fix Debug Build
 2020-08-31 17:10:31 +02:00
Bård Skaflestad
2bd80947b9 Fix Debug Build 
Remove left parenthesis character left over from transitioning to
the type-based parameter system.  The '(' produced a build failure
which only manifested in debug builds.

Thanks to Håkon Hægland for bringing the issue to our attention.
 2020-08-31 16:33:52 +02:00
Bård Skaflestad
fcd0de667b
Merge pull request #2732 from bska/fix-from-to-equal-msg 
Broken Constraints: Fix Diagnostic Message
 2020-08-31 13:57:45 +02:00
Bård Skaflestad
efed640e63 Broken Constraints: Fix Diagnostic Message 
Especially, grab a copy of the "oldControl" to avoid reading through
a reference for which the underlying object is reset in

    setCurrent*GroupControl()

This in turn avoids generating confusing diagnostic messages of the
form

    Switching production control mode for group G from FLD to FLD
 2020-08-31 13:04:39 +02:00
Bård Skaflestad
5392726a8f
Merge pull request #2745 from akva2/no_macro_properties 
Continue replacing macros for typetags et al
 2020-08-31 13:00:56 +02:00
Joakim Hove
aa37f986ae
Merge pull request #2736 from joakim-hove/add-udqstate 
Add UDQState member to eclbasevanguard
 2020-08-31 07:35:08 +02:00
Arne Morten Kvarving
f4f5fa3a5d changed: remove one missed TTAG usage 
also include header for the Scalar property definition
 2020-08-28 10:44:53 +02:00
Arne Morten Kvarving
9a000c6d07 changed: remove SET_TAG_PROP macro usage 2020-08-28 10:44:53 +02:00
Arne Morten Kvarving
3b21a8a481 changed: remove SET_TYPE_PROP macro usage 2020-08-28 10:44:53 +02:00
Arne Morten Kvarving
93a3ebf8f7 changed: remove NEW_PROP_TAG macro usage 2020-08-28 10:44:53 +02:00
Joakim Hove
0fabb02db4 Add vanguard member UDQState 2020-08-27 17:31:39 +02:00
Joakim Hove
f6d2b4fd27
Merge pull request #2737 from joakim-hove/extract-eval-udq 
Extract UDQ eval to separate function call
 2020-08-27 17:09:33 +02:00
Joakim Hove
ef4af80821
Merge pull request #2741 from joakim-hove/add-const-cast 
Use const_cast< > in variant serialization
 2020-08-27 15:22:19 +02:00
Arne Morten Kvarving
941e4916f8 changed: remove SET_PROP macro usage 2020-08-27 14:02:05 +02:00
Arne Morten Kvarving
7d853d2e05 changed: remove SET_SCALAR_PROP macro usage 2020-08-27 13:01:51 +02:00
Arne Morten Kvarving
fca83318aa changed: remove SET_INT_PROP macro usage 2020-08-27 13:01:51 +02:00
Arne Morten Kvarving
a79c37a041 changed: remove SET_STRING_PROP macro usage 2020-08-27 13:01:51 +02:00
Arne Morten Kvarving
0e71c0e29b changed: remove SET_BOOL_PROP macro usage 2020-08-27 13:01:51 +02:00
Arne Morten Kvarving
e8248b44ff changed: remove NEW_TYPE_TAG macro usage 2020-08-27 13:01:51 +02:00
Arne Morten Kvarving
914053ac3c changed: remove GET_PROP_VALUE macro usage 2020-08-27 13:01:51 +02:00
Joakim Hove
3c565ef59e Use const_cast< > in variant serialization 2020-08-27 11:01:22 +02:00
Markus Blatt
70805ca1d4
Merge pull request #2728 from blattms/fix-parallel-rebased 
Fix parallel ebos
 2020-08-27 10:54:14 +02:00
Markus Blatt
944b646092 Add WELLDIMS to datafile of test_ecl_output. 
Somehow the checking is now stricter for the tests due to
the changes in eclbasevanguard. Fixes test failures of
test_ecl_output.
 2020-08-27 09:05:09 +02:00
Markus Blatt
410ad3bc82 Only setup message limiter if logger is actually there. 
Needed for test_ecl and test_ecl_output.
 2020-08-27 09:05:09 +02:00
Markus Blatt
2b557a42ff Make unique_ptr instantiation exception safe for the kids in readDeck. 2020-08-27 09:05:09 +02:00
Markus Blatt
322bc8d9cc only check deck on process 0 2020-08-27 09:05:09 +02:00
Markus Blatt
c958034d26 Adapt and use readDeck from EclipseBaseVanguard, too. 
This reduces code duplication ad should fix the bad_cast exception
when running ebos in parallel.
 2020-08-27 09:05:09 +02:00
Markus Blatt
575245d785 Factored out logging setup and deck reading from class Main. 
These codes are reimplemented in the ebos simulator and should
be reused, instead. This commit factilitates this and starts
reusing the logging setup code in ebos. Hence reduces code duplication.
 2020-08-27 09:05:09 +02:00
Markus Blatt
6b3c6cd7f1 Remove EclBaseVanguard::internal*_ variables. 
Before this we had a set of external*_ variabales (unique_ptrs), a set of
internal_*_ variables (unique_ptrs) and another set of pointers that
point to the pointers actually used. That seemed a bit much. With this
commit skip the internal variables and use unique_ptrs for all
others. In the constructor either the external*_ gets moved or the
objects are directly created as unique_ptrs.
 2020-08-27 09:05:09 +02:00
Markus Blatt
1300139eea Use make_unique to create unique_ptrs with exception safety. 2020-08-27 09:05:09 +02:00
Markus Blatt
75104fd310 Move to more consistent ownership of ECL data in EclBaseVanguard 
We resort to consistently use unique_ptrs in EclBaseVanguard for
the data read from ECL files or set externally. This means that
during the simulation EclBaseVanguard owns this data and not Main
or the ebos setup functions. This ownership transfer becomes
transparent due to std::move.

This came up when trying to fix the parallel runs of ebos and during
that removing some code duplication.
 2020-08-27 09:05:09 +02:00
Markus Blatt
83bfd4edfc
Merge pull request #2738 from akva2/more_macro_replacement 
More macro replacement
 2020-08-27 08:46:25 +02:00
Markus Blatt
d55628bd8d
Merge pull request #2739 from blattms/fixed-relaxed-tol-logic 
Finally fix selection for relaxed tolerance.
 2020-08-27 08:38:32 +02:00
Arne Morten Kvarving
74fac38d85 changed: remove GET_PROP_TYPE / GET_PROP macro usage 2020-08-27 08:19:39 +02:00
Arne Morten Kvarving
82a35e53b7 changed: remove TTAG macro calls 2020-08-27 08:19:39 +02:00
Markus Blatt
bee46ed309 Finally fix selection for relaxed tolerance. 
Default values are MaxStrictIter=8 and RelaxedPvFraction=1.0.
To activate relaxed pv fraction set MaxStrictIter to 0 and
fraction below 1.
 2020-08-26 15:42:27 +02:00
Arne Morten Kvarving
8148a81ed0 changed: replace EWOMS_RESET_PARAMETERS macro calls 2020-08-26 10:50:34 +02:00
Bård Skaflestad
9829bfd61a
Merge pull request #2733 from joakim-hove/serialize-variant 
Serialize variant
 2020-08-25 23:10:18 +02:00
Joakim Hove
cc32189a2e Handle serialization of std::variant<T0,T1> 2020-08-25 22:37:24 +02:00
Joakim Hove
c7b68482f3 Extract UDQ eval to separate function call 2020-08-25 16:33:30 +02:00
Tor Harald Sandve
25c8a219a5
Merge pull request #2701 from blattms/relaxed-cnv-based-on-pv-fraction 
relaxed tolerance for CNV if only small fraction of PV is violated
 2020-08-25 15:02:06 +02:00
Markus Blatt
92b1708433 Use reference to ebos residual to prevent copying. 2020-08-25 14:07:27 +02:00
Joakim Hove
f2c1496c6e
Merge pull request #2690 from hakonhagland/step_init 
Implements the Python step_init() function
 2020-08-24 13:50:44 +02:00
Håkon Hægland
3749dcab7d Implements the Python step_init() function. 
A resubmission of commit 11eaa3d7 in PR #2403 and PR #2443 and continues
the work in #2555 implementing Python bindings to the flow simulator.

The step_init() method initializes the simulation. It is required for the
Python script to run step_init() before calling the step() method (which
will be implemented in a later commit).
 2020-08-24 10:27:50 +02:00