Commit Graph
15705 Commits
Author SHA1 Message Date
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
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
Atgeirr Flø Rasmussen e2ce26c031 Merge pull request #4503 from akva2/fix_thpr_parallel
fixed: output of thresholdpressure to restart file in parallel
2023-03-02 15:47:01 +01:00
Bård Skaflestad dcf2a1304b Merge pull request #4499 from akva2/adaptivetimesteppingebos_more_compile_unit
AdaptiveTimeSteppingEbos: move more code to compile unit
2023-03-02 13:38:07 +01:00
Arne Morten Kvarving 153c4f486a fixed: output of thresholdpressure to restart file in parallel 2023-03-02 13:08:37 +01:00
Arne Morten Kvarving c4e025190e AdaptiveTimeSteppingEbos: put consistentlyFailingWells in detail namespace
no reason for this to be a template
2023-03-02 12:37:13 +01:00
Arne Morten Kvarving b232613623 AdaptiveTimeSteppingEbos: put logTimer in detail namespace 2023-03-02 12:37:13 +01:00
Arne Morten Kvarving ebd53ee72d move StepReport into ConvergenceReport.hpp
there is no reason for this to be typetag dependent
2023-03-02 12:37:13 +01:00
Bård Skaflestad 468494e801 Merge pull request #4501 from hnil/fixes_ebosinterface
- small change to corret ebos use of the original interfaces
2023-03-02 10:38:06 +01:00
Bård Skaflestad 2c36934894 Merge pull request #4502 from hnil/wrong_timingblock
- fixed wrong timing block
2023-03-02 09:59:28 +01:00
hnil e2df9fa4f9 - fixed wrong timing block 2023-03-02 09:20:07 +01:00
Bård Skaflestad 00da723b59 Merge pull request #4497 from akva2/nonlinearsolverebos_compile_unit
NonlinearsolverEbos: add compile unit
2023-03-01 16:14:22 +01:00
Bård Skaflestad 8c038fd36c Merge pull request #4498 from akva2/split_timing_macros
adjust to timing macro header split
2023-03-01 15:52:29 +01:00
Arne Morten Kvarving aaaf00f2fd adjust to timing macro header split 2023-03-01 13:18:16 +01:00
Bård Skaflestad 44b23af154 Merge pull request #4496 from akva2/pass_version_info_as_params
changed: pass the version info as parameters in Banners.cpp/Main.cpp
2023-03-01 10:53:59 +01:00
Arne Morten Kvarving cbaaca4f14 NonlinearSolverEbos: put stabilizeNonlinearUpdate in compile unit 2023-03-01 10:48:17 +01:00
Arne Morten Kvarving 4aeb980f4f changed: make NonlinearSolverEbos::RelaxType a namespace scoped enum class
name it NonlinearRelaxType
2023-03-01 10:46:51 +01:00
Arne Morten Kvarving 64c4694bab NonlinearSolverEbos: put detectOscillations in compile unit 2023-03-01 10:46:51 +01:00
Arne Morten Kvarving c92195c96a changed: pass the version info as parameters in Banners.cpp/Main.cpp
we want to avoid these symbols in the library
2023-03-01 09:11:18 +01:00
hnil 5fb41ad231 - small change to corret ebos use of the original interfaces 2023-02-28 21:59:04 +01:00
Bård Skaflestad 6636b2f331 Merge pull request #4494 from akva2/flowmainebos_compile_unit
FlowMainEbos: add a compile unit
2023-02-28 20:13:30 +01:00
Arne Morten Kvarving b238bba53b FlowMainEbos: move ExtraConvergenceOutput code to compile unit 2023-02-28 16:02:08 +01:00