We switch to using the applyRestartSwatInit() member function
instead of directly mutating a data member of the EpsInfo structure.
This way we defer the rescaling to a context with a more complete
view of the changes needed to convey the information to all
components involved.
The connections entered in the EDITNNC keyword are already fully
accounted for in the main 'update()' loop followed by the helper
function applyEditNncToGridTrans_(). Therefore, it is wrong to
include those connections when applying MULTREGT to NNCs. This
commit removes the pertinent connections from the main loop in
helper function applyNncMultreg_().
Commit ddcafa8a91 got this wrong, so pointy hat to [at]bska.
also:
-- fixed but not checked for diffusion
-- bug for zero thermal diffusion (nan in derivatives)
-- added checking of consistency between input and taged phases
This commit separates the computation of hydrocarbon pore-volumes
out from the context of average pressure values. These pore-volumes
go into the xHPV summary vectors and are, therefore, useful in their
own right-not just as a means to computing average pressure values.
Two tests include ebos.hh, but probably should not: test_glift1 and test_RestartSerialization.
This change restores the build for those tests. Removing ebos.hh from their inclusion list
should be done, but currently exposes that some other headers are not properly standalone,
so it is a bit more work to do.
This commit splits updateFluidInPlace_() into several smaller helper
functions, each with a narrow purpose. They're all just called from
the original call site--the body of updateFluidInPlace_()--but this
new version is, in my opinion, easier to reason about and there is
less shared state.
In anticipation of adding support for summary vectors FHPV and RHPV
(field and region levels of hydrocarbon pore-volumes), we also split
the pore-volume updates out to a branch separate from that needed
for average pressure calculations.
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
This commit adds a new member function,
EclTransmissibility<>::applyNncMultreg_()
which applies regional transmissibility multipliers such as those
entered in the MULTREGT keyword to the explicit input NNCs. We make
the application conditional on a new parameter, default value
'false', and pass 'true' as the argument from 'finishInit()'.
Along with TransMult::getRegionMultiplierNNC(), this implements all
known connection behaviours for inter-region connections.
Multipliers internal to a region in MULTREGT are not yet supported.
Connections between reservoir cells and numerical aquifer cells, or
between numerical aquifer cells when multiple such cells define a
single numerical aquifer, should always be treated as NNCs for
output purposes and end up in the (NNC1,NNC2,TRANNNC) output arrays.
To this end, make a special purpose predicate to identify numerical
aquifer connections when forming the output NNC and transmissibility
arrays and act accordingly in member functions 'computeTrans_()' and
'exportNncStructure_()'.
While here, also pick up the NNC transmissibility value from
'globalTrans()' since multiplier operations like MULTREGT might have
affected the explicit values entered in the NNC, EDITNNC, and
EDITNNCR keywords. This is in preparation of properly incorporating
such multipliers in follow-up work. Finally, fix a subtle problem
caused by using 'std::abs()' to check for non-zero connections.
When accounting for explicit NNCs, it might happen that the final
transmissibility would become negative with a sufficiently large
absolute value that 'abs(t) > threshold' would be true. This would
result in outputting a negative transmissibility value to the NNC
arrays which would confuse result processors.
-- add new function need for tpfa linearizer in thermal
-- set tpfa linearizer for blackoil with energy
-- set tpfa linearizer for gasoil and energy which include co2store
-- NB diffusion is disabled for this simulators
