Commit Graph
100 Commits
Author SHA1 Message Date
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
Bård Skaflestad 40c51f9829 Merge pull request #4381 from bska/tag-unused-parameters
Tag Unused Parameter as [[maybe_unused]]
2023-01-16 15:31:52 +01:00
Bård Skaflestad 171a591659 Tag Unused Parameter as [[maybe_unused]]
Suppresses warnings about unused arguments.  While here, also split
a long line for readability and include a number of standard headers
that were missing before.
2023-01-16 14:50:58 +01:00
Bård Skaflestad 7eaa2b91bc Merge pull request #4382 from akva2/units_hpp_cleanups
Units.hpp: some cleanup
2023-01-16 13:47:49 +01:00
Bård Skaflestad dce81569fe Merge pull request #4380 from akva2/fielddata_hpp_include
add missing FieldData.hpp includes
2023-01-16 13:15:26 +01:00
Bård Skaflestad 11c0e085f9 Merge pull request #4193 from hnil/amgcl_fix
- fix compilation of amgcl bindings in bda by not doing anything for …
2023-01-16 11:23:39 +01:00
Bård Skaflestad 2691e6328f Merge pull request #4372 from totto82/fix_gp
output gas pressure for gas-water case
2023-01-16 11:11:39 +01:00
Bård Skaflestad afe3bd01e4 Merge pull request #4379 from akva2/units_hpp_include
add missing Units.hpp includes
2023-01-16 11:04:38 +01:00
Bård Skaflestad bb53e3428e Merge pull request #4378 from akva2/wvfpexp_hpp_include
add missing WVFPEXP.hpp includes
2023-01-14 13:19:35 +01:00
Bård Skaflestad e104ee13a2 Merge pull request #4377 from akva2/welleconproductionlimits_hpp_include
add missing WellEconProductionLimits.hpp includes
2023-01-13 16:09:38 +01:00
Bård Skaflestad 1f29b7cef0 Merge pull request #4375 from akva2/wellpolymerproperties_hpp_include
add missing WellPolymerProperties.hpp includes
2023-01-13 14:00:15 +01:00
Bård Skaflestad 9a9bed06c5 Merge pull request #4374 from akva2/welltracerproperties_hpp_include
add missing WellTracerProperties.hpp includes
2023-01-13 12:47:31 +01:00
Bård Skaflestad dcfa1ef24e Merge pull request #4373 from akva2/wellbrineproperties_hpp_include
add missing WellBrineProperties.hpp includes
2023-01-13 12:03:08 +01:00
Bård Skaflestad 4eaf3b8270 Merge pull request #4316 from totto82/gaswater_equil
Suppot EQUIL + WATER + GAS
2023-01-13 11:26:02 +01:00
Bård Skaflestad c29b41ef51 Merge pull request #4371 from akva2/wellfoamproperties_hpp_include
add missing WellFoamProperties.hpp includes
2023-01-13 11:12:56 +01:00
Bård Skaflestad adda7e4a3c Merge pull request #4369 from akva2/wellsegments_hpp_include
add missing WellSegments.hpp includes
2023-01-12 16:45:31 +01:00
Bård Skaflestad 0078dd5df6 Merge pull request #4368 from akva2/wellconnections_hpp_include
Avoid WellConnections.hpp in simulator objects
2023-01-12 14:28:44 +01:00
Bård Skaflestad 4aca97c475 Merge pull request #4367 from akva2/rftconfig_hpp_include
add missing RFTConfig.hpp includes
2023-01-12 11:38:42 +01:00
Bård Skaflestad 9356179042 Merge pull request #4366 from akva2/udqconfig_hpp_include
add missing UDQConfig.hpp includes
2023-01-12 10:30:58 +01:00
Bård Skaflestad b39d4835f6 Merge pull request #4365 from akva2/udqactive_hpp_include
add missing UDQActive.hpp include
2023-01-11 16:09:41 +01:00
Bård Skaflestad 56ad05dc9f Merge pull request #4364 from akva2/actions_hpp_include
add missing Actions.hpp includes
2023-01-11 14:40:19 +01:00
Bård Skaflestad 6c1bcd6fbf Merge pull request #4362 from akva2/extnetwork_hpp_include
add missing ExtNetwork.hpp includes
2023-01-11 11:25:47 +01:00
Bård Skaflestad fe9fa04d0e Merge pull request #4361 from akva2/gconsale_hpp_include
add missing GConSale.hpp includes
2023-01-11 09:37:18 +01:00
Bård Skaflestad 11a988aaf9 Merge pull request #4358 from akva2/gconsump_hpp_include
add missing GConSump.hpp includes
2023-01-10 16:00:50 +01:00
Bård Skaflestad c5be1226d7 Merge pull request #4357 from akva2/nameorder_hpp_include
add missing NameOrder.hpp includes
2023-01-10 13:53:18 +01:00
Bård Skaflestad 0fa9d8732e Merge pull request #4356 from akva2/wellmatcher_hpp_include
Add missing WellMatcher.hpp includes
2023-01-10 12:40:06 +01:00
Bård Skaflestad 5cf5ea5569 Merge pull request #4355 from akva2/simulatorupdate_hpp_include
add missing SimulatorUpdate.hpp include
2023-01-10 11:08:43 +01:00
Bård Skaflestad f5f3b41120 Merge pull request #4352 from akva2/gasliftop_hpp_include
GasLiftOpt.hpp: minimize include
2023-01-10 11:08:14 +01:00
Bård Skaflestad 0a35edd0f5 Merge pull request #4354 from akva2/rptconfig_hpp_include
add missing RPTConfig.hpp includes
2023-01-09 16:07:08 +01:00
Bård Skaflestad fdbf77e10a Merge pull request #4353 from akva2/gasliftconfig_hpp_include
add missing GuideRateConfig.hpp includes
2023-01-09 15:21:03 +01:00
Bård Skaflestad b029419b3e Merge pull request #4351 from akva2/python_hpp_include
add missing include
2023-01-09 13:21:30 +01:00
Bård Skaflestad 0c07e27d26 Merge pull request #4350 from akva2/pinchmode_enum_class
adjust to PinchMode now being an enum class
2023-01-05 16:44:28 +01:00
Bård Skaflestad 63c6b102d4 Merge pull request #4349 from akva2/runspec_improvements
Small Runspec improvements
2023-01-05 14:14:21 +01:00
Bård Skaflestad 716ea14cb0 Merge pull request #4345 from akva2/fix_macro
avoid double underscored symbol
2023-01-03 17:14:29 +01:00
Bård Skaflestad 181a883370 Merge pull request #4344 from akva2/trim_iostream
Trim some iostream includes
2023-01-03 16:02:12 +01:00