Commit Graph
13693 Commits
Author SHA1 Message Date
Atgeirr Flø Rasmussen 347ad2da6b Reinstate tests that were commented out due to EclWellManager issues. 2021-10-13 11:10:48 +02:00
Atgeirr Flø Rasmussen 432f4d8247 Remove unused class EclPeacemanWell 2021-10-13 11:00:08 +02:00
Atgeirr Flø Rasmussen e6e8eab6d2 Remove unused EclWellManager class. 2021-10-13 10:56:33 +02:00
Atgeirr Flø Rasmussen 2da4165b3e Stop using EclWellManager in test_ecl_output.cc. 2021-10-13 10:55:05 +02:00
Atgeirr Flø Rasmussen 72be136529 Stop using EclWellManager in test_equil.cc. 2021-10-13 10:50:33 +02:00
Atgeirr Flø Rasmussen 54599f3fc6 Merge pull request #3603 from akva2/fix_mpi_double_finalize
fixed: double call to MPI_Finalize
2021-10-13 10:13:12 +02:00
Arne Morten Kvarving 8eb63409cb fixed: double call to MPI_Finalize
I missed this one when moving the MPI handling into RAII style
2021-10-13 09:35:16 +02:00
Joakim Hove 2c68f12769 Load WellTestState from restart file 2021-10-13 08:46:48 +02:00
Joakim Hove 9b0b4f42a0 Add RESTART_SCHED argument to test registration 2021-10-12 17:21:40 +02:00
Joakim Hove 23cd8e620a Merge pull request #3595 from joakim-hove/serialize-wtest
Add serialization testing for WellTestState
2021-10-12 17:03:31 +02:00
Joakim Hove 3d5bd5e7a7 Merge pull request #3597 from joakim-hove/set-external-action-state
Set external Action::State object in the vanguard
2021-10-12 17:02:19 +02:00
Joakim Hove 5db60aba5e Set external Action::State object in the vanguard 2021-10-12 10:41:29 +02:00
Markus Blatt cc1adf0b2a Merge pull request #3586 from blattms/tracer-use-well-container
[refactor] Use well_container and PerforationData for tracers
2021-10-12 09:55:33 +02:00
Joakim Hove 745b96530d Add serialization testing for WellTestState 2021-10-11 16:40:42 +02:00
Bård Skaflestad d6ca49f85b Merge pull request #3593 from bska/suppress-unused-param
Mark 'comm' As Potentially Unused
2021-10-10 21:50:53 +02:00
Bård Skaflestad 0f13f4095b Mark 'comm' As Potentially Unused
The communicator is only needed in parallel builds.
2021-10-10 20:38:45 +02:00
Joakim Hove b6d043c545 Merge pull request #3580 from joakim-hove/wtest-rename
Remove ecl wells argument to check wells for testing
2021-10-10 09:54:16 +02:00
Joakim Hove b2c84b58bd Merge pull request #3585 from bska/refactor-Main
Main.hpp: Split Individual Cases Out to Helper Functions
2021-10-10 09:48:47 +02:00
Bård Skaflestad 61ac76fe90 Make ARGV[ARGC] Into a Nullpointer
This is strictly speaking required by POSIX.
2021-10-09 00:17:32 +02:00
Bård Skaflestad ad74de2e1a Use Algorithm to Locate '--version' Option 2021-10-09 00:17:32 +02:00
Bård Skaflestad fca167acfd Split Individual Cases Out to Helper Functions
This commit moves the bodies of the various 'dynamicDispatch_<>()'
cases out to separate helper functions.  Not only does this reduce
the number of nested conditionals, it also helps reasoning about
each case in isolation and aids future maintenance.
2021-10-09 00:17:32 +02:00
Bård Skaflestad 3455dbdac9 Main.hpp: Adjust Whitespace
In preparation of refactoring 'dispatchDynamic_<>()'
2021-10-09 00:17:32 +02:00
Markus Blatt ed73f1b326 Merge pull request #3592 from blattms/fix-3574
remove assert for isfinite and correctly handle exceptions
2021-10-08 21:18:18 +02:00
Joakim Hove 4da52424c7 Add const 2021-10-08 20:58:49 +02:00
Markus Blatt fc7609bfd2 [bugfix] Make sure all ranks participate in collective communication.
No need an early return if there are no local wells, anyway. The
algorithms can handle empty containers like a charm.
2021-10-08 16:01:18 +02:00
Markus Blatt 1520f9c85f [bugfix] handle exception when linearizing the wells.
As multisegment wells may throw in applyUMFPack this is now needed and
the exception needs to communicated to all processes. We do this in
the linearize method of the well model.

Before this change this is what could happen:
- The process with the exception would have chopped the time step
- The others would have successfully setup the systems and entered the
  linear solve

This  poduced a deadlock. One processes was waiting in
OPM_END_PARALLEL_TRY  during the setup of the shorter time step and in
collective communication during the setup of the linear solver for the
unchopped time step.
2021-10-08 16:01:07 +02:00
Tor Harald Sandve d07aed204f Catch numerial issues due to problems with inner iterations wells 2021-10-08 15:26:53 +02:00
Tor Harald Sandve fdf6ce9c54 change assert with throw for isfinite primary variable 2021-10-08 15:26:52 +02:00
Joakim Hove 0ca1f7a8b2 WellTestState::updateWells -> WellTestState::test_wells 2021-10-08 15:23:03 +02:00
Joakim Hove 0e9d634397 Do not pass ecl wells to WellTestState::updateWells() 2021-10-08 15:17:43 +02:00
Joakim Hove c599402318 Merge pull request #3591 from joakim-hove/welltest-state-rename
Welltest state rename
2021-10-08 14:07:04 +02:00
Bård Skaflestad bfdf158e23 Merge pull request #3589 from bska/remove-unused-parameter
Remove Unused 'Comm' Parameter
2021-10-08 13:02:13 +02:00
Bård Skaflestad d028937925 Remove Unused 'Comm' Parameter
Remnant from ealier refactoring work.
2021-10-08 12:44:27 +02:00
Joakim Hove 0e365abe36 WellTestState::dropCompletion -> WellTestState::open_completion 2021-10-08 10:40:38 +02:00
Joakim Hove 0648d6bf5d WellTestState::openWell -> WellTestState::open_well 2021-10-08 10:17:14 +02:00
Joakim Hove d806762f7a WellTestState::hasWellClosed -> WellTestState::well_is_closed 2021-10-08 10:17:14 +02:00
Joakim Hove 52b2c096a2 WellTestState::closeWell -> WellTestState::close_well 2021-10-08 10:17:14 +02:00
Tor Harald Sandve 40e94268cf Merge pull request #3578 from bska/reset-actnum-eclipsestate
Reset ACTNUM at EclipseState Level
2021-10-08 09:51:54 +02:00
Joakim Hove e194223631 Merge pull request #3582 from bska/refactor-readDeck
Extract Helper Functions From readDeck
2021-10-08 09:49:57 +02:00
Joakim Hove feaaebf3fc WellTestState::hasCompletion -> WellTestState::completion_is_closed 2021-10-08 09:06:21 +02:00
Bård Skaflestad 1feab761d6 Extract Helper Functions From readDeck
Mostly to reduce the number of nested conditionals and long lines.
2021-10-07 22:01:47 +02:00
Bård Skaflestad c7d7fa1146 Reset ACTNUM at EclipseState Level
This method avoids resorting to const_cast tricks.
2021-10-07 21:58:09 +02:00
Markus Blatt d4ab9ea4b1 [refactor] Use well_container and PerforationData for tracers
This saves some (expensive?) lookups that already have been done
in the well model. We had to make the well_container accessible from
the well model for this.

Using the perforation data will automatically make sure that the
perforations are not shut and reside on this process in a parallel run.
2021-10-07 21:55:41 +02:00
Bård Skaflestad 9cde5ec9e7 Merge pull request #3572 from bska/prune-deactivated-anconn
Prune Analytic Aquifer Connections to Deactivated Cells
2021-10-07 21:02:53 +02:00
Bård Skaflestad c329d9cd00 Prune Deactivated Cells on All Ranks
This commit broadcasts the 'removed_cells' to all ranks and uses
that array to delete any analytic aquifer connections that might
have been previously formed to those deactivated cells.  This is
needed to have a consistent view of which cells are connected to
analytic aquifers.
2021-10-07 17:26:26 +02:00
Bård Skaflestad f01777610f Adjust Whitespace and Rewrap Comments
In preparation of distributing the 'removed_cells' to all ranks.
2021-10-07 17:26:26 +02:00
Markus Blatt f2ce097b4b Merge pull request #3575 from Tongdongq/fix-ilu-decomp-gpu
Create and use scale kernel for relaxation of ILU
2021-10-07 15:55:17 +02:00
Joakim Hove e0ea090960 WellTestState::addClosedCompletion - WellTestState::close_completion 2021-10-07 14:56:20 +02:00
Joakim Hove ce78326ac1 WellTestState::openAllCompletions -> WellTestState::open_completions 2021-10-07 14:53:06 +02:00
Joakim Hove 0c40771c7a Merge pull request #3579 from joakim-hove/template-on-content-type
WTEST: only count actually closed wells.
2021-10-07 09:27:41 +02:00