Commit Graph

10788 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
6f04c31c7c Use string to enum helper. 2023-11-23 14:06:39 +01:00
Atgeirr Flø Rasmussen
7578fbf144 Change nldd default approach to gauss-seidel.
Also adjust local CNV tolerance scaling to 0.1 instead of 0.01.
2023-11-23 14:06:39 +01:00
Atgeirr Flø Rasmussen
94554ea4f2 Change default nldd number of domains to one per 1000 cells. 2023-11-23 14:06:39 +01:00
Atgeirr Flø Rasmussen
8acc8af2a4 Add MaxPressure NLDD domain ordering option, make it default. 2023-11-23 14:06:39 +01:00
Kai Bao
3aed0b9501 not updating the connection pressure for StandardWell
at the early stage of computeWellRatesWithBhpIterations. The perforation rates are not updated,
and it is not sensible to update based on the inconsistent well rates and perforation rates.

Better to keep the original explicit quantities for better consistency.

Furthermore, it can be dangerous to update the explicit quantities based on the
irrelevant perforation rates, since the ratios can be very undesirable due to crossflow.
2023-11-23 09:13:57 +01:00
Stein Krogstad
b08bc029e6 Fix shut-in logic for wells with shut-intructions 2023-11-22 16:53:48 +01:00
Markus Blatt
6a866ac8d2 [fix] Do parallel sums with int instead of bool.
Using bool here is at least frowned upon. To be honest, I have no idea
what happens underneath here if we pass a bool. In contrast to other
pod types we do not associate it with a builtin type of MPI (not even
sure what to use). Hence we probably create a custom type for sending
and receiving. That should work. But I have no idea what will be used
for summation.

BTW: I am debugging a case that previously crashed and now suddenly
works and this seems to be the only relevant change I made in the
meantime.
2023-11-22 16:50:57 +01:00
Bård Skaflestad
82a83d04e2
Merge pull request #5017 from akva2/missing_include
add missing include
2023-11-22 15:26:14 +01:00
Bård Skaflestad
8dca5a931e
Merge pull request #5005 from totto82/fixWDFACCOR
dont scale d factor from wdfaccor with connection factor
2023-11-22 14:55:51 +01:00
Tor Harald Sandve
be06132702 remove trans multiplier from dake 2023-11-22 13:59:06 +01:00
Arne Morten Kvarving
f2a2fc2938 add missing include 2023-11-22 13:18:56 +01:00
Bård Skaflestad
3a01da0a12
Merge pull request #5010 from totto82/cgfrf
Add output of connection dissolved gas and vaporized oil
2023-11-22 12:54:33 +01:00
Tobias Meyer Andersen
ee95223b27 Use std::optional to only allocate reordered matrix when using multiple threads 2023-11-22 10:10:29 +01:00
Tor Harald Sandve
4879896789 adapt to refactoring of getDFactor 2023-11-22 09:17:28 +01:00
Tobias Meyer Andersen
e22f4399a0 fix typo 2023-11-22 09:16:43 +01:00
Tor Harald Sandve
ecd9930225 dont scale d factor from wdfaccor 2023-11-21 17:51:36 +01:00
Tobias Meyer Andersen
5f6c97ff3b add OpenMP parallelized version of DILU.
Implement graphcoloring to expose rows in level sets that that can be
executed in parallel during the sparse triangular solves.
Add copy of A matrix that is reordered to ensure continuous memory reads
when traversing the matrix in level set order.
TODO: add number of threads available as constructor argument in DILU
2023-11-21 15:41:53 +01:00
Tor Harald Sandve
ee77d30fe5 Add output of connection dissolved gas and vapporized oil 2023-11-21 14:29:40 +01:00
Tobias Meyer Andersen
e2a531dd65 replace loop with std function, remove print from test 2023-11-21 09:52:48 +01:00
Tobias Meyer Andersen
3cd1873771 add graph coloring 2023-11-20 16:57:56 +01:00
Antonella Ritorto
6d180a7f91 compressedLevelZero added in AluCartIdxMapper, used in RelpermDiags 2023-11-20 15:56:17 +01:00
Tobias Meyer Andersen
54b7f9c44f GraphColoring.hpp: cosmetics 2023-11-20 13:06:40 +01:00
Tobias Meyer Andersen
9309f96d8f GraphColoring.hpp: reorder headers 2023-11-20 13:06:34 +01:00
Atgeirr Flø Rasmussen
9c9fae26a8 Require initial assembly for subdomains with Gauss-Seidel. 2023-11-20 12:59:44 +01:00
Kai Bao
6ab809c69d
Merge pull request #5004 from blattms/control-mode-typo
Fixed typo: control model -> control mode.
2023-11-20 09:13:03 +01:00
Kai Bao
3b1ef932c2
Merge pull request #5003 from vkip/check_if_closed_before_hist_open
Check if well was closed this step before re-opening during history
2023-11-20 09:03:06 +01:00
Markus Blatt
de50fe5702 Fixed typo: control model -> control mode. 2023-11-20 08:29:24 +01:00
Bård Skaflestad
ea3b22480a Enable Loading Parallel NLDD Partition From File
This commit adds support for loading a three-column NLDD
partitioning scheme of the form

    MPI_Rank  Cartesian_Index  NLDD_Domain_ID

from a text file.  In an MPI run it is assumed that the first column
holds integers in the range 0..MPI_Size()-1, and typically that each
such integer is listed at least once.  In a sequential run, the MPI
rank column is ignored.

With this scheme we can load the same partition files that we write,
for increased repeatability and determinism, and we can also
experiment with externally generated NLDD partitions.
2023-11-17 17:39:17 +01:00
Vegard Kippe
abbcb4b148 Check if a well was closed this step before re-opening in history mode 2023-11-17 17:29:30 +01:00
Bård Skaflestad
68fe118781 Make Compress/Count Partition Vector Helper Generally Available
This function pair is useful also when loading a partition from
file to ensure that there are no gaps in block numbering.
2023-11-17 09:17:46 +01:00
Bård Skaflestad
c0c96123bc Add Support for Writing NLDD-Like Partitions in Parallel
This commit adds a new (hidden) debugging option,

    DebugEmitCellPartition (--debug-emit-cell-partition)

which, when set, will cause each rank to write a three-column text
file of the form

    MPI_Rank  Cartesian_Index  NLDD_Domain_ID

into the directory

    partition/CaseName

of the run's output directory.  That file will be named according to
the process' MPI rank, so the first column will be the same as the
file name.

The option is primarily intended for debugging the NLDD partitioning
scheme, so is mostly reserved for runs with low MPI sizes (e.g.,
less than 20).

While here, also make the MPIPartitionFromFile helper class aware of
this format so that we can use concatenated output files as an input
to the MPI partitioning algorithm for repeatability.
2023-11-17 09:17:46 +01:00
Bård Skaflestad
c559de51cf
Merge pull request #4996 from totto82/fixWDFAC
Fix wdfac and d factor in comdat
2023-11-17 09:09:22 +01:00
Atgeirr Flø Rasmussen
d069081b52
Merge pull request #4960 from daavid00/dispersivity
Support for mechanical dispersion
2023-11-17 08:50:00 +01:00
David Landa Marban
bc03821d57 Support for mechanical dispersion 2023-11-16 16:55:01 +01:00
Bård Skaflestad
610c45aa77 Add Support for Reading MPI Partitioning From File
This commit introduces new, experimental support for loading a
partitioning of the cells from a text file.  The name of the file is
passed into the simulator using the new, hidden, command line option

    --external-partition=filename

and we perform some basic checking that the number of elements in the
partition matches the number of cells in the CpGrid object.
2023-11-16 16:28:14 +01:00
Tor Harald Sandve
82cb3c3b53 Fix connection and well dfactor
The well dfactor is scaled by the well index

If postive the connection dfactor is threated as a well factor
and also scaled. If negative the connection dfactor is not scaled
2023-11-16 14:50:59 +01:00
Kai Bao
e355990ac2
Merge pull request #4999 from vkip/always_open_historic_wells
Always check if wells on historic controls can be opened
2023-11-15 20:29:21 +01:00
Vegard Kippe
e0d1ff9c66 Always check if wells on historic controls can be opened 2023-11-15 19:04:48 +01:00
Bård Skaflestad
ed77c90238 Make Zoltan-Based Domain Partitioning MPI Aware
This commit switches the current implementation of
'partitionCellsZoltan()', i.e., 'partitionCells("zoltan", ...)' into
using the MPI-aware ParallelNLDDPartitioningZoltan utility.  In
doing so we make 'partitionCellsZoltan()' private since its
availability is not guaranteed.  We also slightly reorder the
parameters and switch from passing a "Grid" into passing a
"GridView" as an argument to partitionCells(), and specialise this
function for the known grid views in OPM Flow.

We extract the Zoltan-related parameters out to an Entity-dependent
helper structure and move the complexity of forming this type to a
new helper function, BlackoilModelEbosNldd::partitionCells().
2023-11-15 13:31:41 +01:00
Bård Skaflestad
27aaa28c71 Add Partitioner for Unstructured Connectivity Graph
Invokes Zoltan library and requires MPI.  Client code constructs an
abstract connectivity graph by defining connections/edges through
the 'registerConnection()' member function.  May also impose a
restriction that certain cells/vertices be placed in the same
domain/block in the resulting partition.  Client code must supply a
callback function that defines globally unique cell/vertex/object
IDs, across all MPI ranks, for each vertex in the connectivity
graph.

Member function 'partitionElement()' forms the resulting partition
vector, the size of which is the total number of objects visible to
the local rank-typically the number of cells owned by the rank, and
the number of overlap cells--i.e., the size of the local grid view.
2023-11-15 13:31:41 +01:00
Bård Skaflestad
f195f73949 Extract Binary_Search Out to Helper
Mostly for readability.
2023-11-15 13:31:41 +01:00
Bård Skaflestad
0b2c396a01
Merge pull request #4961 from vkip/network_restart_use_node_pressures
Use network pressures from restart
2023-11-15 09:46:35 +01:00
Tor Harald Sandve
0f12977b17 only use d factor for gas wells 2023-11-14 12:45:25 +01:00
Tor Harald Sandve
e33d27ca90
Merge pull request #4973 from daavid00/enabledisgaswatvap
Enabling disGas and watVap at compile time for gasWaterBrine systems
2023-11-13 15:01:38 +01:00
Kai Bao
bbdad520d6
Merge pull request #4915 from vkip/network_multi_root
Support computation of network pressures in networks with multiple roots
2023-11-13 14:39:07 +01:00
Atgeirr Flø Rasmussen
cd5ba003d8
Merge pull request #4905 from vkip/allow_nowellmatch_with_lowstrictness
If parsing strictness is set to 'low', proceed (with warning) if no matching wells found
2023-11-13 10:56:54 +01:00
Markus Blatt
f1d75297d3
Merge pull request #4990 from akva2/janitoring
Avoid some dead stores
2023-11-12 21:49:00 +01:00
Atgeirr Flø Rasmussen
66f34eb234
Merge pull request #4979 from blattms/complete-log-problem-cont
log problem if asked to continue with nonconverged nonlinear solver.
2023-11-12 19:01:24 +01:00
Bård Skaflestad
fe67e9f9d3
Merge pull request #4978 from akva2/loghelper_refactor_fip_output
changed: refactor LogOutputHelper::fip
2023-11-10 14:49:09 +01:00
Arne Morten Kvarving
ddd0c5629d GasLiftSingleWellGeneric: avoid dead store
all branches below write a new value
2023-11-10 14:32:30 +01:00
Arne Morten Kvarving
9a8e58d7c3 changed: use prefix for increments
avoids dead store in the final block while still maintaining
easy cut-n-paste additions
2023-11-10 14:30:13 +01:00
Vegard Kippe
194bf9d6af Set SCHEDULE_INVALID_NAME to warning with --parsing-strictness=low 2023-11-10 11:48:18 +01:00
Vegard Kippe
4ce9c41a37 Replacing loop by assignment 2023-11-10 09:01:09 +01:00
Bård Skaflestad
16c8184e3f
Merge pull request #4914 from vkip/extra_network_output
Allow output of network pressures based on rates at end of time step
2023-11-09 23:19:48 +01:00
Arne Morten Kvarving
8982c67e79
Merge pull request #4980 from akva2/fipconfig_serialize
add extra instantation for bitset
2023-11-09 14:42:39 +01:00
Arne Morten Kvarving
44ce054492 changed: refactor LogOutputHelper::fip
only do one output per call. allow passing the name of the
regions to process
2023-11-09 13:08:17 +01:00
Bård Skaflestad
ea9bc39657
Merge pull request #4975 from atgeirr/add-extra-well-convergence-output
Add extra output to INFOITER file detailing unconverged wells.
2023-11-09 11:03:54 +01:00
Arne Morten Kvarving
9b8c6de98e add extra instantation for bitset 2023-11-09 11:02:52 +01:00
Bård Skaflestad
7832c1ba54
Merge pull request #4976 from totto82/fix_rsw
Fix rsw computation of wellbore density for StW
2023-11-09 09:37:16 +01:00
Atgeirr Flø Rasmussen
4633578792 Add extra output to INFOITER file detailing unconverged wells. 2023-11-09 09:23:39 +01:00
Kai Bao
25b007c46e
Merge pull request #4945 from vkip/network_reroute
Network reroute - avoid looking up nonexisting nodes
2023-11-08 19:59:40 +01:00
Markus Blatt
0cc839314e log problem if asked to continue with nonconverged nonlinear solver.
The user has explicitly asked for this behavior using
--solver-continue-on-convergence-failure=true in this rare case.
2023-11-08 17:16:21 +01:00
Atgeirr Flø Rasmussen
749ea93e24 Add and use OPM_DEFLOG_PROBLEM macro.
This should replace OPM_DEFLOG_THROW in places where the problem
category is more appropriate than the error category.

In this commit, uses of OPM_DEFLOG_THROW have been replaced whenever
the exception class used was NumericalProblem.
2023-11-08 15:16:17 +01:00
David Landa Marban
92de5355b2 Enabling disGas and watVap at compile time for gasWaterBrine 2023-11-07 18:35:30 +01:00
Bård Skaflestad
abfb5c9d82 Update Well Topology if Triggered From ACTIONX
This commit adds a new flag data member,

    wellStructureChangedDynamically_

to the generic black-oil well model.  This flag captures the

    well_structure_changed

value from the 'SimulatorUpdate' structure in the updateEclWells()
member function.  Then, in BlackoilWellModel::beginTimeStep(), we
key a well structure update off this flag when set.  This, in turn,
enables creating or opening wells as a result of an ACTIONX block
updating the structure in the middle of a report step.
2023-11-07 17:02:18 +01:00
Bård Skaflestad
b22f9853db
Merge pull request #4969 from akva2/fbhpdef
add support for FBHPDEF keyword
2023-11-07 16:35:51 +01:00
Tor Harald Sandve
26247a2aba Fix rsw computation of wellbore density for StW 2023-11-07 15:53:51 +01:00
Stein Krogstad
0756e2d1c1 Initialize rates/previous rates before well-test 2023-11-06 11:46:44 +01:00
Bård Skaflestad
763d25541a
Merge pull request #4970 from akva2/janitoring
Quell an uninitialized variable static analyzer warning
2023-11-06 10:17:54 +01:00
Markus Blatt
11ac7375a9
Merge pull request #4971 from totto82/compdat_d
Remove warning for unsupported D factor in COMPDAT
2023-11-06 10:06:09 +01:00
Tor Harald Sandve
aa96e8fd6c Remove warning for unsupported D factor in COMPDAT 2023-11-06 09:10:34 +01:00
Arne Morten Kvarving
e3cd06c164 avoid uninitialized value static analyzer warning 2023-11-06 08:56:53 +01:00
Arne Morten Kvarving
fa45790bfb changed: rename variable
this indicates that bracketing was successfully found,
not that we are looking for a bracket
2023-11-06 08:56:53 +01:00
Arne Morten Kvarving
fb7135a424 remove UDT keywords from unsupported list
UDTDIMS is completely ignored but should not stop the simulator
2023-11-03 10:48:55 +01:00
Arne Morten Kvarving
29c65ef7df mark FBHPDEF keyword as supported 2023-11-03 09:07:14 +01:00
Bård Skaflestad
9233e32d81
Merge pull request #4826 from totto82/fixResvRates
Compute resv rates based on pressure and temperature in the well for injectors in thermal cases
2023-11-01 16:24:10 +01:00
Vegard Kippe
14b7f926da Avoid looking up nonexisting nodes.. 2023-11-01 13:36:21 +01:00
Tor Harald Sandve
d7401e3b6b
Merge pull request #4919 from daavid00/saltprecPermFac
Multiply well trans due to perm reduction in salt prec
2023-11-01 13:29:57 +01:00
Bård Skaflestad
17886f934c
Merge pull request #4924 from GitPaean/fixing_gecon_welopen
use the WELL_SET_TO_OPEN event to open closed wells
2023-11-01 10:24:18 +01:00
David Landa Marban
c93d46c1be Mult well trans due to perm reduction in salt prec 2023-10-31 22:11:55 +01:00
Bård Skaflestad
bf72698310
Merge pull request #4832 from totto82/wdaccor_refactor
Implement Forchheimer term in wellIndex
2023-10-31 17:46:49 +01:00
Antonella Ritorto
166c31d5f8 Bugfix. Deprecated getCollectiveComminication warning 2023-10-31 08:40:46 +01:00
Vegard Kippe
c9cc261891 Use network pressures from restart 2023-10-30 23:26:35 +01:00
Vegard Kippe
429b312bc0 Re-introducing check for negative reportStepIdx and adding forgotten hasGroup check. 2023-10-27 20:30:48 +02:00
Atgeirr Flø Rasmussen
8aa035f174
Merge pull request #4949 from BigDataAccelerate/remove-redundant-ilu-decomp
Remove redundant CPU decomposition when done also on GPU
2023-10-27 13:38:16 +02:00
Vegard Kippe
f137565bb6 Avoid exception for non-group nodes 2023-10-26 19:35:56 +02:00
Vegard Kippe
5fbf981af8 Output of network pressures based on rates at end of time step 2023-10-26 19:35:56 +02:00
Tor Harald Sandve
a40ede9957 Compute reservoir injection rates from well temperature and pressure for thermal cases 2023-10-26 15:57:41 +02:00
Kai Bao
86c919877e
Merge pull request #4946 from GitPaean/assertion_throw
making a few assertion to throw in StandardWellPrimaryVariables
2023-10-26 13:42:09 +02:00
Kai Bao
3e03ebbb58 making a few assertion to throw in StandardWellPrimaryVariables
to get more outputting information and also avoid harsh termination due
to assert.

They are technically numerical problem instead of programming mistakes.
2023-10-26 11:36:25 +02:00
Tor Harald Sandve
968686e7e0
Merge pull request #4943 from hakonhagland/pybind3
Get simulator time step size from Python BlackOilSimulator module
2023-10-26 11:28:42 +02:00
Razvan Nane
45d8750e93 Fix formatting and indentation 2023-10-26 09:45:48 +02:00
Bård Skaflestad
95bc3822fb
Merge pull request #4948 from GitPaean/glo_active_enter_glift
checking LIFTOPT active before gliftBeginTimeStepWellTestUpdateALQ and before attempting to optimize alq in gliftBeginTimeStepWellTestIterateWellEquations
2023-10-26 09:06:23 +02:00
Razvan Nane
cd63cc83c2 Remove redundant cpu decomposition when using gpu 2023-10-26 06:40:06 +02:00
Kai Bao
beda7a0b35 checking LIFTOPT active before trying to optimizing alq
in gliftBeginTimeStepWellTestIterateWellEquations.

otherwise, if the increment is 0 (inactive), the function
gliftBeginTimeStepWellTestIterateWellEquations
might return undesired results or enter endless loop.
2023-10-25 23:00:54 +02:00
Kai Bao
2b97c3fe1d checking LIFTOPT active before gliftBeginTimeStepWellTestUpdateALQ
to avoid meaningless message output related to GLIFT and WTEST
2023-10-25 21:45:19 +02:00
Tor Harald Sandve
922fa5b9bf
Merge pull request #4853 from hakonhagland/pybind2
Get cell volumes from Python
2023-10-24 13:56:58 +02:00
Bård Skaflestad
7a34c20120 Remove Leftover Debug Printout
This information already goes to the .DBG file so there's no need
to echo it to the main console as well.
2023-10-24 09:51:12 +02:00
Tor Harald Sandve
90e791877c Implement Forchheimer term in wellIndex
Add output of CDFAC

Add effect of compaction on CTFAC
2023-10-23 08:55:21 +02:00
Kai Bao
83ed0f01e5 use the REQUEST_OPEN_WELL event to open closed wells 2023-10-20 13:08:07 +02:00
Stein Krogstad
57c960d7c5 default value of option for extra derivatives 2023-10-19 15:12:00 +02:00
Stein Krogstad
dd6d195a6b Add missing reverse flow derivatives for valve/icd/aicd 2023-10-19 15:12:00 +02:00
Bård Skaflestad
b60eb25285
Merge pull request #4918 from GitPaean/remove_white_spaces_wells_folder
removing white spaces in the wells folder
2023-10-19 09:08:03 +02:00
jakobtorben
ab0ca76194 Add DILU preconditioner 2023-10-18 14:30:17 +02:00
Bård Skaflestad
d98de155de
Merge pull request #4930 from GitPaean/not_reset_thp_value_well_state
not setting THP to be zero based whether having THP constraint from the Deck input in the WellState
2023-10-16 22:02:43 +02:00
Kai Bao
e1018e2815 if there is no VFP table associated with the well
we set the thp to be zero in the WellState. The previous logic related
this to THP constraints does not hold in multiple situations:
1. VFP table is specified, we need the THP value for output purpose
2. network is involved, we need the THP value for constraint check.
2023-10-16 21:43:18 +02:00
Kai Bao
b975ebff65
Merge pull request #4881 from vkip/no_network_solve_in_history
Avoid iterating network if no network wells are in prediciton mode
2023-10-16 14:54:36 +02:00
Atgeirr Flø Rasmussen
8b480a0a49
Merge pull request #4852 from multitalentloes/cujac_preconditioner
Cujac preconditioner
2023-10-16 12:46:29 +02:00
Tobias Meyer Andersen
8b396fa3dc Update test properties of new tests using CUDA. Avoid comparison causing new warning 2023-10-16 11:31:00 +02:00
Vegard Kippe
5bb0942a02 Reverting unintended change. 2023-10-16 10:38:08 +02:00
Tobias Meyer Andersen
533c5a1a3e Combine new diagonalMV kernels into one using
template arguements.
Use more consistent naming conventions.
Change printing function of CuVector from output
stream overload to toDebugString().
2023-10-16 09:53:02 +02:00
Markus Blatt
e9bb5d0539
Merge pull request #4582 from Tongdongq/rocsparse-separate-wells
RocsparseSolver separate wells
2023-10-13 15:33:03 +02:00
Tobias Meyer Andersen
c809819cbd Fuse kernels to optimize performance and update
the tests and documentation.
2023-10-13 10:31:17 +02:00
Tobias Meyer Andersen
fbeb006d45 Simplify and optimize the Jacobi preconditioner
apply. Fix .h and .cpp mistakes in cmake.
2023-10-13 10:31:17 +02:00
Tobias Meyer Andersen
1e4b0e97ee Add jacobi preconditioner that runs on the GPU.
Implement calls to cuBlas, cuSparse and implement necessary
CUDA kernels to perform a single iteration of the jacobi preconditioner.

Add tests that verify new kernels and the preconditioner in its totality.

The preconditioner is verified on 2x2 and 3x3 blocks, which as of now
are the only supported sizes. 1x1 are not supported because cuSparse
does not support it.
2023-10-13 10:31:17 +02:00
Arne Morten Kvarving
3e047ab9cd
Merge pull request #4927 from blattms/spelling-fix1
Fixed spelling: achived -> achieved
2023-10-13 08:25:07 +02:00
Markus Blatt
50815209a0 Fixed spelling: achive -> achieved 2023-10-12 22:01:12 +02:00
Kai Bao
3af34e4ae6
Merge pull request #4923 from GitPaean/using_report_step
distinguishing report step and time step
2023-10-11 23:14:43 +02:00
Kai Bao
f5d3489d23 distinguishing report step and time step
for the funcitons related to createWellContainer() and
runWellPIScaling().

So it is not exhaustive, but we should do it gradually.
2023-10-11 11:33:02 +02:00
Bård Skaflestad
e2ad737848 Make Number of Initial Global Iterations Configurable
The NLDD solver would always take one global non-linear (Newton)
iteration before starting the local non-linear iterations.  This
commit introduces a new command-line parameter,

    --nldd-num-initial-newton-iter (NlddNumInitialNewtonIter)

which allows the user to configure this value at runtime.  The
default value, 1, preserves the current behaviour.
2023-10-10 18:29:05 +02:00
Kjetil Olsen Lye
628b69c83c
Casting to support {fmt} v10.
Due to issues with anonymous enums, newer versions of {fmt} (v10) do not seem to handle the implicit conversion from enum value to `int`. Hence we need a cast for `fmt::format`-calls involving `Matrix::block_matrix::rows` (or `cols`) to compile. This seems to only be relevant for one part of the code. 

For an isolated example, see https://github.com/kjetilly/fmt_fails_with_enum
2023-10-10 10:58:21 +02:00
Kai Bao
a525f0865f removing white spaces in the wells folder 2023-10-09 11:14:48 +02:00
Kjetil Olsen Lye
df0fdbbd0b
Removed call to deprecated cudaThreadExit
`cudaThreadExit` has been deprecated in favour of `cudaDeviceReset`, which is already being called.
2023-10-09 10:49:31 +02:00
Razvan Nane
dcc3bd70f0 Reinclude changes lost in adaptation to ISTLSolverEbosBda 2023-10-08 08:58:35 +02:00
Razvan Nane
e4abc12a05 Adapt rocsparse separate wells PR to changes made to ISTLSolverEbos 2023-10-08 08:58:35 +02:00
Razvan Nane
177a46366d Add <rocsparse> to accelerator-mode option in doc 2023-10-08 08:58:35 +02:00
Tong Dong Qiu
b2fea287bc Print time to apply wells for verbosity>=3 2023-10-08 08:58:35 +02:00
Tong Dong Qiu
abce3a897c Only compile HIP kernel with hipcc 2023-10-08 08:58:35 +02:00
Tong Dong Qiu
ef6be5859e Restore old HAVE_CUDA value 2023-10-08 08:58:35 +02:00
Tong Dong Qiu
684397129b Make sure rocsparse can get wellcontributions 2023-10-08 08:58:35 +02:00
Tong Dong Qiu
cb20d041c3 Allow WellContributionsRocsparse to be used 2023-10-08 08:58:35 +02:00
Tong Dong Qiu
50ccea0880 Allow rocsparseSolver to choose deviceID 2023-10-08 08:58:35 +02:00
Tong Dong Qiu
9bef10a018 Set hipStream for rocsparseWellcontributions 2023-10-08 08:58:35 +02:00
Tong Dong Qiu
a49aaf53d2 Add new files rocsparseWellContributions
With HIP stdwell_apply kernel
MultisegmentWells are done on CPU via UMFPack
2023-10-08 08:58:35 +02:00
Markus Blatt
3f436501d2
Merge pull request #4883 from jychang48/jychang48-edits
Removed OpenCL dependencies for rocsparse backend & error exception handling
2023-10-06 20:50:22 +02:00
Vegard Kippe
56997655d1 Support computation of network pressures in networks with multiple roots 2023-10-06 18:29:12 +02:00
Justin Chang
48a4ddec3a
Revert hipStreamSynchronize placement in rocsparseSolverBackend.cpp 2023-10-06 09:38:44 -05:00
Markus Blatt
3c7a4635ea
Merge pull request #4402 from bska/follow-udq-context-api-change
Chase API Change for UDQ Evaluation
2023-10-06 15:35:29 +02:00
Vegard Kippe
77bb7aa9cf Let reported pressures (GPR) respect the NETBALAN configuration 2023-10-06 15:15:43 +02:00
Vegard Kippe
389db91839 Slight restructuring/renaming for (possibly) improved clarity. 2023-10-06 15:15:43 +02:00
Vegard Kippe
a8b4c25bfb Separate network active and need for rebalance bool + perform check per timestep only. 2023-10-06 15:15:43 +02:00
Vegard Kippe
663c62e366 Avoid iterating network if no network wells are in prediciton mode 2023-10-06 15:15:42 +02:00
Arne Morten Kvarving
900056e8d7 mark variable maybe_unused
quells a clang warning
2023-10-05 09:31:36 +02:00
Bård Skaflestad
0c7b0f5fcb Chase API Change for UDQ Evaluation
In particular, pass a "segment matcher factory" into every function
that forms UDQ context objects.
2023-10-04 16:33:19 +02:00
Markus Blatt
6a705b9b8e Fixed spelling. 2023-10-04 13:24:01 +02:00
Markus Blatt
9279ce19e8 [bugfix] Fixes stopping network update in parallel at max steps.
We did only break in the loop for rank 0 and not the other ones. Hence
all other processes kept iterating beyond the maximum number of
allowed iterations. This lead to hard to find crashes because of
non-matching MPI communication.
2023-10-04 12:56:44 +02:00
Justin Chang
b5d8c3b5f0 Added detailed HIP exception handling 2023-10-03 15:40:20 -05:00
Justin Chang
54d82d349e Removed OpenCL dependencies from rocsparse backend 2023-10-03 15:40:20 -05:00
Markus Blatt
fa04666b8a
Merge pull request #4888 from blattms/fix-compute-temperature-for-distwells
Fixes computation of temperature for distributed wells.
2023-10-02 17:22:09 +02:00
Kai Bao
b1974bbe45 recovering the SHUT during iteration beahvoir in prepareWellBeforeAssembling
when local_well_solver_control_switching_ is off
and incoporating commenst regarding resetting wellStatus_ in StandardWell within
the function iterateWellEqWithSwitching.
2023-09-29 10:55:19 +02:00
Kai Bao
83bbe89342 LocalWellSolveControlSwitching default to be false 2023-09-29 10:55:19 +02:00
Kai Bao
e38e557bbc cleaning up to preapre for pull request 2023-09-29 10:55:19 +02:00
Stein Krogstad
035d216641 adding function iterateWellEqWithSwitching
when we do the local solve for well equations, control/status will be
updated during the iteration process, such that the converged well gets
correct control/status regarding to the current reservoir state.

various change in the other parts of the code were made to make the
function work as intended.
2023-09-29 10:51:04 +02:00
josh bowden
d928078219 fix added for unused parameter when Damaris does not have Python of Paraview compiled in 2023-09-28 19:37:23 +02:00
Bård Skaflestad
85bb525067 Match Region Sets by Unique Prefix
This commit switches the region set tag matching algorithm to using
unique prefixes.  This enables the simulator to recognise that the
region set name

    FIPUNI

should match up with the user defined region set 'FIPUNIT'.  In the
current master sources, the above summary vector would produce a
diagnostic message saying that the region set 'FIPUNI' (without the
final 'T') does not exist.

To this end, we instruct the ParallelEclipseState to always pass the
six character substring beginning with 'FIP' for FIP-like region
arrays and defer to the rank-0 EclipseState/FieldProps mechanism to
match this prefix with its canonical region set.
2023-09-28 17:54:27 +02:00
Bård Skaflestad
1e8441e8a9
Merge pull request #4528 from svenn-t/h2store
Enable WSF/GSF for H2STORE
2023-09-28 16:59:49 +02:00
Bård Skaflestad
09626f2e3a
Merge pull request #4525 from goncalvesmachadoc/co2store
keywords co2store + gaswat
2023-09-28 16:56:25 +02:00
josh bowden
f72553d049 another string declared within the HAVE_PYTHON_ENABLED code guards 2023-09-28 14:32:20 +02:00
josh bowden
c589a5fa00 Guard for Python and Paraview hid lack of semicolon 2023-09-28 13:32:42 +02:00
josh bowden
7f7f3b06b2 Chane to fix issue with command line argument template
integrating code modification suggested by Arne Morten Kvarving (https://github.com/jcbowden/opm-simulators/pull/1)
2023-09-28 12:58:18 +02:00
josh bowden
4a965fe297 some changes to test for paraview and python scripts 2023-09-28 11:12:26 +02:00
Arne Morten Kvarving
eedfafe423 fixed: quell unused variable warning without OpenCL 2023-09-26 09:11:48 +02:00
josh bowden
c66f7b4fab tidy up of headers 2023-09-25 22:24:40 +02:00
josh bowden
8898db41d7 Reorganised headers, removing redundant ones;
Tidy up of whitespace.
2023-09-25 22:16:43 +02:00
josh bowden
11a81211bd Corrected simlation name default if not specified on command line;
Default log level changed to info and flush only enabled when debug or trace are enabled;
2023-09-25 21:03:34 +02:00
Atgeirr Flø Rasmussen
8705cd16ad
Merge pull request #4884 from atgeirr/fix-typo-in-macro
Fix typo in macro usage.
2023-09-25 12:38:50 +02:00
Atgeirr Flø Rasmussen
e4e32defc4 Fix various errors and clean up the ISTLSolvers.
Much of this went undiscovered because the ISTLSolverEbosBda class
was not really used before due to the typo disabling it.
2023-09-25 09:03:59 +02:00
josh bowden
c7c4bffa7c Refactored the Damaris command line functionality so that commandline arguments are accessed where they are needed in the DamarisKeywords() method 2023-09-24 22:23:31 +02:00
josh bowden
bb38c57b1b Update for support of Damaris mesh based in situ processing
Moved damaris command line parameter accessors to Main.cpp and fixed support for both Python and Paraview Python scripts, as they both cannot be present in the same simulation (seems to be an initialization conflict or double initialization)
2023-09-23 22:24:11 +02:00
josh bowden
8095eb0c48 Geometric mesh data added for in-situ visualisation
added access to DUNE mesh geometry and passing through data to Damaris;
Updated command line so users can specifiy Python or Paraview script names and other paramaters that control Damaris
- Simulation name
- Number of dedicated cores or dedicated nodes
- Shared memory region size
- switch to turn off HDF5 output.
- Damaris logging level
2023-09-22 23:23:29 +02:00
Markus Blatt
2721b9fa2d Fixes computation of temperature for distributed wells.
Previously, we did a global summation of the size of the
well_perf_data vector to determine the number of perforations
of a well. In the case of distributed wells this will try to access
more perforations than stored for the well in well_perf_data and hence
might use data from cells that actually are not perforated by this
cell. Note that for well not distributed the code worked as the
summation has no effect.

This commit changes this to only query peforations on the
local process. This should be enough to fix this problem.

In addition it removes the computation of connpos which is never used.
2023-09-22 18:56:27 +02:00
goncalvesmachadoc
7b6f813aae rebase 2023-09-21 16:50:41 +02:00
Atgeirr Flø Rasmussen
ad35b2a72f Adapt to changes made to ISTLSolverEbos. 2023-09-21 12:41:03 +02:00
Atgeirr Flø Rasmussen
7aa33058c4 Fix typo in macro usage. 2023-09-21 11:39:14 +02:00
Bård Skaflestad
cfd502c0f2
Merge pull request #4871 from svenn-t/cskin
Activate CSKIN and regression test
2023-09-21 11:24:19 +02:00
Atgeirr Flø Rasmussen
18f0d8fd27
Merge pull request #4859 from jcbowden/damariswriter-for-sim-fields-v4
Damaris - Moving Damaris functionality to it's own class
2023-09-20 09:06:48 +02:00
josh bowden
1e2d9360d7 Move Damaris functionality to it's own class.
Step one for moving Damaris calls out of EclWriter class and into its own DamarisWriter class;
EclProblem now calls both writeOutput methods and passes in the data::Solution object;

Add fix for first writeOutput() call not having PRESSURE data available;

data::Solution is now passed by rvalue ref into eclWriter::writeOutput();

guard added to prevent inclusion of damariswriter.hh
2023-09-19 21:20:08 +02:00
Bård Skaflestad
40927cb173
Merge pull request #4877 from GitPaean/bhp_lower_limit_below_1bar
reducing the bhp lower limit slightly to handle 1 bar bhp limit
2023-09-19 18:44:37 +02:00
Kai Bao
9d642fd7ce only outputting some network info to the rank 0 process 2023-09-19 16:17:19 +02:00
Kai Bao
f4a420d2f9 reducing the bhp lower limit slightly to handle 1 bar bhp limit
it turns out that 1bar is the default bhp constraint for some keywords,
   and some cases are depending on it.
2023-09-19 15:30:42 +02:00
Vegard Kippe
cc39e04180 Addresing review comments 2023-09-18 13:05:12 +02:00
Atgeirr Flø Rasmussen
a59920cee2
Merge pull request #4870 from blattms/print-missing-restart-file
Include name of missing OPM restart file in error.
2023-09-15 15:29:50 +02:00
Markus Blatt
b209f6af77
Merge pull request #4778 from aritorto/cellCentroid
Refactor element centroids lookup
2023-09-15 10:02:15 +02:00
Markus Blatt
81c9594f5d Include name of missing OPM restart file in error.
Otherwise it is hard to tell for the (newbie?) user what went wrong.
2023-09-14 16:10:42 +02:00
Svenn Tveit
7217201f18 Enable WSF/GSF for H2STORE 2023-09-14 12:42:47 +02:00
Alf Birger Rustad
91a670d796 PARAOPTS and SOLVDIRS should only give warning 2023-09-14 09:22:36 +02:00
Tor Harald Sandve
b55270defe
Merge pull request #4854 from vkip/gecon_closure_reason_group
Set GECON closure reason to GROUP, to not open with WTEST option 'E'.
2023-09-14 08:58:32 +02:00
Svenn Tveit
913ba450a7 Activate CSKIN 2023-09-14 08:52:05 +02:00
Bård Skaflestad
6f27ffa68d
Merge pull request #4862 from vkip/avoid_negative_relaxation_factor_fraction
Avoid fraction relaxation factors outside [0,1] (standard wells)
2023-09-13 16:45:11 +02:00
Bård Skaflestad
69e9bf624a
Merge pull request #4860 from GitPaean/not_relaxing_rate_update
removing rate relaxation during updateNewton for StandardWellPrimaryVariables
2023-09-13 15:31:44 +02:00
Atgeirr Flø Rasmussen
9206e8b3db
Merge pull request #4863 from bska/interior-cell-grid-view
Implement Interior Cell Counts for Grid Views
2023-09-13 12:24:00 +02:00
Kai Bao
b79e3a7de2 removing rate relaxation during updateNewton in StandardWellPrimaryVariables
it was introduced back then for some purpose. The purpose might not
apply anymore due to other development. And also, some issues were
reported for some situtation with the approach.
2023-09-13 12:16:58 +02:00
Atgeirr Flø Rasmussen
708401ca14
Merge pull request #4861 from hnil/fixed_msw_addwellcontricutions
fixed add-well-contributions for multisegement wells
2023-09-13 11:40:40 +02:00
Atgeirr Flø Rasmussen
3673c05242
Merge pull request #4848 from vkip/gconsump_mpi_fix
Avoid adding/substracting GCONSUMP values per MPI process..
2023-09-13 11:00:04 +02:00
Vegard Kippe
2b45785097 Using std::clamp 2023-09-12 12:52:41 +02:00
Bård Skaflestad
a2d43cd0f5 Implement Interior Cell Counts for Grid Views
This is mostly to prepare for implementing partitionCells() for
grid views instead of grids.
2023-09-12 12:37:10 +02:00
hnil
29e968c232 fixed add-well-contributions for multisegement wells 2023-09-12 09:49:15 +02:00
Vegard Kippe
4638b3a9be Avoid fraction relaxation factors outside [0,1] in the standard well model. 2023-09-12 00:20:02 +02:00
Håkon Hægland
ac927d997b Added a get_dt() method
Added a get_dt() to the opm.simulators.BlackOilSimulator Python module.
This will return the size of the previous simulator time step.
2023-09-08 19:40:42 +02:00
Vegard Kippe
a12f0aaa13 Set GECON closure reason to GROUP, to not open with WTEST option 'E'. 2023-09-08 11:16:11 +02:00
Håkon Hægland
e2f62644ae Get cell volumes from Python
Adds a new method get_cell_volumes() to the opm.simulators Python module
that returns a python list of the cell volumes in the black oil
simulator.
2023-09-08 09:39:24 +02:00
Vegard Kippe
dbd1d343e8 Avoid adding/substracting GCONSUMP values per MPI process.. 2023-09-07 14:14:56 +02:00
Bård Skaflestad
1d33e7caf0
Merge pull request #4806 from totto82/initBHPinj
initialize all injectors with a rate to avoid singularities
2023-09-07 14:06:23 +02:00
Bård Skaflestad
bb04054d2c
Merge pull request #4842 from totto82/wellPressGW
use gas pressure for gas-water system in the well model
2023-09-07 12:47:05 +02:00
Bård Skaflestad
467671b946
Merge pull request #4840 from totto82/solvent_well_fix
Solvent well fix
2023-09-07 12:45:56 +02:00
Tor Harald Sandve
79e0b7256a initialize all injectors with a rate to avoid singularities 2023-09-07 12:03:04 +02:00
Kai Bao
529af98ce9 setting uninitialized bhp to be bhp_limit in updateWellStateWithTarget
to avoid uninitialized bhp 0. to be used.
2023-09-07 08:50:37 +02:00
Bård Skaflestad
f32b8e17ed
Merge pull request #4815 from plgbrts/std-netw-gaslift
Add FLO as supported option of item 6 of GRUPNET
2023-09-06 14:51:51 +02:00
Tor Harald Sandve
8796fa1ccc use gas pressure for gas-water system in the well model 2023-09-06 13:46:18 +02:00
Tor Harald Sandve
e31b2f3492 don't use relaxation factor fraction in combination with solvent 2023-09-06 13:24:31 +02:00
Tor Harald Sandve
c239427233 add solvent contribution to the gas potential 2023-09-06 13:23:55 +02:00
Bård Skaflestad
27466bae66
Merge pull request #4834 from steink/assure_non_negative_oil_fraction
Prevent negative oil fractions in well segments
2023-09-06 12:44:21 +02:00
Atgeirr Flø Rasmussen
87b9dd3ec2
Merge pull request #4837 from bska/remove-unused-code
Remove Unused Functions
2023-09-06 09:09:54 +02:00
Bård Skaflestad
e6c2413d05 Remove Unused Functions
These functions became unused in commits 952ccf8338 and f027262ec4,
but their definitions remained in place.  We no longer need them.
2023-09-05 19:03:43 +02:00
Atgeirr Flø Rasmussen
8900962fd5
Merge pull request #4827 from jcbowden/damaris-fix-for-deadlock
Damaris fix for deadlock at end of simulation when run with Damaris
2023-09-05 14:28:32 +02:00
Stein Krogstad
7981253f39 prevent negative oil fractions 2023-09-05 11:18:16 +02:00
Atgeirr Flø Rasmussen
7327a6b429
Merge pull request #4260 from atgeirr/dynamic-linear-solver-choice
Support for multiple linear solvers.
2023-09-04 13:53:43 +02:00
Atgeirr Flø Rasmussen
cede2b4add Improving generality and output of hybrid approach. 2023-09-04 13:13:52 +02:00
Paul
1912faf47c Add FLO as supported option of item 6 of GRUPNET 2023-09-04 11:21:59 +02:00
Bård Skaflestad
9c58585538
Merge pull request #4823 from akva2/ecltimestepping_separate
changed: put ecl time stepping parameters in separate struct
2023-09-04 10:54:46 +02:00
Josh Bowden
6e4f3bd37e added changes as discussed in PR 4827 2023-09-01 18:28:03 +02:00
Tor Harald Sandve
80cbfe7fda
Merge pull request #4819 from hakonhagland/gecon3
Implement support for GECON keyword
2023-09-01 15:06:48 +02:00
Atgeirr Flø Rasmussen
079bf9323a
Merge pull request #4830 from jcbowden/damaris-hdf5-select-keyword
Damaris internal XML file update to support HDF5 local to global write.
2023-09-01 15:01:50 +02:00
Atgeirr Flø Rasmussen
efa50c3640 Check for multiple solvers before trying to use them. 2023-09-01 13:18:09 +02:00
Atgeirr Flø Rasmussen
758b4bbdb6 Use "hybrid" linear solver choice to get multi-option. 2023-09-01 13:18:09 +02:00
Franz Georg Fuchs
6ee90b3f8f Support for multiple linear solvers. 2023-09-01 13:18:06 +02:00
Josh Bowden
89d13e479c Update to the opm-flow internal Damaris XML to support the HDF5 select writing option so that local variable data is written to global variable position in HDF5 output 2023-09-01 12:02:04 +02:00
Håkon Hægland
b1274096e9 Added to partially supported keywords
Added GECON to the list of partially supported keywords
2023-09-01 11:29:18 +02:00
Atgeirr Flø Rasmussen
91c2e12a25 Document new input parameter. 2023-09-01 11:19:36 +02:00
Atgeirr Flø Rasmussen
583fb902d2 Guards communication parts inside HAVE_MPI. 2023-09-01 11:19:16 +02:00
Bård Skaflestad
c6e30fbf3c
Merge pull request #4820 from atgeirr/parallel-nldd-fixes
Fixes to enable using the NLDD nonlinear solver option in MPI parallel runs
2023-09-01 09:51:06 +02:00
Atgeirr Flø Rasmussen
99fca58dca Improvements from review. 2023-09-01 08:48:11 +02:00
Vegard Kippe
a75f58f19a Moved two lines 2023-08-31 16:11:29 +02:00
Vegard Kippe
deeecfcd1f Fixing indent 2023-08-31 16:11:28 +02:00
Vegard Kippe
edd421ac93 Adding hydrostatic and acceleration pressure losses to icd segments 2023-08-31 16:11:28 +02:00
Josh Bowden
84d3530fd9 fix for deadlock at end of simulation when run with Damaris and test for whether Damaris can be run as Damaris requires at least 2 MPI ranks (one for simulation and the other as to run Damaris i/o) 2023-08-31 15:51:34 +02:00
Atgeirr Flø Rasmussen
06c706e7d6 Also copy flags, and helper function with test. 2023-08-31 13:01:50 +02:00
Atgeirr Flø Rasmussen
151eac9110 Copy overlap data after local solve.
Also update intensive quantities in overlap afterwards.
2023-08-31 13:01:50 +02:00
Atgeirr Flø Rasmussen
961a5fa482 Avoid collective copyParValues() call in serial run. 2023-08-31 13:01:50 +02:00
Atgeirr Flø Rasmussen
e1dd2bf148 Add forceSerial parameter to ISTLSolverEbos.
Used for single-domain solves.
2023-08-31 13:01:50 +02:00
Atgeirr Flø Rasmussen
622103a367 Avoid collective operation in single-domain context. 2023-08-31 13:01:50 +02:00
Atgeirr Flø Rasmussen
609dfd6051 Only owned cells should be part of NLDD partitions. 2023-08-31 13:01:28 +02:00
Arne Morten Kvarving
3c525aefae changed: put ecl time stepping parameters in separate struct
this to allow reuse in ebos simulators
2023-08-30 11:22:22 +02:00
Kai Bao
f7bd386402 adding the support for filtration_summary_keywords 2023-08-29 21:31:24 +02:00
Stein Krogstad
e7a0dbacf2 don't do rate-init for stopped/zero target 2023-08-29 14:52:09 +02:00
Håkon Hægland
a5899f6f2f Added missing header file 2023-08-29 09:02:12 +02:00
Antonella Ritorto
5d9f8a88b4 LookUpCellCentroid used to search cell centroids in eclbasevanguard 2023-08-29 08:45:59 +02:00
Håkon Hægland
2f9b136bb1 Implement support for GECON keyword
Implement support for item 2 and 3 of the GECON keyword
2023-08-29 01:07:21 +02:00
Vegard Kippe
f5c31588cb Quick fix.. 2023-08-25 14:01:51 +02:00
Paul
d4743ed4a5 item 7 added to partially supported keywords 2023-08-23 16:24:35 +02:00