Commit Graph

1571 Commits

Author SHA1 Message Date
Arne Morten Kvarving
d2a720e40c changed: use a struct for holding BC data
keeps related data as a single class member.
use this for massratebc_
2022-10-17 15:01:27 +02:00
Atgeirr Flø Rasmussen
69f2ede363
Merge pull request #4165 from atgeirr/avoid-useless-call
Do not call assignToSolution() and throw away the result.
2022-10-14 10:31:26 +02:00
Arne Morten Kvarving
a884e3c1d6 ecltracermodel: use elements range generator 2022-10-13 23:01:35 +02:00
Arne Morten Kvarving
7f21bc55b0 eclthresholdpressure: use elements range generator 2022-10-13 23:00:57 +02:00
Arne Morten Kvarving
3599e0e5de eclproblem: use elements range generator 2022-10-13 23:00:57 +02:00
Arne Morten Kvarving
be84bc16be ecloutputblackoilmodule: use elements range generator 2022-10-13 23:00:57 +02:00
Arne Morten Kvarving
f85d388955 eclgenerictracermodel: use elements range generator 2022-10-13 23:00:57 +02:00
Arne Morten Kvarving
998cd137a0 ecltransmissibility: use elements and intersections range generators 2022-10-13 23:00:57 +02:00
Arne Morten Kvarving
da2c68ee08 eclwriter: use elements range generator 2022-10-13 23:00:57 +02:00
Arne Morten Kvarving
0329ce08a7 eclgenericwriter: use elements and intersections range generators 2022-10-13 23:00:57 +02:00
Arne Morten Kvarving
50e6ca16d6 eclgenericthresholdpressure: use elements and intersections range generators 2022-10-13 23:00:57 +02:00
Arne Morten Kvarving
82b29f113a eclbasevanguard: use elements range generator 2022-10-13 23:00:57 +02:00
Arne Morten Kvarving
a6509fe077 collecttoiorank: use elements range generator 2022-10-13 23:00:57 +02:00
Atgeirr Flø Rasmussen
de12a990aa Do not call assignToSolution() and throw away the result. 2022-10-13 21:42:53 +02:00
Arne Morten Kvarving
ecc36f6ce8 fix cmake handling
- use imported target for linking
- use separate damaris cmake script
- handle HAVE_DAMARIS config variable in the usual way

fixing issues when user does not provide an outputDir via a command_line

avoid adding damaris's command lines when we dont have damaris
2022-10-13 12:23:06 +02:00
Atgeirr Flø Rasmussen
b7bc8437e7 Minor fixes and formatting issues addressed. 2022-10-13 12:23:06 +02:00
Atgeirr Flø Rasmussen
c1b3c5e973 Rename option to EnableDamarisOutputCollective. 2022-10-13 12:23:06 +02:00
Atgeirr Flø Rasmussen
2c86a61b70 Remove extra whitespace. 2022-10-13 12:23:06 +02:00
Joshua Bowden
fa7af3540c Changes needed to add Damaris functionality. The current state is that we output the pressure field and we use both HDF5 and parallel HDF5.
Damaris initialization is added after InitMpi but before starting the simulation. Damaris will invoke a separate core for writing in
parallel and leave the rest of cores for the simulator. The main changes are in main where start_damaris and then in eclwriterm where
we use damaris to output the PRESSURE. To test Damaris one can use --enable-damaris-output=true and to use parallel HDF5 one can use
--enable-async-damaris-output=true (false is the default choice)
2022-10-13 12:23:06 +02:00
Bård Skaflestad
ec83f37afa
Merge pull request #4147 from akva2/tracer_begin_optimize
Optimize EclTracerModel::updateStorageCache
2022-10-13 10:47:51 +02:00
Markus Blatt
fcc3690832 Added missing include of config.h in cpp files. 2022-10-12 15:28:38 +02:00
Arne Morten Kvarving
89d4798cca changed: do all updateStorageCaches in one call
by looping over the tracer batches.
this avoids initializing the element contexts 3 times for each cell
2022-10-07 13:27:56 +02:00
Arne Morten Kvarving
9a88f56e7d changed: put tracer batches in an array
now we can easily iterate over them
2022-10-07 13:27:56 +02:00
Arne Morten Kvarving
0d1c989a25 simplify updateStorageCache
use the elements() range generator. while at it, fix some cosmetics
2022-10-07 13:27:56 +02:00
Arne Morten Kvarving
2f80274100 changed: only update primary variables in tracer update
no reason to update the extensive quantities
2022-10-07 13:27:56 +02:00
Arne Morten Kvarving
c4e2ffea57 simplify updateProperty_: use elements() range generator 2022-10-05 15:36:22 +02:00
Arne Morten Kvarving
26b8fe01a3 changed: use updateProperty_ in updateCompositionChangeLimits_() 2022-10-05 15:36:19 +02:00
Arne Morten Kvarving
2d33932160 changed: use updateProperty_ in updateMaxPolymerAdsorption_ 2022-10-05 15:31:13 +02:00
Arne Morten Kvarving
0841b2baf4 changed: use updateProperty_ in updateHysteresis_ 2022-10-05 15:28:07 +02:00
Arne Morten Kvarving
f4cd69f422 changed: use updateProperty_ in updateMinPressure_ 2022-10-05 15:25:07 +02:00
Arne Morten Kvarving
80b54a85ad changed: use updateProperty_ in updateMaxWaterSaturation_ 2022-10-05 15:21:52 +02:00
Arne Morten Kvarving
32995d34a1 changed: use updateProperty_ in updateMaxOilSaturation_ 2022-10-05 15:18:49 +02:00
Arne Morten Kvarving
e4fe00413b added: EclProblem::updateProperty_ function
this loops over the grid cells, extracts compressedDofIdx
and intensive quantities and then calls a passed function.
2022-10-05 15:11:49 +02:00
Atgeirr Flø Rasmussen
b9e157e3f5 Bugfix: fix dis/en-abling dissolution in the fluid state.
This affects the gas/water model, which should not have dissolution,
to be consistent with definitions of FluidState and ScalarFluidState
in the BlackOilIntensiveQuantities class.
2022-09-30 10:58:05 +02:00
Bård Skaflestad
3bb35b223c
Merge pull request #4119 from atgeirr/refactor-boundary-flux
Refactor boundary flux
2022-09-29 16:21:34 +02:00
Atgeirr Flø Rasmussen
54284fad7f Remove unneeded timeIdx argument. 2022-09-29 14:13:49 +02:00
Atgeirr Flø Rasmussen
04183dea31 Ensure solvent boundary fluxes work.
This does the job for the element-context-based linearizer,
but not for the TpfaLinearizer, which when combined with the
solvent model will require a bit more work for bcs.
2022-09-28 08:47:04 +02:00
Atgeirr Flø Rasmussen
b7758aa706 Use std::array rather than C arrays. 2022-09-28 08:47:04 +02:00
Atgeirr Flø Rasmussen
bc13f57e95 Simplify the boundaryCondition() method. 2022-09-28 08:47:04 +02:00
Atgeirr Flø Rasmussen
5e08a9fc12 Make boundary condition data accessor function. 2022-09-28 08:47:04 +02:00
Atgeirr Flø Rasmussen
68e1479caf [WIP] Refactor calculateBoundaryGradients_()
Not addressing solvent yet.
2022-09-28 08:47:04 +02:00
Atgeirr Flø Rasmussen
b65f5e9808 Add new overload for transmissibilityBoundary() without element context. 2022-09-28 08:47:04 +02:00
Kai Bao
7881161497 we only use drift compensation when wells are active
shut wells are not considered to be active.
2022-09-27 14:51:40 +02:00
Bård Skaflestad
eb0a516ff0
Merge pull request #4128 from ElyesAhmed/alugrid_fix
some fixes for flow_alugrid
2022-09-27 13:05:33 +02:00
OPMUSER
10b555ad3f Fix PBUB and PDEW Export to Restart File
The saturation pressures written to the restart used SI units instead of the pressure units for the model. This PR fixes this.
2022-09-27 17:23:35 +08:00
Håkon Hægland
c9ae20bb64 Move updateRelperms() to the problem class
Moves the updateRelperms() method in BlackOilInstensiveQuantities in
opm-models to the EclProblem class and its parent MultiPhaseBaseProblem.
This is a more natural place for this method and it avoids having to
include EclMaterialManager into the  BlackOilInstensiveQuantities.
2022-09-26 17:13:03 +02:00
Elyes Ahmed
3832fd5eb7 fixing AquiferModel in AlugridModel 2022-09-26 10:43:42 +02:00
Tor Harald Sandve
1849c95c2c
Merge pull request #4048 from hakonhagland/krnum
Add support for directional relative permeabilities
2022-09-26 09:10:48 +02:00
Elyes Ahmed
c4c4c7ac88 back to EclBaseAquiferModel 2022-09-23 14:01:40 +02:00
Elyes Ahmed
d6cbeb8b2b minor 2022-09-23 13:32:58 +02:00
Elyes Ahmed
e05af09c43 cleaning 2022-09-23 13:28:04 +02:00
Elyes Ahmed
709a90b67d some fixes for flow_alugrid 2022-09-23 11:59:01 +02:00
Kai Bao
3bed5f41c1 for the cells having zero thickness
we use the cell center depth to do the equilibration
2022-09-23 09:59:52 +02:00
Håkon Hægland
affc5cb53b Return a pointer to the material manager
This is used by blackoilintensivequantities.hh. Further, for other
problems derived from MultiPhaseBaseProblem, that base class will
return a null pointer such that problems that do not override the
materialLawManagerPtr() method still can use the blackoil intensive
quantitites (which in the case of directional relative permeabilities
makes use of the problem reference to access the materialLawManager)
2022-09-22 23:54:29 +02:00
Arne Morten Kvarving
5bf41a6a28 hide --zoltan-params from --help
as this is an expert option, it should only
be displayed with --help-all
2022-09-16 21:00:45 +02:00
Arne Morten Kvarving
2fa479873e break long line 2022-09-16 21:00:30 +02:00
Bård Skaflestad
52d653efee
Merge pull request #4117 from akva2/zoltan_params
added: command line option for zoltan customization
2022-09-16 16:24:24 +02:00
Arne Morten Kvarving
c1c850538a added: command line option for zoltan customization
modeled after the linsolver support. a few built-in presets,
as well as reading options from a json file
2022-09-16 13:51:29 +02:00
Arne Morten Kvarving
4f9f0f921f changed: use Serializer from opm-common 2022-09-16 13:12:11 +02:00
Arne Morten Kvarving
7362386d3d changed: split out serialization in separate class
make it a template over a packer.
make EclMpiSerializer an instance of this template with
a MPI based packer, and move broadcasting functionality
to the new class
2022-09-16 13:11:45 +02:00
Arne Morten Kvarving
975e096d4c changed: make container handlers in eclmpiserializer protected
users only use operator()
2022-09-16 11:59:40 +02:00
Arne Morten Kvarving
62f22062dd eclmpiserializer: consistently make immutable access the exception
by nature of the operation, the data should be immutable on sender and
mutable on receiver. this way we atleast keep data immutable where we can,
and immutable access is explicitly marked by casts.
2022-09-16 11:57:23 +02:00
Arne Morten Kvarving
d31620b38b eclmpiserializer: simplify handling
everything can now be done through operator()
2022-09-16 11:57:23 +02:00
Håkon Hægland
c6129ad9a4 Renamed function in ecfvstencil.hh
Use the new name of the dirId() function in ecfvstencil.hh
2022-09-16 09:10:42 +02:00
Håkon Hægland
cbdec23e50 Also check for unknown face direction
To avoid compiler warnings, we also need to check for the unknown face
direction due to change in the FaceDir::DirEnum values in opm-common.
2022-09-16 09:07:25 +02:00
Arne Morten Kvarving
9cbb0aa05e added: pack array/vector of pod in one op 2022-09-15 14:04:41 +02:00
Arne Morten Kvarving
b1092c1a12 changed: refactor MPIPacker
to limit the overload party, we put packing details for
specific types in separate structs.
emit compiler error if unsupported type is given,
better to detect this on compile time rather than runtime
2022-09-15 14:04:41 +02:00
Arne Morten Kvarving
3a19ab31bd
Merge pull request #4106 from akva2/serializer_handle_tuples
changed: handle tuples in eclmpiserializer
2022-09-15 12:59:13 +02:00
Arne Morten Kvarving
3c389d5ece changed: handle pairs as tuples in eclmpiserializer 2022-09-15 11:19:04 +02:00
Håkon Hægland
9ed974fda3 Minor simplification
Simplify code using the unknown facedir value.
2022-09-14 23:54:43 +02:00
Arne Morten Kvarving
5c78925981 fixed: wrong root rank in variadic broadcast
change the test to broadcast from rank 1 instead of 0
so this bug does not resurface
2022-09-14 19:38:24 +02:00
Håkon Hægland
7d0265dd44 Limit access to face direction.
Only access the grid face direction information if directional relperms
have been enabled.
2022-09-14 15:34:41 +02:00
Håkon Hægland
8b1bcb36bc Adds support for KRNUM 2022-09-14 15:34:41 +02:00
Bård Skaflestad
67ec01a730
Merge pull request #4034 from plgbrts/equil2
Equilibration with water-gas ratio vs depth (RVWVD) table
2022-09-14 14:30:04 +02:00
Paul Egberts
7ca6e2a25e
Update equilibrationhelpers.hh
removed obsolete comment
2022-09-14 14:11:19 +02:00
Paul Egberts
29dec2686a
Update initstateequil.hh
removed obsolete comment
2022-09-14 14:08:40 +02:00
Paul Egberts
c2cac1b183 added equilibration option for water in gas 2022-09-13 18:02:33 +02:00
Arne Morten Kvarving
fdb2743ca9 changed: handle tuples in eclmpiserializer
thus we can remove support in MPIPacker
2022-09-13 15:54:37 +02:00
Arne Morten Kvarving
924ba450d2 fixed: remove_cvr_t should also remove volatile 2022-09-13 13:42:13 +02:00
Arne Morten Kvarving
f159eb524b changed: handle all vectors in eclmpiserializer
thus we can remove support in MPIPacker
2022-09-13 13:29:47 +02:00
Arne Morten Kvarving
6e83e349d6 changed: move variadic broadcast into EclMpiSerializer 2022-09-13 13:29:47 +02:00
Arne Morten Kvarving
9e6574115a EclMpiSerializer: add handler for vector<bool> 2022-09-13 13:29:47 +02:00
Arne Morten Kvarving
ebdfb0fc6a EclMpiSerializer: allow specifying root rank in broadcast/append 2022-09-13 13:29:47 +02:00
Arne Morten Kvarving
dfa870c313 changed: handle all sets in eclmpiserializer
thus we can remove support in MPIPacker
2022-09-13 12:39:07 +02:00
Arne Morten Kvarving
4cd9272a76 changed: handle all arrays in eclmpiserializer
thus we can remove support in MPIPacker
2022-09-13 12:08:39 +02:00
Arne Morten Kvarving
603e44068c changed: handle all maps in eclmpiserializer
thus we can remove support in MPIPacker
2022-09-13 11:32:37 +02:00
Arne Morten Kvarving
053dfc7ce5 eclmpiserializer: fix is_vector predicate
allow custom allocator
2022-09-13 10:49:54 +02:00
Bård Skaflestad
56c653235f
Merge pull request #4087 from akva2/rename_serialization
Rename serialization files
2022-09-13 10:48:33 +02:00
Paul Egberts
a8aa12f0a2 added evaporated water dependency of gas density in equil calculations 2022-09-12 16:02:35 +02:00
Arne Morten Kvarving
8e2b385f4d changed: put parts of ISTLSolverEbos in separate compile unit
in particular this means simulator objects are now not dependent
on FlexibleSolver.hpp and BdaBridge.hpp
2022-09-12 12:44:56 +02:00
Arne Morten Kvarving
58b0121e9b fixed: forward structs as struct 2022-09-09 08:37:59 +02:00
Arne Morten Kvarving
1838b39d2e changed: split ParallelRestart.hpp/cpp in two bits
the mpi serialization bit is put in MPISerializer.hpp/cpp,
while the parallel restart bit stays in ParallelRestart
2022-09-08 13:36:51 +02:00
Kai Bao
087eb56a64 changing max_strict_iter_ to min_strict_cnv_iter_
to make the naming reflect the actual usage more clearly.
2022-09-07 14:28:41 +02:00
Arne Morten Kvarving
e678146831 changed: use EclMpiSerializer in eclwriter 2022-09-06 15:36:58 +02:00
Arne Morten Kvarving
ee0d482b32 added: eclmpiserializer::append
this broadcasts from the root rank, and then appends
the results to existing data on the others
2022-09-06 15:36:30 +02:00
Arne Morten Kvarving
2d2f25b778 added: map predicate
use it to allow for serializing nested maps
2022-09-06 10:32:48 +02:00
Paul Egberts
1c70b5beea Equilibration with water-gas ratio vs depth (RVWVD) table 2022-09-05 09:59:16 +02:00
Bård Skaflestad
b3e517a8ef
Merge pull request #4055 from akva2/eclmpiserializer_map
eclmpiserializer: improve map handler
2022-09-02 21:01:47 +02:00
Arne Morten Kvarving
ade4cf978e eclmpiserializer: improve map handler
use has_serializeOp trait
2022-09-02 17:20:46 +02:00
Arne Morten Kvarving
2dd6433f16 eclmpiserializer: improve set handler
use has_serializeOp trait
2022-09-02 17:18:03 +02:00
Bård Skaflestad
a372a4d09e
Merge pull request #4052 from akva2/eclmpiserializer_vector
eclmpiserializer: improve vector handler
2022-09-02 17:10:10 +02:00
Bård Skaflestad
e3bc041909
Merge pull request #4051 from akva2/eclmpiserializer_array
eclmpiserializer: improve array handler
2022-09-02 17:09:41 +02:00
Arne Morten Kvarving
e2eac12593 eclmpiserializer: improve vector handler
use has_serializeOp trait
2022-09-02 14:36:42 +02:00
Bård Skaflestad
dff553db59
Merge pull request #4050 from akva2/eclmpiserializer_ptr
eclmpiserializer: improve ptr handler
2022-09-02 14:30:33 +02:00
Arne Morten Kvarving
3ed2a25470 eclmpiserializer: improve array handler
use has_serializeOp trait
2022-09-02 14:12:09 +02:00
Arne Morten Kvarving
9be60f2b3f eclmpiserializer: improve ptr handler
use has_serializeOp trait
2022-09-02 14:08:29 +02:00
Arne Morten Kvarving
a9eb6159ae eclmpiserializer: improve pair handling
use has_serializeOp trait
2022-09-02 13:54:39 +02:00
Bård Skaflestad
1a4313c73c Direct All Non-Triggered Action Messages to Debug File
End users typically do not care that a particular action did NOT
trigger at a particular time and these messages will typically
reduce the utility of the CASE.PRT file.  On important field cases
we've seen more than 100,000 such messages in a single run which is
quite overwhelming.

Since we're now directing the messages to the .DBG file instead
we're not taking away any diagnostic ability, merely altering the
location of the information.
2022-09-01 17:11:36 +02:00
Arne Morten Kvarving
8bd2af1517 added: generalize variant serialization handling 2022-09-01 13:24:17 +02:00
Arne Morten Kvarving
2c0ff6f81e consistently use ParallelCommunication.hpp for communication definition 2022-09-01 12:26:11 +02:00
Bård Skaflestad
5989604dfb Format Action Dates With Libfmt
Use libfmt's ability for format 'std::tm' objects to output
unambiguous dates.  While here, also apply 'const' to a number of
objects and scalar parameters.

Original output:
  The action ACT-01 evaluated to true at 2018/11/02  report:0.

New output:
  Action ACT-01 triggered at 02-Nov-2018 00:00:00 (report interval 0 to 1).
2022-08-26 11:04:55 +02:00
Arne Morten Kvarving
a9590215dc changed: consistently use std::array 2022-08-26 08:28:46 +02:00
Tor Harald Sandve
eb25ce1b99 clean-up comments and code 2022-08-18 08:27:38 +02:00
Tor Harald Sandve
262aead46c fix issue with summing over ghost cells twice 2022-08-17 10:27:39 +02:00
Tor Harald Sandve
ceac9e5ad8 disable drift compensation for cases without source terms 2022-08-17 10:21:25 +02:00
Tor Harald Sandve
1f54e90f33 Restrict drift compensation by CNV tolerance 2022-08-17 10:21:25 +02:00
Arne Morten Kvarving
6ed8a38ba5 changed: consistently use std::array 2022-08-16 08:38:54 +02:00
Arne Morten Kvarving
8cc0aa24de changed: switch to using libfmt 2022-08-15 13:48:19 +02:00
Arne Morten Kvarving
a3e46876fb minor cosmetics 2022-08-15 12:40:13 +02:00
Arne Morten Kvarving
99090ebf72 remove unused method
this was previously used by the ebos simulators
2022-08-15 12:40:13 +02:00
Arne Morten Kvarving
c405d718b1 changed: move action update handling to separate class
clearer interface boundaries plus it allows to build code only once
2022-08-15 12:40:13 +02:00
Atgeirr Flø Rasmussen
03352ff0fc Fix missing angle bracket. 2022-08-15 11:29:26 +02:00
Arne Morten Kvarving
4d5f6dde42 changed: move three more methods to generic problem class 2022-08-15 10:30:59 +02:00
Bård Skaflestad
27b695d0be Fix Averaged Quantities for Non-HC Simulations
Commit 6d3da3d2e introduced the notion of a "dynamic", pressure
dependent pore-volume and switched the 'PoreVolume' aggregates to
reference condition evaluation for output to the 'PORV' field in the
.PRT file.  We did however fail to update all existing uses of
'PoreVolume' which introduced an inconsistency.  In particular, for
simulation models without hydrocarbons-e.g., a single-phase water
run-the numerator of the volume weighted average would include
pressure effects through the rock compressibility but the
denominator would not.

Thanks to Edmund Stephens for discovering the issue and providing an
example model for analysing the underlying issue.
2022-08-11 16:07:00 +02:00
Arne Morten Kvarving
f57383f416 initstateequil: make it a private template 2022-08-11 15:34:55 +02:00
Arne Morten Kvarving
54cf35e821 equilibrationhelpers: make templates private 2022-08-11 15:34:55 +02:00
Arne Morten Kvarving
b399f72777 changed: avoid typetag dependence in equil initializer 2022-08-11 15:27:38 +02:00
Bård Skaflestad
624d7e51cd
Merge pull request #3977 from totto82/output_drsdtvon
output drsdtcon values to restart files
2022-08-11 14:51:12 +02:00
Bård Skaflestad
766543dd18
Merge pull request #3992 from akva2/ecl_modernization
Some small modernization changes in ecl classes
2022-08-10 13:26:25 +02:00
Arne Morten Kvarving
c69ee0d321 VtkEclTracerModule: some modernization
- typedef -> using
- use constexpr
2022-08-10 12:44:53 +02:00
Arne Morten Kvarving
8ce0f63ef6 FemCpGridCompat: some modernization
- typedef -> using
2022-08-10 12:44:53 +02:00
Arne Morten Kvarving
5e9610fdb9 EclThresholdPressure: some modernization
- typedef -> using
2022-08-10 12:44:53 +02:00
Arne Morten Kvarving
58b71c94af EclProblem: some modernization
- use if constexpr
2022-08-10 12:44:53 +02:00
Arne Morten Kvarving
17dc99f3cd EclPolyhedralGridVanguard: some modernization
- typedef -> using
2022-08-10 12:44:53 +02:00
Arne Morten Kvarving
c626dc7488 EclNewtonMethod: some modernization
- typedef -> using
- use constexpr
2022-08-10 12:44:53 +02:00
Arne Morten Kvarving
beaf8c20f4 EclGenericWriter: some modernization
- typedef -> using
2022-08-10 12:44:53 +02:00
Arne Morten Kvarving
834a54686c EclGenericTracerModel: some modernization
- use constexpr
2022-08-10 12:44:53 +02:00
Arne Morten Kvarving
f97f29fa3a EclFluxModule: some modernization
- typedef -> using
2022-08-10 12:44:53 +02:00
Arne Morten Kvarving
ef8c5962b3 EclEquilInitializer: some modernization
- use if constexpr
2022-08-10 12:44:53 +02:00
Arne Morten Kvarving
35fa52f0b9 EclDummyGradientCalculator: some modernization
- typedef -> using
2022-08-10 12:44:53 +02:00
Arne Morten Kvarving
07283aa780 EclCpGridVanguard: some modernization
- typedef -> using
- use constexpr
2022-08-10 12:44:53 +02:00
Arne Morten Kvarving
c2de02a04d EclAluGridVanguard: some modernization
- typedef -> using
- use constexpr
- use nullptr, not 0
- fix some indents
2022-08-10 12:44:53 +02:00
Arne Morten Kvarving
d0c528a240 collecttoiorank: use constexpr 2022-08-10 12:37:04 +02:00
Arne Morten Kvarving
7b74c75f7c eclalucartesianindexmapper: some modernization
- typedef -> using
- use constexpr
2022-08-10 12:37:04 +02:00
Atgeirr Flø Rasmussen
a5c8d40cfa Remove unneeded timeIdx arguments, also silence other warnings. 2022-08-10 10:01:54 +02:00
Atgeirr Flø Rasmussen
727bf8d01f Do not make changes to eclthresholdpressure.hh and ecltracermodel.hh.
Not required for first version, but should be added later.
2022-08-09 11:11:36 +02:00
Atgeirr Flø Rasmussen
5fba14373b Modification to reduce PR to minimal changes. 2022-08-09 11:11:36 +02:00
Atgeirr Flø Rasmussen
0da2b68e0b Adapt to changed interface. 2022-08-09 11:11:36 +02:00
Atgeirr Flø Rasmussen
55b637aedd Remove unneded class.
All functionality is now in EclFluxModule.
2022-08-09 11:11:36 +02:00
Atgeirr Flø Rasmussen
0bf508daf7 Refactor EclFluxModule.
This makes that class have the same methods as the EclFluxModuleTpfa, so
the latter can be removed.
2022-08-09 11:11:36 +02:00
Atgeirr Flø Rasmussen
d61e578194 Remove unneeded data member. 2022-08-09 11:11:36 +02:00
Atgeirr Flø Rasmussen
8c0a8eda2c Fix: Use correct gravity. 2022-08-09 11:11:36 +02:00
Atgeirr Flø Rasmussen
9603a1643e Continue refactoring flux module.
At current commit, see differences (added this commit).
2022-08-09 11:11:36 +02:00
Atgeirr Flø Rasmussen
fb0bc3d55a Continue cleanup of flux module. 2022-08-09 11:11:36 +02:00
Atgeirr Flø Rasmussen
fdce3e590d WIP, now runs with just this flux module replacing original versions. 2022-08-09 11:11:36 +02:00
Atgeirr Flø Rasmussen
c48770dc5f Remove EclProblemTpfa, folding all methods into EclProblem. 2022-08-09 11:11:36 +02:00
Atgeirr Flø Rasmussen
f19b6f723d Refactor to avoid twin codepaths most places. 2022-08-09 11:09:48 +02:00
hnil
6d3b0a7c1f tried to make openmp work 2022-08-09 11:09:48 +02:00
hnil
0c03e72782 fixing compilation warning 2022-08-09 11:09:48 +02:00
hnil
c5d547efff modification for global assembly 2022-08-09 11:09:48 +02:00
hnil
d9c59efcf1 moved transCompFactor to intensive quantities 2022-08-09 11:09:48 +02:00
hnil
07a7070dc0 revert eclproblem.hh back to original 2022-08-09 11:09:48 +02:00
hnil
409f60642e new eclproblemtpfa 2022-08-09 11:09:48 +02:00
hnil
8f5e0940fe restructuring to be able to call without local indices 2022-08-09 11:09:48 +02:00
hnil
060877a08b runs first steps of norne 2022-08-09 11:09:48 +02:00
hnil
0a178daaf1 added extra function for easier use in tracer,aquifer, threshold pressure 2022-08-09 11:09:48 +02:00
hnil
ad66808158 better test 2022-08-09 11:09:48 +02:00
hnil
18b03f3546 working refactoring 2022-08-09 11:09:48 +02:00
hnil
abee2f9f81 added fluxmodule refactured 2022-08-09 11:09:48 +02:00
Atgeirr Flø Rasmussen
93ce28e9a2
Merge pull request #3972 from ElyesAhmed/alugrid2
Alugrid2
2022-08-04 15:43:24 +02:00
Elyes Ahmed
15ab680aef fixing warning-unused variable 2022-08-04 14:19:12 +02:00
Elyes Ahmed
33e52542bc fix warning-unused variable in eclbasevanguard 2022-08-04 14:16:09 +02:00
Arne Morten Kvarving
36b167b451 remove use of Unused.hpp 2022-08-02 11:53:54 +02:00
Elyes Ahmed
5c2b60bcd0 rebasing 2022-07-28 20:40:34 +02:00
Arne Morten Kvarving
57066fbdf7 add missing include 2022-07-27 16:24:04 +02:00
Tor Harald Sandve
4fd0c24661 output drsdtcon values to restart files 2022-07-21 15:41:30 +02:00
goncalvesmachadoc
88d67684f6 fix wbp 2022-07-06 11:14:45 +02:00
Arne Morten Kvarving
32eb467ead fix tests that relied on internal deck handling 2022-06-24 15:27:56 +02:00
Arne Morten Kvarving
a4d254b749 changed: introduce EclGenericVanguard::setParams
this is used transferring ownership of setup structures to the
simulator. drop all the flowEbosXXX set deck methods and use the
generic vanguard. also means various structs that were only passed
in the blackoil simulator are now passed in all simulators.
2022-06-24 15:06:13 +02:00
Arne Morten Kvarving
36ffb65525 remove parsecontext in generic vanguard
not used
2022-06-24 15:06:13 +02:00
Arne Morten Kvarving
4087fbff5b remove errorguard in generic vanguard
not used
2022-06-24 15:06:13 +02:00
Arne Morten Kvarving
00c374be5c changed: remove support for internal summaryconfig handling in simulators 2022-06-24 15:06:13 +02:00
Arne Morten Kvarving
4510f40b6d changed: remove support for internal schedule handling in simulators 2022-06-24 15:06:13 +02:00
Arne Morten Kvarving
1a35c5ac47 changed: remove support for internal eclstate handling in simulators 2022-06-24 15:06:13 +02:00
Arne Morten Kvarving
371c8058bc changed: remove support for internal deck handling in simulators 2022-06-24 15:06:13 +02:00
Arne Morten Kvarving
c793aff5d1 changed: rename externalSetupTime
external is (or will be) implied
2022-06-24 15:06:13 +02:00
Atgeirr Flø Rasmussen
ffb09ee53e
Merge pull request #3937 from atgeirr/pressure-bhp-cpr
Pressure bhp cpr
2022-06-16 17:15:49 +02:00
Cintia Goncalves Machado
98d5450ca1
Fix FOE definition 2022-06-13 15:34:19 +02:00
hnil
98acda0977 - change FieldMatrix to MatrixBlock in Tracer model to not need extra initializations in linear solver 2022-06-08 17:03:27 +02:00
Atgeirr Flø Rasmussen
fef06a77af Updated for upstream changes. 2022-06-08 17:02:02 +02:00
Bård Skaflestad
e6dff88eb7 Temporarily Limit Block-Jacobi Partitioner to OpenCL Only
The block-Jacobi partitioner (commit e360c00b7) uses grid interfaces
that are only available in CpGrid and this blocks introducing other
grid managers such as ALUGrid.  Since the partitioner was only added
for OpenCL, guard special purposes accesses with HAVE_OPENCL.

This is a temporary measure and we will venture to restore the
partitioner later, although possibly restricted to CpGrid only.
2022-06-08 16:14:39 +02:00
Bård Skaflestad
7537d7ab95 Split Grid Distribution Out to Helper Functions
Mostly to reduce the number of nested scopes in doLoadBalance_() and
to make the data flow a little easier to track for human readers.
While here, also use down-casts to pointer instead of references.
Doing so replaces try/catch blocks with simpler if/else blocks.

Reimplement face transmissibility calculation/extraction loop in
terms of helper functions elements() and intersections().
2022-06-08 16:14:39 +02:00
Bård Skaflestad
4e5745bf4a Make cellPartition() Return Reference To Const
We don't need to copy this array on every call.
2022-06-08 16:11:54 +02:00
Atgeirr Flø Rasmussen
1aed863956 Re-add grid view argument to doLoadBalance_(). 2022-06-08 15:33:32 +02:00
Bård Skaflestad
af94be5023 Use Consistent Grid Views for Transmissibility Calculation
There was an implied assumption that the "gridv" parameter would
coincide with "grid_->leafGridView()".  Make this assumption
explicit.
2022-06-01 14:34:28 +02:00
Kai Bao
26a9582ece
Merge pull request #3911 from GitPaean/fixing_numerical_aquifer_equil
Fixing equilibration when having numerical aquifers.
2022-05-26 22:09:32 +02:00
Bård Skaflestad
be4221ea92
Merge pull request #3869 from plgbrts/vapoilwat
adding three-phase simulator including water evaporation and salt precipitation
2022-05-25 15:33:53 +02:00
Bård Skaflestad
9f22e125f9 Extract Block-Level Component-in-Place Summary Values
This commit calculates the various BxIP* summary output values such
as BOIP (block-level oil-in-place) and BGIPL (block-level
gas-in-place in liquid phase).  While here, also extract the
block-level dissolved gas-oil-ratio (BRS) and vaporised
oil-gas-ratio (BRV).
2022-05-20 23:13:27 +02:00
Markus Blatt
02aaec82f7
Merge pull request #3815 from Tongdongq/subdomain-matrix-for-opencl
Subdomain matrix for opencl ILU preconditioner
2022-05-20 16:05:14 +02:00
Paul Egberts
a255613452
Merge branch 'master' into vapoilwat 2022-05-11 11:55:54 +02:00