Commit Graph

20503 Commits

Author SHA1 Message Date
Bård Skaflestad
3de20b46b6 Add Saturation Function Consistency Checks for SCALECRS
This commit introduces consistency checks for the scaled displacing
saturation in the three point horizontal scaling method
(SCALECRS=YES).  These plug into the framework introduced in commit
c3939c544 (PR #5438).  We implement the following two checks

  - SGCR < 1-SOGCR-SWL < SGU
  - SWCR < 1-SOWCR-SGL < SWU

which collectively guarantee a mobile displacing oil saturation in
the two phase gas/oil and oil/water systems.
2024-09-05 10:36:43 +02:00
Bård Skaflestad
9a0e39c1ad
Merge pull request #5578 from akva2/parametersystem_tu
ParameterSystem: add translation unit
2024-09-05 10:34:51 +02:00
Arne Morten Kvarving
462926a356 ParameterSystem: cosmetics 2024-09-05 10:08:29 +02:00
Arne Morten Kvarving
5b40229211 ParameterSystem: replace loop with standard algorithms 2024-09-05 10:08:09 +02:00
Arne Morten Kvarving
95ab000612 ParameterSystem: replace if nest with switch 2024-09-05 10:08:09 +02:00
Arne Morten Kvarving
4cc187d2d8 ParameterSystem: replace std::list with std::vector 2024-09-05 10:08:09 +02:00
Arne Morten Kvarving
36142f588c ParameterSystem: cleanup includes 2024-09-05 10:08:09 +02:00
Arne Morten Kvarving
218988c85e Parameters::printUnused: drop default parameter for stream 2024-09-05 10:08:09 +02:00
Arne Morten Kvarving
4967323c29 Parameters::printValues: drop default parameter for stream 2024-09-05 10:08:09 +02:00
Arne Morten Kvarving
ed0c480a19 Parameters::printUsage: drop default parameter for stream 2024-09-05 10:08:08 +02:00
Arne Morten Kvarving
4507501622 ParameterSystem: the entire backend store can now be an implementation detail 2024-09-05 10:07:40 +02:00
Arne Morten Kvarving
3161b4f547 ParameterSystem: add function to query if registration is open 2024-09-05 10:07:40 +02:00
Arne Morten Kvarving
0cda471821 remove Parameters::noPositionalParameters_
only used in a test
2024-09-05 10:07:40 +02:00
Arne Morten Kvarving
672de7665d Parameters::printParamList can now be an implementation detail 2024-09-05 10:07:40 +02:00
Arne Morten Kvarving
faa963056d Parameters::printParamUsage can now be an implementation detail 2024-09-05 10:07:40 +02:00
Arne Morten Kvarving
77dc5ad895 Parameters::getFlattenedKeyList can now be an implementation detail 2024-09-05 10:07:40 +02:00
Arne Morten Kvarving
410039206d add Parameters::Parameter struct
this holds a key-value pair for a parameter with some utility functions
for comparison and printing.

use this to move Parameters::getLists to the translation unit
2024-09-05 10:07:40 +02:00
Arne Morten Kvarving
ae8dd62fe3 Parameters::Get split out parts of implementation
allows putting it in translation unit
2024-09-05 10:07:40 +02:00
Arne Morten Kvarving
cfad87b41f ParameterSystem: remove ParamFinalizer
this adds no extra validation and complicates refactoring
2024-09-05 10:07:40 +02:00
Arne Morten Kvarving
65158cd3fb Parameters::SetDefault split out parts of implementation
allows putting it in translation unit
2024-09-05 10:07:40 +02:00
Arne Morten Kvarving
741e97da61 Parameters::IsSet split out parts of implementation
allows putting it in translation unit
2024-09-05 10:07:40 +02:00
Arne Morten Kvarving
98b33d582f Parameters::Register split out parts of implementation
allows putting it in translation unit
2024-09-05 10:07:40 +02:00
Arne Morten Kvarving
48bcf6ac04 Parameters::Hide split out main implementation
allows putting it in translation unit
2024-09-05 10:07:40 +02:00
Arne Morten Kvarving
7584f588a7 parametersystem: parseKey/transformKey can now be implementation details 2024-09-05 10:07:40 +02:00
Arne Morten Kvarving
427b619ca5 parametersystem: use a std::function instead of template parameter for callback
allows putting implementation in translation unit and this is hardly
performance critical
2024-09-05 10:07:40 +02:00
Arne Morten Kvarving
bc83bb6e1c parametersystem: introduce translation unit 2024-09-05 10:07:40 +02:00
Arne Morten Kvarving
05f01bf819 parametersystem.hh: rename to .hpp 2024-09-05 10:07:40 +02:00
Arne Morten Kvarving
2bdab9e518 parametersystem: pass add callback for adding keys to positional parameter handler
this way the backing store for the parameters can be an implementation
detail of the parameter system
2024-09-05 10:07:40 +02:00
Bård Skaflestad
be94b037bc
Merge pull request #5579 from bska/dont-count-cells-if-not-needed
Don't Count Cells Unless Needed
2024-09-05 10:04:41 +02:00
Bård Skaflestad
329ad50e59 Don't Count Cells Unless Needed
If the user chooses a specific number of NLDD domains, there is no
need to compute the default number of domains based on a specific
target number of cells per domain.  Defer the, potentially costly,
calculation to when we know we need it.

While here, also split/rejoin a couple of long lines.
2024-09-05 09:45:16 +02:00
Bård Skaflestad
415d1a1173
Merge pull request #5572 from bska/wphase-sfunc-consistency-checks-impl
Add Water Phase Saturation Function Consistency Checks
2024-09-04 15:02:00 +02:00
Bård Skaflestad
be64ef3ef6 Add Water Phase Saturation Function Consistency Checks
This commit introduces a set of consistency checks for the water
phase saturation functions.  These plug into the framework
introduced in commit c3939c544 (PR #5438).  We implement the
following three checks

  - 0 <= SWL < 1
  - 0 < SWU <= 1
  - SWL <= SWCR < SWU

which collectively enable a non-negative oil saturation in the two
phase oil/water system.
2024-09-04 13:47:33 +02:00
Arne Morten Kvarving
f4801ec787
Merge pull request #5576 from akva2/fix_build_no_float_no_mpi
Fix build without float simulators
2024-09-04 13:45:42 +02:00
Bård Skaflestad
d69d929d37
Merge pull request #5571 from bska/gphase-sfunc-consistency-checks-impl
Add Gas Phase Saturation Function Consistency Checks
2024-09-04 13:02:25 +02:00
Arne Morten Kvarving
d36fefd428 fixed: build without MPI 2024-09-04 12:51:05 +02:00
Arne Morten Kvarving
c4871367e8 fixed: building without float simulators
pointy hat is all mine
2024-09-04 12:51:05 +02:00
Bård Skaflestad
da1e7b1114
Merge pull request #5575 from akva2/parallel_tu
Add some more translation units for code from opm-models
2024-09-04 12:46:05 +02:00
Arne Morten Kvarving
f838cb6ecf timer: introduce translation unit 2024-09-04 12:06:52 +02:00
Arne Morten Kvarving
b3e08b4f2f timer.hh: rename to timer.hpp 2024-09-04 12:06:35 +02:00
Arne Morten Kvarving
13b575eae9 tasklets: introduce translation unit 2024-09-04 12:06:21 +02:00
Arne Morten Kvarving
d35d80427e tasklets.hh: rename to tasklets.hpp 2024-09-04 12:06:21 +02:00
Arne Morten Kvarving
27f9277c47 mpiutil: add translation unit 2024-09-04 12:06:21 +02:00
Arne Morten Kvarving
fcd0168691 mpiutil.hh: rename to mpiutil.hpp 2024-09-04 12:06:21 +02:00
Arne Morten Kvarving
e7a9c4cd21 threadmanager: remove unused typetag template parameter
and move implementation to a translation unit
2024-09-04 12:06:21 +02:00
Bård Skaflestad
9c246faefa Add Gas Phase Saturation Function Consistency Checks
This commit introduces a set of consistency checks for the gas phase
saturation functions.  These plug into the framework introduced in
commit c3939c544 (PR #5438).  We implement the following three checks

  - 0 <= SGL < 1
  - 0 <= SGU < 1
  - SGL <= SGCR < SGU

which collectively enable a non-negative oil saturation in the two
phase gas/oil system.
2024-09-04 11:34:39 +02:00
Arne Morten Kvarving
3ee5eddf48 threadmanager.hh: rename to threadmanager.hpp 2024-09-04 11:32:21 +02:00
Bård Skaflestad
44d22a05ba
Merge pull request #5574 from akva2/blackoilparams_tu
BlackoilXXParams: introduce translation units
2024-09-04 11:31:19 +02:00
Arne Morten Kvarving
55a0a6da54 blackoilsolventparams: introduce translation unit
move code for loading parameters from eclipse state into it
2024-09-04 11:17:40 +02:00
Arne Morten Kvarving
6ceeb3098e blackoilsolventparams.hh: rename to blackoilsolventparams.hpp 2024-09-04 11:17:40 +02:00
Arne Morten Kvarving
3aed1aa7f9 blackoilpolymerparams: introduce translation unit
move code for loading parameters from eclipse state into it
2024-09-04 11:17:40 +02:00