Commit Graph

11423 Commits

Author SHA1 Message Date
Joakim Hove
30a4f2b34b
Merge pull request #2696 from bska/chase-groupdata-api
Simulator Group Data: Chase Upstream API Update
2020-07-02 21:37:24 +02:00
Bård Skaflestad
5bb4321824 Simulator Group Data: Chase Upstream API Update
This commit makes the 'groupData()' function return a

    map<string, Opm::data::GroupData>

object instead of a

    map<string, Opm::data::GroupConstraints>

object.  The 'GroupData' structure adds a level of indirection to
the current per-group summary quantities that are directly assigned
by the simulator.  While here, also move the assignment of the
current group constraints/control values out to a separate helper
to reduce the body of the per-group loop in 'groupData()'.

This is in preparation of adding support for reporting group-level
production/injection guiderates (Gx[IP]GR) to the summary file.
2020-07-01 22:52:26 +02:00
Bård Skaflestad
6a6f55b099
Merge pull request #2697 from bska/restore-sequential-build
Don't Name Type that does not Exist in Sequential Configurations
2020-07-01 22:50:58 +02:00
Bård Skaflestad
8e20e0957f Don't Name Type that does not Exist in Sequential Configurations
This commit makes the constructor PressureInverseOperator that
accepts a Dune::OwnerOverlapCopyCommunication<> object contingent on
having MPI.  The type does not exist otherwise.
2020-07-01 21:52:57 +02:00
Markus Blatt
c01e6d14f7
Merge pull request #2694 from atgeirr/flexible-wellop
Allow well operators with FlexibleSolver.
2020-07-01 20:30:44 +02:00
Atgeirr Flø Rasmussen
f2395f6d94
Merge pull request #2695 from totto82/addBrineOutput
Add brine to output
2020-07-01 11:46:23 +02:00
Atgeirr Flø Rasmussen
a66260fe87
Merge pull request #2684 from totto82/convertUsingPriviousRates
use rates from previous time-step in the guiderate conversion
2020-07-01 11:04:22 +02:00
Atgeirr Flø Rasmussen
4448d8f5ed
Merge pull request #2691 from bska/prepare-guiderate-smry
EclWriter: Refactor Cell Loop out to Helper Function
2020-07-01 10:48:03 +02:00
Atgeirr Flø Rasmussen
3554fae75b
Merge pull request #2693 from totto82/addOilWaterBrine
Add oil water brine specialization
2020-07-01 09:58:45 +02:00
Tor Harald Sandve
6a7e816368 Add brine to output 2020-06-30 14:15:54 +02:00
Atgeirr Flø Rasmussen
c94eec872f Allow well operators with FlexibleSolver. 2020-06-30 12:33:57 +02:00
Tor Harald Sandve
fce0ba6759 Add oil water brine specialization 2020-06-30 10:41:28 +02:00
Bård Skaflestad
7cf035da80 EclWriter: Refactor Cell Loop out to Helper Function
That way we can use the same code for both the 'writeOutput' and
the 'evalSummaryState' member functions.  While here, also change
the declared types of 'wellData' and 'groupData' to 'auto' in
preparation of API updates for collecting group- and well level
guiderate data.

Finally, apply 'const' where possible.
2020-06-27 21:14:09 +02:00
Bård Skaflestad
6d644da88e
Merge pull request #2688 from akva2/add_spe1_thermal_watvisc_reg_test
Add spe1 thermal watvisc reg test
2020-06-26 23:59:53 +02:00
Atgeirr Flø Rasmussen
8b67b23c6e
Merge pull request #2687 from atgeirr/improve-preconditioner-factory
Make ghost-last feature available in PreconditionerFactory.
2020-06-26 14:38:42 +02:00
Arne Morten Kvarving
bb03896ad2 add spe1_thermal_watvisc as regression test 2020-06-26 09:49:07 +02:00
Arne Morten Kvarving
e31062aa4e add missing license header 2020-06-26 09:49:01 +02:00
Atgeirr Flø Rasmussen
c59f4f7118 Make ghost-last feature available in PreconditionerFactory. 2020-06-25 10:56:11 +02:00
Atgeirr Flø Rasmussen
02be5d1ced
Merge pull request #2686 from atgeirr/separate-wellops
Move well operators to separate file, and generalize
2020-06-25 10:53:04 +02:00
Atgeirr Flø Rasmussen
c2c79f0903 Move well operators to separate file.
Also introduce new class WellModelAsLinearOperator making a well model
into an actual Dune::LinearOperator, this prevents the TypeTag dependent
type from leaking into the type of the WellModelMatrixAdapter instantiation.

As a side benefit, the adapter classes can now adapt (i.e. combine with a
matrix operator) any linear operator.
2020-06-25 10:13:12 +02:00
Atgeirr Flø Rasmussen
7a69db02de
Merge pull request #2685 from blattms/fix-owner-cells-not-first
Alternative fix running in parallel with --owner-cells-first=false
2020-06-25 00:29:58 +02:00
Atgeirr Flø Rasmussen
d3efb01e89
Merge pull request #2645 from hakonhagland/refac_fullyimpl
Refactor run() in `SimulatorFullyImplicitBlackoilEbos.hpp`
2020-06-24 16:35:09 +02:00
Markus Blatt
27c9ed5c85 Consistently use ISTLSolverEbos::getMatrix to get correct matrix. 2020-06-24 15:37:43 +02:00
Markus Blatt
27ace20378 [bugfix] remove redundant copyjacToNoGhost in ISTLSolverEbos::solve
It uses a null pointer and make flow segfault. The copying is already
done in ISTLSolverEbos::prepare.
2020-06-24 15:25:24 +02:00
Bård Skaflestad
352cb8d5e9
Merge pull request #2683 from totto82/addPolymerOutput
store polymer rates for output
2020-06-24 10:47:38 +02:00
Tor Harald Sandve
a99254f917 clean up based on review 2020-06-24 09:48:09 +02:00
Tor Harald Sandve
8e3c124b23 use rates from privious time-step in the guiderate conversion to reduce oscilation 2020-06-24 09:38:18 +02:00
Håkon Hægland
23505cf5c9 Fixed up minor issues from review of PR #2645
Renamed some functions, and checked the return value from runStep().
2020-06-23 12:14:07 +02:00
Tor Harald Sandve
39e23c4d41 store polymer rates for output 2020-06-23 12:01:34 +02:00
Håkon Hægland
e8a4065192 Refactor SimulatorFullyImplicitBlackoilEbos.hpp
A resubmission of commit bb20804 in PR #2403 and PR #2442 to work with the
current master.

Continues the work in #2619 and #2631 to refactor main simulation loop in
flow to work with the Python bindings.

The run() method in SimulatorFullyImplicitBlackoilEbos.hpp is refactored
in preparation for the implementation of a Python step() function in a
later commit. Currently run() is called from runSimulatorInitOrRun() in
FlowMainEbos.hpp using the runSimulatorRunCallback_(). Later, there
will be other callbacks like runSimulatorStepInitCallback_(), and
runSimulatorStepCallback_(), that will need to call different parts of
the code in run(). The run() function is thus refactored into run(),
runInit(), runStep(), and runLastStep(). Also, some of the local
variables in run() have to be made persistent between calls to
runStep(), this applies to variables report, solverTimer, totalTimer,
and adaptiveTimeStepping, which are made private class variables.
2020-06-23 11:50:57 +02:00
Atgeirr Flø Rasmussen
3766f19de3
Merge pull request #2680 from atgeirr/minor-flexible-solver-improvements
Minor flexible solver improvements
2020-06-21 14:37:01 +02:00
Atgeirr Flø Rasmussen
c58456faae Add missing include. 2020-06-20 16:28:59 +02:00
Atgeirr Flø Rasmussen
427eac5132 Use macro for instantiations, and clean up includes. 2020-06-19 16:37:43 +02:00
Atgeirr Flø Rasmussen
171656144f Install FlexibleSolver_impl.hpp for downstream users. 2020-06-19 16:04:27 +02:00
Atgeirr Flø Rasmussen
fb99dd6fee Use unique_ptr rather than shared_ptr. 2020-06-19 16:03:46 +02:00
Atgeirr Flø Rasmussen
226697ec6f
Merge pull request #2679 from akva2/janitoring
make parseSuccess dependent on MPI
2020-06-19 15:10:38 +02:00
Atgeirr Flø Rasmussen
5105b80e50
Merge pull request #2667 from atgeirr/flexible-solver-separate-compile-unit
Use explicit instantiation for FlexibleSolver to reduce compile times.
2020-06-19 15:03:30 +02:00
Atgeirr Flø Rasmussen
faddef0321 Do not instantiate things requiring MPI when HAVE_MPI is false. 2020-06-19 10:01:16 +02:00
Arne Morten Kvarving
41e7201c73 make parseSuccess dependent on MPI
avoids unused warnings when building without
2020-06-19 09:46:21 +02:00
Atgeirr Flø Rasmussen
678756b9e1
Merge pull request #2678 from joakim-hove/fix-sequential
Add actionState argument also for non MPI branch
2020-06-19 06:54:16 +02:00
Joakim Hove
5484264854 Add actionState argument also for non MPI branch 2020-06-19 05:21:05 +02:00
Joakim Hove
d89a2e5eb7
Merge pull request #2674 from joakim-hove/use-action-state
Add Action::State member to EclPropblem and pass it to io/ActionX
2020-06-18 18:39:08 +02:00
Bård Skaflestad
bc3632f3f0
Merge pull request #2592 from alfbr/udq-test
Udq test
2020-06-18 13:36:33 +02:00
Atgeirr Flø Rasmussen
e4ea932a9d
Merge pull request #2661 from totto82/fixUpwindMSW_clean
Fix upwinding for friction, acceleration, valve and SIGD for MSW
2020-06-18 11:40:31 +02:00
Atgeirr Flø Rasmussen
dcd5d21415 Split constructor to reduce instantiation.
Without the split, certain combinations with Dune::Amg::SequentialInformation
as template argument for Comm needlessly get instantiated.
2020-06-18 08:28:20 +02:00
Atgeirr Flø Rasmussen
3784ab9d77 Amended copyrights and made the _impl.hpp a proper header file. 2020-06-17 21:07:13 +02:00
Tor Harald Sandve
1fe5a2812f relax rel_tol for msw restart case 2020-06-17 15:08:47 +02:00
Atgeirr Flø Rasmussen
f24b2cd708 Split instantiation files to enable parallel build. 2020-06-17 13:03:57 +02:00
Joakim Hove
b52366926a Add Action::State member to EclPropblem and pass it to io/ActionX 2020-06-17 12:25:03 +02:00
Atgeirr Flø Rasmussen
2dc2e053d1 Change order of constructor arguments.
This allows simplification, and having just two constructors.
2020-06-17 09:31:19 +02:00