OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-09-05 04:40:19 -05:00
Code Issues Packages Projects Releases Wiki Activity
15,764 Commits 31 Branches 117 Tags
82fc5a6b4683a4c284b3fdd3322bc19e23e614e9
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Bård Skaflestad 82fc5a6b46 Merge pull request #4560 from hnil/flexible_iq_in_aq 
- changed pointer to refernace for IQ for possibility of using rvalues
 2023-03-28 11:27:45 +02:00
Bård Skaflestad 88e5b235b8 Merge pull request #4531 from GitPaean/trying_to_gurantee_zero_rate 
making sure zero rate controlled production wells have zero rate in the simulation results
 2023-03-27 20:34:24 +02:00
Bård Skaflestad 599742feab Remove Unused Variables 
While here, also include requisite headers.
 2023-03-27 10:46:05 +02:00
Bård Skaflestad 8858d725a8 Merge pull request #4551 from totto82/outputGIPL 
output gas in water to F(R)GIPL for gas-water systems
 2023-03-27 09:58:45 +02:00
Bård Skaflestad bc44d1f3f0 Merge pull request #4552 from hnil/avoid_depensesy_of_cache 
Avoid cache
 2023-03-27 09:57:33 +02:00
Bård Skaflestad 86cfa6dc3c Merge pull request #4550 from akva2/janitoring 
Some janitoring
 2023-03-24 15:48:15 +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
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
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
Bård Skaflestad 0a9d2a7099 Merge pull request #4543 from hnil/more-timings 
added more timing macros
 2023-03-22 10:51:28 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Bård Skaflestad b4d7ef85a0 Merge pull request #4493 from akva2/fix_serial_build_hdf5 
fixed: add missing HAVE_MPI ifs
 2023-02-28 10:47:47 +01:00
Bård Skaflestad cb96be1634 Merge pull request #4477 from totto82/summary_co2store 
WIP add WCD, GCDI, GCDM, WIPG, WIPL summary for F and R
 2023-02-24 22:28:47 +01:00
Bård Skaflestad ff2fd22fa0 Merge pull request #4485 from totto82/gsf_wsf 
GSF WSF diagnostics
 2023-02-24 17:17:50 +01:00
Bård Skaflestad 4e8381b6f9 Merge pull request #4370 from totto82/computeCVIR 
compute CVIR and CVPR
 2023-02-22 17:38:33 +01:00
Bård Skaflestad d364b7b80c Merge pull request #4479 from akva2/serialization_missing_perfdata 
RestartSerialization: add missing PerfData
 2023-02-22 15:53:42 +01:00
Bård Skaflestad cd7e0e08d4 Merge pull request #4480 from akva2/aquiferconstantflux_serialize 
AquiferConstantFlux: add restart serialization support
 2023-02-22 15:47:07 +01:00
Bård Skaflestad 923f4fc8df Merge pull request #4429 from GitPaean/support_aquflux 
supporting AQUFLUX from simulator side
 2023-02-21 16:12:53 +01:00
Bård Skaflestad 49cca2ea62 Merge pull request #4470 from bska/enable-pinch-nopinch-regression 
Add Regression Test for NOPINCH Feature
 2023-02-19 16:14:02 +01:00
Bård Skaflestad 85a2703e88 Add Regression Test for NOPINCH Feature 
Thanks a lot to [at]tskille for providing a test case.
 2023-02-19 15:05:53 +01:00
Bård Skaflestad f1114f14b4 Merge pull request #4469 from bska/enable-jfunc-testing 
Add Regression Test for JFUNC Feature
 2023-02-19 13:13:43 +01:00
Bård Skaflestad b73440d794 Add Regression Test for JFUNC Feature 
There are no such tests in the test suite and we've already had one
instance of the feature breaking during code refactoring.

Thanks to [at]tskille for providing the test case.
 2023-02-17 17:46:44 +01:00
Bård Skaflestad 37959ee26a Merge pull request #4468 from vkip/fix_connpress_report 
Fixing MSW connection pressure output
 2023-02-17 17:44:39 +01:00
Bård Skaflestad 981299c2e0 Merge pull request #4461 from totto82/injalq 
Fix default alq injector
 2023-02-17 11:58:03 +01:00
Bård Skaflestad 98b3d40a17 Merge pull request #4467 from bska/fix-seq-build 
Fix Sequential Build
 2023-02-16 17:54:20 +01:00
Bård Skaflestad e861d72f78 Use Uniform Initialization 
Avoids "most vexing parse" for non-MPI builds.
 2023-02-16 17:32:04 +01:00
Bård Skaflestad 1369889074 Fix Sequential Build 
Include <cassert> for 'assert' macro.
 2023-02-16 16:36:53 +01:00
Bård Skaflestad 34f09fbf5e Merge pull request #4452 from akva2/serialization_add_parallel 
RestartSerialization: add parallel support
 2023-02-16 15:36:55 +01:00
Bård Skaflestad 0255bcebb1 Merge pull request #4451 from akva2/add_serialization_restart_support 
Add serialization restart support
 2023-02-16 14:49:20 +01:00
Bård Skaflestad c3da4f2341 Merge pull request #4450 from akva2/simulatorreport_serialize 
SimulatorReport: add serialization support
 2023-02-16 12:36:00 +01:00
Bård Skaflestad 12b0e1c2de Merge pull request #4447 from akva2/eclproblem_serialize 
EclProblem: add serialization support
 2023-02-16 11:56:16 +01:00
Bård Skaflestad b5f186c6a8 Merge pull request #4446 from akva2/blackoilwellmodel_serialize 
BlackOilWellModel: add serialization support
 2023-02-16 11:55:56 +01:00
Bård Skaflestad 19131fdaa3 Merge pull request #4445 from akva2/wgstate_serialize 
WGState: add serialization support
 2023-02-16 11:18:16 +01:00
Bård Skaflestad f526e1a6ca Merge pull request #4441 from akva2/alqstate_serialize 
ALQState: add serialization support
 2023-02-16 09:42:44 +01:00
Bård Skaflestad 498ca650d5 Merge pull request #4440 from akva2/groupstate_serialize 
GroupState: add serialization support
 2023-02-15 23:33:50 +01:00
Bård Skaflestad 3be62f4bb6 Merge pull request #4460 from totto82/fixVREP 
FIX VREF for groups with both gas and water injectors
 2023-02-15 14:34:52 +01:00
Bård Skaflestad 70152b67ff Merge pull request #4436 from akva2/segmentstate_serialize 
SegmentState: add serialization support
 2023-02-15 13:37:51 +01:00
Bård Skaflestad 3dc13c234c Merge pull request #4433 from akva2/ecltracermodel_serialize 
EclTracerModel: add serialization of dynamic state
 2023-02-14 20:34:08 +01:00
Bård Skaflestad 273477ef2c Merge pull request #4458 from atgeirr/fix-warnings 
Fix a few warnings in recently added code.
 2023-02-14 16:43:22 +01:00
Bård Skaflestad 37941cce1a Merge pull request #4425 from akva2/eclgenericproblem_serialize 
EclGenericProblem: add serialization support
 2023-02-14 16:13:22 +01:00
Bård Skaflestad d86956d6d7 Merge pull request #4422 from akva2/blockvectorwrapper_serialize 
BlockVectorWrapper: add serialization test
 2023-02-14 15:22:02 +01:00
Bård Skaflestad ce51f3378a Merge pull request #4421 from akva2/blackoilprimaryvariables_serialize 
BlackoilPrimaryVariables: add serialization support
 2023-02-14 14:44:27 +01:00
Bård Skaflestad 4ebf5b261e Merge pull request #4420 from akva2/eclgenericvanguard_serialize 
EclGenericVanguard: add serialization for dynamic state
 2023-02-14 14:21:10 +01:00
Bård Skaflestad afba3f948c Merge pull request #4417 from akva2/adaptivetimesteppingebos_serialize 
AdaptiveTimeSteppingEbos: add serialization support
 2023-02-14 11:22:18 +01:00
Bård Skaflestad e89b28c9a2 Merge pull request #4419 from akva2/eclgenericvanguard_setup_params 
changed: introduce EclGenericVanguard::SetupParams
 2023-02-13 21:12:01 +01:00
Bård Skaflestad 2c702aee78 Merge pull request #4416 from akva2/simulatortimer_serialize 
SimulatorTimer: add serialization support
 2023-02-13 21:08:31 +01:00
Bård Skaflestad d45a08a6cf Merge pull request #4455 from akva2/perforationdata_missing_include 
PerforationData: add missing include
 2023-02-13 17:40:50 +01:00
Bård Skaflestad 623a03b822 Merge pull request #4454 from akva2/blackoilwellmodel_make_unique 
BlackoilWellModel: prefer std::make_unique
 2023-02-13 17:36:25 +01:00
Bård Skaflestad 2156e16478 Merge pull request #4453 from akva2/regionaveragecalculator_missing_include 
RegionAverageCalculator: add missing include
 2023-02-10 16:02:47 +01:00
Bård Skaflestad 52b9ec98fb Merge pull request #4449 from akva2/simulatorreportsingle_cleanups 
SimulatorReportSingle: some cleanups
 2023-02-09 12:36:45 +01:00
Bård Skaflestad 949d03e564 Merge pull request #4448 from akva2/eclgenerictracermodel_remove_unused_member 
EclGenericTracerModel: remove unused tracerResidual_ member
 2023-02-09 10:37:26 +01:00
Bård Skaflestad 4148df3752 Merge pull request #4444 from akva2/adaptivetimesteppingebos_cleanups 
AdaptiveTimeSteppingEbos: some cleanups
 2023-02-08 16:41:46 +01:00
Bård Skaflestad c451c2aada Merge pull request #4439 from akva2/targetcalculator_missing_include 
TargetCalculator: add missing include
 2023-02-08 14:55:15 +01:00
Bård Skaflestad 65efc26faa Merge pull request #4438 from akva2/parallel_restart_variadic_bcast 
ParallelRestart: use variadic broadcast
 2023-02-08 12:33:51 +01:00
Bård Skaflestad 80daae74b9 Merge pull request #4431 from OPMUSER/KRNUM- 
Add KRNUM*- Keywords as Unsupported
 2023-02-07 17:24:07 +01:00
Bård Skaflestad b598c27605 Merge pull request #4415 from GitPaean/time_step_nochange 
fix the running when solution does not change between time steps
 2023-02-02 23:45:09 +01:00
Bård Skaflestad e6042cdc62 Merge pull request #4275 from daavid00/flres 
FLOWS and FLORES support
 2023-02-02 13:03:57 +01:00
Bård Skaflestad 27b794f8c0 Merge pull request #4423 from akva2/banners 
changed: move banner printing to separate compile unit
 2023-02-02 09:52:18 +01:00
Bård Skaflestad e25cabd06c Merge pull request #4424 from akva2/cleanup_parallel_file_merger 
ParallelFileMerger: some cleanups
 2023-02-01 17:26:44 +01:00
Bård Skaflestad 5daf355a7b Merge pull request #4418 from akva2/fix_prt_header_regression 
fixed: regression from 82d2146c90
 2023-01-31 15:52:41 +01:00
Bård Skaflestad db292c8519 Merge pull request #4405 from GitPaean/adding_optional_header 
including <optional> header to WellContainer
 2023-01-24 11:09:16 +01:00
Bård Skaflestad 7c1cf03773 Merge pull request #4400 from blattms/use-cpr-from-datafile 
Use CPR if specified in RUNSPEC / Make cprw the default
 2023-01-19 16:59:48 +01:00
Bård Skaflestad 697179f584 Merge pull request #4403 from akva2/backend_includes 
add missing includes
 2023-01-19 16:10:44 +01:00
Bård Skaflestad 73968d9c6d Merge pull request #4399 from akva2/fix_damaris 
fix Damaris setup in Main
 2023-01-18 17:54:13 +01:00
Bård Skaflestad 1f85b1640c Merge pull request #4398 from akva2/summaryconfig_hpp_include 
Cleanup SummaryConfig.hpp includes and forward
 2023-01-18 15:43:49 +01:00
Bård Skaflestad da4e2deb6a Merge pull request #4397 from akva2/summarystate_hpp_include 
SummaryState.hpp: add missing and forward where possible
 2023-01-18 14:58:47 +01:00
Bård Skaflestad 8dcab4b236 Merge pull request #4392 from akva2/well_hpp_include 
eclgenerictracermodel.cc: add missing Well.hpp include
 2023-01-17 17:08:56 +01:00
Bård Skaflestad 4ec94ec442 Merge pull request #4391 from akva2/errorguard_hpp_cleanup 
Main.hpp: avoid ErrorGuard.hpp include
 2023-01-17 15:18:54 +01:00
Bård Skaflestad 9c3d1237bd Merge pull request #4389 from akva2/parsercontext_hpp_cleanup 
Main.hpp: avoid ParseContext.hpp include
 2023-01-17 13:26:39 +01:00
Bård Skaflestad 6eb97c0165 Merge pull request #4388 from akva2/parser_hpp_cleanup 
Main.hpp: remove unneccesary Parser.hpp include
 2023-01-17 09:20:07 +01:00
Bård Skaflestad 537542e6ae Merge pull request #4387 from akva2/arraydimchecker_cpp_cleanup 
Main.hpp: remove unnecessary ArrayDimChecker.hpp include
 2023-01-17 09:19:43 +01:00
Bård Skaflestad 00376d39e0 Merge pull request #4386 from akva2/welltestconfig_hpp_include 
add missing WellTestConfig.hpp includes
 2023-01-17 09:19:17 +01:00
Bård Skaflestad fa32882bcc Merge pull request #4385 from akva2/inputerroraction_hpp_include 
add missing InputErrorAction.hpp includes
 2023-01-16 23:29:59 +01:00
Bård Skaflestad 4dc068c87f Merge pull request #4383 from akva2/restartvalue_hpp_include 
add missing RestartValue.hpp include
 2023-01-16 16:14:26 +01:00