Commit Graph

15725 Commits

Author SHA1 Message Date
steink
c997b438dd assembleWellEq 2023-03-20 13:15:59 +01:00
Bård Skaflestad
af30df5dff
Merge pull request #4532 from hnil/refactor_initiations
Refactoring to be able to use template class/methods even if they are…
2023-03-17 13:45:48 +01:00
Markus Blatt
3b164b041f
Merge pull request #4530 from bska/output-code-tidying
Adjust Whitespace in Output Module
2023-03-16 17:10:32 +01:00
Bård Skaflestad
8dfac0d8e6
Merge pull request #4524 from goncalvesmachadoc/temp
allow for TEMP
2023-03-16 16:37:09 +01:00
Bård Skaflestad
6ffc8b96a9 Adjust Whitespace in Output Module
Mostly to split long lines and to add a few blank lines for
readability.  While here, also apply 'const' in a few locations and
flip the order of a conditional to (potentially) save a bit of work.

This is in preparation of revising the output destination categories
of numerous 3D result vectors.
2023-03-16 15:50:03 +01:00
Bård Skaflestad
8d756a6add
Merge pull request #4529 from totto82/xmfco2
add molar fraction of CO2 in brine to RST output
2023-03-16 14:37:57 +01:00
Bård Skaflestad
7113159163
Merge pull request #4535 from totto82/fix_co2_output
convert co2 output from volumes to moles
2023-03-16 14:37:06 +01:00
Tor Harald Sandve
3fd710668f convert co2 output from volumes to moles 2023-03-16 09:21:12 +01:00
Tor Harald Sandve
ba906fc286 add molar fraction of co2 in brine to RST output 2023-03-16 08:52:52 +01:00
Markus Blatt
5c1d964478
Merge pull request #4512 from akva2/rateconverter_compile_unit
RateConverter: introduce a compile unit
2023-03-15 20:54:26 +01:00
hnil
3e1fe57e60 Refactoring to be able to use template class/methods even if they are not initiated 2023-03-15 16:46:42 +01:00
Bård Skaflestad
10a22c1da9
Merge pull request #4527 from bska/use-ctor-calls
Switch to Using Constructor Syntax for CellData
2023-03-15 12:41:41 +01:00
Bård Skaflestad
601301355a Switch to Using Constructor Syntax for CellData
This is in preparation of adding actual constructors to the type.
2023-03-15 11:33:13 +01:00
goncalvesmachadoc
3eb684ae7d allow for TEMP 2023-03-13 14:18:48 +01:00
Bård Skaflestad
56ea715cf3
Merge pull request #4523 from daavid00/fixClangbuild
fix to broken built with clang
2023-03-10 23:30:09 +01:00
David Landa Marban
a19e70c59a fix to broken built with clang 2023-03-10 22:39:39 +01:00
Bård Skaflestad
1ac190e4a0
Merge pull request #4518 from atgeirr/fix-zero-rate-control-eq
Treat rate control with zero target same as stopped well.
2023-03-10 16:12:08 +01:00
Bård Skaflestad
6e8b8b2f6c
Merge pull request #4522 from blattms/removed-use-uninit-warnings
[cleanup] Fix that phaseUsage might be used uninitialzed in test.
2023-03-10 15:06:01 +01:00
Markus Blatt
9cabbede2c [cleanup] Fix that phaseUsage might be used uninitialzed in test.
We need to make sure that all pods are initialzed when using
the default constructor. Fixes
```
RateConverter.hpp:83:50: warning: ‘phaseUsage’ may be used uninitialized in this function [-Wmaybe-uninitialized]
   83 |                 , attr_      (rmap_, Attributes())
      |                                                  ^
```
2023-03-10 14:06:46 +01:00
Bård Skaflestad
10f7de1ee4
Merge pull request #4521 from bska/fix-unused-parameter
Tag Unused Parameter as Maybe_Unused
2023-03-10 12:51:12 +01:00
Bård Skaflestad
f25d204281 Tag Unused Parameter as Maybe_Unused
Noted by [at]akva2
2023-03-10 11:36:11 +01:00
Kai Bao
1bbec4e4fb
Merge pull request #4519 from bska/unify-analytic-aquifer-construction
Refactor Construction of Analytic Aquifer Objects
2023-03-10 11:22:50 +01:00
Bård Skaflestad
7abfdc52e0 Refactor Construction of Analytic Aquifer Objects
In particular, split the 'static' aquifer object initialisation
of member function 'init()' into a new helper function

  initializeStaticAquifers()

This is in preparation of adding a similar function to handle
dynamic aquifer object initialisation from a restart file.  To that
end, also add a new member function

  createDynamicAquifers(episode_index)

containing the current implementation of beginEpisode().  Creating
the dynamic objects from a restart file then amounts to calling this
function with a different 'episode_index'.  As another aid to
maintainability, add a new templated member function

  createAnalyticAquiferPointer()

which forms 'unique_ptr<AquiferInterface>' objects for every known
type of analytic aquifer.  This, in turn, requires reordering the
parameters of the AquiferConstantFlux constructor to match those of
the existing Fetkovich and Carter-Tracy types.

Finally, split the calculation of the constant flux aquifer's total
flux rate out to a new helper function

  AquiferConstantFlux::totalFluxRate()
2023-03-09 18:04:55 +01:00
Markus Blatt
af9e446454
Merge pull request #4517 from akva2/fix_parallel_hdf5
fixed: wrong order of OpmInit and use of the USE_MPI option
2023-03-08 17:39:13 +01:00
Arne Morten Kvarving
3967eb001b RateConverter: prefer using 2023-03-08 15:40:18 +01:00
Arne Morten Kvarving
173e3900d4 RateConverter: move inferDissolvedVaporisedRatio to compile unit 2023-03-08 15:40:18 +01:00
Arne Morten Kvarving
8c233ffba2 RateConverter: move calcReservoirVoidageRates to compile unit 2023-03-08 15:40:18 +01:00
Arne Morten Kvarving
ae9ed506e8 RateConverter: move calcCoeff to compile unit 2023-03-08 15:40:18 +01:00
Arne Morten Kvarving
11602bbdda RateConverter: move calcInjCoeff to compile unit 2023-03-08 15:40:18 +01:00
Arne Morten Kvarving
7672e14890 RateConvert: introduce compile unit
move global rate reductions into it
2023-03-08 15:40:15 +01:00
Atgeirr Flø Rasmussen
6d07c490c3
Merge pull request #4514 from akva2/rateconverter_coalesce_reductions
RateConverter: coalesce global reductions
2023-03-08 15:38:01 +01:00
Atgeirr Flø Rasmussen
60cdbb8cfd Treat rate control with zero target same as stopped well. 2023-03-08 15:32:55 +01:00
Atgeirr Flø Rasmussen
a55f06bd32
Merge pull request #4516 from atgeirr/add-instantiation
Add explicit instantiation of cellZMinMax().
2023-03-08 13:52:55 +01:00
Arne Morten Kvarving
917af4e28e RateConverter: coalesce global reductions 2023-03-08 12:55:04 +01:00
Arne Morten Kvarving
1ac2263bfb fixed: wrong order of OpmInit and use of the USE_MPI option 2023-03-08 12:38:22 +01:00
Atgeirr Flø Rasmussen
5979e34b9d Add explicit instantiation of cellZMinMax().
Otherwise one may have link problems on clang systems, the
reason for this is not quite clear.
2023-03-08 11:21:21 +01:00
Atgeirr Flø Rasmussen
fc06fc77c3
Merge pull request #4500 from GitPaean/unifying_interface_assemble_noiteration
make sure computeWellRatesWithBhpIterations honor bhp limit (can change) for StandardWell
2023-03-07 21:02:44 +01:00
Bård Skaflestad
76204b99ce
Merge pull request #4515 from akva2/fix_ndebug_warning
GasLiftSingleWell: avoid unused variable warning with NDEBUG
2023-03-07 14:17:51 +01:00
Arne Morten Kvarving
7a90bd48b8 GasLiftSingleWell: avoid unused variable warning with NDEBUG 2023-03-07 11:22:01 +01:00
Bård Skaflestad
84a3be856a
Merge pull request #4513 from akva2/remove_material_in_data_update
fixed: remove opm-material from data update script
2023-03-06 13:51:28 +01:00
Bård Skaflestad
ecf35c055b
Merge pull request #4511 from akva2/fix_rateconverter_exception
RateConverter: throw an exception, not a bare string
2023-03-06 13:51:00 +01:00
Arne Morten Kvarving
aeee2ad9d3 RateConverter: throw an exception, not a bare string 2023-03-06 13:08:33 +01:00
Arne Morten Kvarving
bd767923b3 fixed: remove opm-material from data update script 2023-03-06 12:02:09 +01:00
Atgeirr Flø Rasmussen
fb076a7acc
Merge pull request #4508 from akva2/simulatorreport_avoid_nan
SimulatorReport: protect against division by zero
2023-03-03 11:55:42 +01:00
Atgeirr Flø Rasmussen
662ecee937
Merge pull request #4505 from akva2/thresholdpressure_prt
added: log ThresholdPressures to PRT file
2023-03-03 11:55:31 +01:00
Bård Skaflestad
f0e2014026
Merge pull request #4506 from atgeirr/silence-warnings
Silence warnings: struct/class, missing override.
2023-03-03 11:01:47 +01:00
Arne Morten Kvarving
0cb69ffaa8 SimulatorReport: protect against division by zero 2023-03-03 10:39:57 +01:00
Arne Morten Kvarving
11bda0de07 added: log ThresholdPressures to PRT file 2023-03-03 10:15:38 +01:00
Atgeirr Flø Rasmussen
c9ba0afea3 Silence warnings: struct/class, missing override. 2023-03-03 10:12:46 +01:00
Kai Bao
2152ac6465 make sure computeWellRatesWithBhpIterations honor bhp limit
for StandardWell
2023-03-02 23:53:56 +01:00