Commit Graph

15749 Commits

Author SHA1 Message Date
hnil
aa40d2f0f3 -- prepared for possibliy of not using cached intentensive quantities 2023-03-24 19:57:31 +01:00
Bård Skaflestad
0fb5093807
Merge pull request #4537 from totto82/vapwat_gaswater
add vapwat to gaswater simulators and output mol fractions YMFWAT
2023-03-24 15:15:59 +01:00
Bård Skaflestad
3ea6f714db
Merge pull request #4544 from hnil/faster_beginstep
faster begintimestep
2023-03-24 13:52:25 +01:00
hnil
398077d772 removed unused variable 2023-03-24 13:11:18 +01:00
Bård Skaflestad
234650982f
Merge pull request #4547 from GitPaean/fixing_type_regularization_factor_wells_
using double for regularization_factor_wells_
2023-03-24 13:09:56 +01:00
Bård Skaflestad
d4d46e046b
Merge pull request #4545 from hnil/faster_fip
Faster fip calculation
2023-03-24 13:08:31 +01:00
Bård Skaflestad
d0f8d879df
Merge pull request #4540 from totto82/fpr_co2store
output average pressure in all cells unconditionally with co2store
2023-03-24 13:06:13 +01:00
Tor Harald Sandve
e14f8637f1 output average pressure in all cells unconditionaly for for the co2store option 2023-03-24 12:09:50 +01:00
hnil
7e63dc3096 fixed issue with use of cachedVariables in initialization fase 2023-03-23 22:37:44 +01:00
hnil
bacb4e04d6 fixed for review 2023-03-23 21:26:06 +01:00
Kai Bao
c8d914caad using double for regularization_factor_wells_ 2023-03-23 16:47:03 +01:00
hnil
a81f80f4fb fixed error 2023-03-23 13:53:14 +01:00
hnil
9450fc0596 -- removed element context from the update fib loop
-- separated out put in different functions
2023-03-23 13:44:46 +01:00
hnil
8250a815cc - faster updateProperty
- refactored for making local updating in inhereted classes
2023-03-23 10:12:02 +01:00
Bård Skaflestad
0ebcef62e2
Merge pull request #4542 from hnil/optimize_processdata
Optimisation of data processing for actionX and output
2023-03-22 23:13:43 +01:00
hnil
dedda84a2b fixed review comments 2023-03-22 19:17:22 +01:00
hnil
e1c4a73c43 -- removed double evaluation of processLocalData
-- separated fluid in place work from other cell based data
-- added some timing macros for better preformance overview
2023-03-22 11:55:37 +01:00
Bård Skaflestad
0a9d2a7099
Merge pull request #4543 from hnil/more-timings
added more timing macros
2023-03-22 10:51:28 +01:00
hnil
122a478341 added more timing macros 2023-03-21 22:44:14 +01:00
Tor Harald Sandve
369a27e80d use correct molarmass when converting XMFCO2 2023-03-21 10:45:09 +01:00
Tor Harald Sandve
b8032c12bb add vapwat to gaswater simulators and output molfractions YMFWAT 2023-03-21 10:34:54 +01:00
Atgeirr Flø Rasmussen
e25657943e
Merge pull request #4534 from akva2/disable_hdf5_compression_old_versions
changed: disable HDF5 compression with hdf5 <= 1.8
2023-03-21 09:49:19 +01:00
Kai Bao
e4cd8e4b44
Merge pull request #4538 from steink/fix_well_assembly
Fix bug in multisegment well assembly
2023-03-20 16:12:48 +01:00
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
Arne Morten Kvarving
52008d5231 changed: disable HDF5 compression with hdf5 <= 1.8
seems to be broken (in particular 1.8.12 on rh7)
2023-03-16 08:54:39 +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