Arne Morten Kvarving
f17a90170d
use exception classes from opm-common
2022-12-13 12:56:13 +01:00
Bård Skaflestad
bb649097b9
Merge pull request #4317 from akva2/adjust_enums
...
Adjust to upstream enum entry changes
2022-12-12 23:57:09 +01:00
Arne Morten Kvarving
dc7cddab64
adjust to upstream GasPvtApproach enum changes
2022-12-12 19:17:51 +01:00
Arne Morten Kvarving
9a9dfd2e1d
adjust to upstream OilPvtApproach enum changes
2022-12-12 19:09:37 +01:00
Arne Morten Kvarving
e390ce5149
adjust to upstream WaterPvtApproach enum changes
2022-12-12 19:00:19 +01:00
Bård Skaflestad
1de821ca62
Merge pull request #4314 from akva2/epsscalingpoints_encapsulate
...
add missing include
2022-12-12 09:43:36 +01:00
Arne Morten Kvarving
e4233daf72
add missing include
...
after upstream header removals
2022-12-10 01:58:32 +01:00
Bård Skaflestad
ba54effb6a
Merge pull request #4313 from akva2/epsgridprops_encapsulate
...
RelpermDiagnostics: add more forwards
2022-12-09 23:11:35 +01:00
Arne Morten Kvarving
134cb205e2
RelpermDiagnostics: add more forwards
...
adjust to upstream header-in-header removals
2022-12-09 22:17:09 +01:00
Bård Skaflestad
4e3eea0447
Merge pull request #4312 from bska/capture-convergence-history
...
Capture Timestep's Non-Linear Convergence History
2022-12-09 16:36:30 +01:00
Bård Skaflestad
3c63a7aa6d
Capture Timestep's Non-Linear Convergence History
...
This enables outputting a formatted record of the limiting MB and
CNV quantities as time and non-linear iterations progress. This, in
turn, is intended for diagnostic and analysis purposes and will not
be output unless specifically requested.
In particular, add a new type,
ConvergenceReport::ReservoirConvergenceMetric
which captures the convergence metric type (MB or CNV) along with
the associate phase and numerical value of the convergence metric.
We add a vector of these convergence metric objects as a new data
member of the ConvergenceReport.
Finally, foreshadowing the intended use case, also store the report
time in the ConvergenceReport object.
2022-12-09 16:22:36 +01:00
Bård Skaflestad
8997437ede
Merge pull request #4305 from bska/activate-welpi-regression-tests
...
Enable Regression Testing of WELPI and CPI/CTFAC
2022-12-09 16:19:48 +01:00
Bård Skaflestad
364b87afc9
Enable Regression Testing of WELPI and CPI/CTFAC
...
Forgotten at the time we developed the WELPI support.
2022-12-09 13:09:02 +01:00
Bård Skaflestad
f42beb24f4
Merge pull request #4303 from akva2/remove_material
...
adjust jenkins script and buildsystem
2022-12-09 12:48:35 +01:00
Bård Skaflestad
de84ea65a7
Merge pull request #4251 from GitPaean/fixing_singluar_frictional_pressure_drop
...
rewrting frictionPressureLoss fucntion for better jacobian matrix
2022-12-09 11:04:33 +01:00
Bård Skaflestad
1221936791
Merge pull request #4311 from bska/publish-component-names
...
Capture Component Names in Independent Datastructure
2022-12-09 10:13:42 +01:00
Bård Skaflestad
149ae34dd2
Capture Component Names in Independent Datastructure
...
This is in preparation of enabling separate convergence output
for diagnostic purposes.
2022-12-09 09:41:22 +01:00
Markus Blatt
b4acdedefd
Merge pull request #4310 from totto82/groupinfo_stage2
...
BUGFIX we now use group_info in stage 2 and need to make sure its communicated
2022-12-08 09:01:01 +01:00
Tor Harald Sandve
60d0116080
we now use group_info in stage 2 and need to make sure its communicated
2022-12-07 15:43:25 +01:00
Atgeirr Flø Rasmussen
e6a8686c77
Merge pull request #4309 from atgeirr/write-global-cell-index-to-damaris
...
Write global cell index to damaris
2022-12-07 15:38:40 +01:00
Atgeirr Flø Rasmussen
130f552dac
Must set location for every variable.
2022-12-07 13:37:38 +01:00
Atgeirr Flø Rasmussen
18f6f5e4e3
Push index map to Damaris for output ordering.
2022-12-07 13:05:44 +01:00
Kai Bao
1f077c35d2
rewrting frictionPressureLoss fucntion for better jacobian matrix
...
it removes some singularity warning from UMFPack.
2022-12-07 11:43:12 +01:00
Bård Skaflestad
58cf299171
Merge pull request #4306 from akva2/msw_assemble
...
add: MultisegmentWellAssemble
2022-12-05 15:45:23 +01:00
Arne Morten Kvarving
b102103e26
changed: make MultisegmentWellEquations data members private
...
use a friend declaration for MultisegmentWellEquationAccess to
give the assembler access to the matrices/vectors.
2022-12-05 11:07:09 +01:00
Arne Morten Kvarving
2d154b50bb
added: MultisegmentWellEquations::residual()
...
this returns a const reference to the residual vector.
use this in MultisegmentWellEval
2022-12-05 11:07:09 +01:00
Arne Morten Kvarving
4545761374
added: MultisegmentWellEquationAccess
...
this is a proxy class for accessing the equation system
in MultisegmentWellAssemble.
use the new class for vector/matrix access in MultisegmentWellAssemble.
2022-12-05 11:07:09 +01:00
Arne Morten Kvarving
6011a42246
added: MultisegmentWellAssemble::assemblePerforationEq
...
extracted from MultisegmentWell::assembleWellEqWithoutIteration
2022-12-05 11:07:09 +01:00
Arne Morten Kvarving
b1d1e47e28
added: MultisegmentWellAssemble::assembleInflowTerm
...
extracted from MultisegmentWell::assembleWellEqWithoutIteration
2022-12-05 11:07:09 +01:00
Arne Morten Kvarving
d5bbccde65
added: MultisegmentWellAssemble::assembleOutflowTerm
...
extracted from MultisegmentWell::assembleWellEqWithoutIteration
2022-12-05 11:07:09 +01:00
Arne Morten Kvarving
517dd49771
added: MultisegmentWellAssemble::assembleAccumulationTerm
...
extracted from MultisegmentWell::assembleWellEqWithoutIteration
2022-12-05 11:07:09 +01:00
Arne Morten Kvarving
1952ca1e5c
use MultisegmentWellAssemble::assemblePressureEq in assembleICDPressureEq
2022-12-05 11:07:09 +01:00
Arne Morten Kvarving
32dce644d3
added: MultisegmentWellAssemble::assembleTrivialEq
...
extracted from MultisegmentWellEval::assembleICDPressureEq
2022-12-05 11:07:09 +01:00
Arne Morten Kvarving
05a4ca85a7
added: MultisegmentWellAssemble::assemblePressureEq
...
extracted from MultisegmentWellEval::assembleDefaultPressureEq
2022-12-05 11:07:09 +01:00
Arne Morten Kvarving
d64508f3b8
added: MultisegmentWellAssemble::assemblePressureLoss
...
extracted from MultisegmentWellEval::handleAccelerationPressureLoss
2022-12-05 11:07:09 +01:00
Arne Morten Kvarving
4ebde4e003
added: MultisegmentWellAssemble
...
this handles assembly of the equation system for multisegment well.
start by moving assembleControlEq into the new class
2022-12-05 11:07:09 +01:00
Bård Skaflestad
4f38217fc8
Merge pull request #4302 from akva2/msw_equations
...
Added: MultisegmentWellEquations
2022-12-05 11:05:31 +01:00
Arne Morten Kvarving
97e1cdb662
added: MultisegmentWellEquations::extractCPRPressureMatrix()
...
this adds the cpr pressure matrix to a matrix.
this is the core of MultisegmentWell::addWellPressureEquations
use the new method in the implementation.
2022-12-05 10:13:55 +01:00
Arne Morten Kvarving
de8eedb9a6
added: MultisegmentWellEquations::extract(SparseMatrixAdapter)
...
this adds the well matrices to a sparse matrix adapter.
this is the core of MultisegmentWell::addWellContributions.
use the new method in the implementation.
2022-12-05 10:13:55 +01:00
Arne Morten Kvarving
4a2fcd5f09
added: MultisegmentWellEquations::extract(WellContributions&)
...
this adds the well matrices to a WellContributions object.
use the new method in the implementation.
2022-12-05 10:13:55 +01:00
Arne Morten Kvarving
d50aaf8ed4
added: MultisegmentWellEquations::recoverSolutionWell()
...
this recovers the well solution from a solution vector.
use the new method in the well implementation.
2022-12-05 10:13:55 +01:00
Arne Morten Kvarving
bc312d1117
added: MultisegmentWellEquations::solve()
...
this applies the inverted D matrix to the residual vector.
use the new method in the well implementation.
2022-12-05 10:13:55 +01:00
Arne Morten Kvarving
a7cb444328
MSWellHelpers: simplify interfaces
...
- avoid passing the matrix, only pass the solver. possible
since setting up the solver is not done in here any more.
- avoid passing shared_ptr's
2022-12-05 10:13:55 +01:00
Arne Morten Kvarving
e67e58d0c8
added: MultisegmentWellEquations::createSolver
...
this applies compute the LU decomposition of the D matrix
2022-12-05 10:13:53 +01:00
Bård Skaflestad
e7b620dcb2
Merge pull request #4278 from tskille/supported_keyw
...
Updates related to unsupported keywords and options
2022-12-02 14:02:15 +01:00
Torbjørn Skille
8dec3958bd
Updates related to unsupported keywords and options
...
Majority of unsupported keywords and unsupported keyword options are now critical (simulator will stop).
2022-12-02 12:46:43 +01:00
Bård Skaflestad
a57d73336d
Merge pull request #4304 from GitPaean/fixing_cpi_output
...
using correct CPI indices for connections in WellState::reportConnections()
2022-12-01 16:15:36 +01:00
Kai Bao
3d86688d0f
renaming local_comp_index to local_conn_index
...
in function WellState::reportConnections() since there is no
completion involved here.
2022-12-01 15:42:18 +01:00
Kai Bao
aaf76227f6
using correct CPI indices for connections
...
in WellState::reportConnections()
2022-12-01 15:16:35 +01:00
Arne Morten Kvarving
4b67b9e0de
adjust jenkins script and buildsystem
...
remove opm-material from upstreams / dependencies
2022-12-01 14:10:43 +01:00