Commit Graph
100 Commits
Author SHA1 Message Date
Joakim Hove 3d28fe25a0 Merge pull request #2799 from joakim-hove/add-include-exception
Add #include <opm/common/Exceptions.hpp>
2020-09-21 23:30:23 +02:00
Joakim Hove c059653fa0 Add #include <opm/common/Exceptions.hpp> 2020-09-21 19:25:52 +02:00
Joakim Hove cc6abb4086 Merge pull request #2796 from joakim-hove/rm-exceptions
Remove unused #include of exceptions
2020-09-21 16:33:19 +02:00
Joakim Hove d9465907be Merge pull request #2795 from joakim-hove/remove-sim-container
Remove references to unused class SimulationDataContainer
2020-09-21 11:16:37 +02:00
Joakim Hove 0565d6f402 Remove unused #include of exceptions 2020-09-21 11:12:15 +02:00
Joakim Hove 9809dcc804 Remove references to unused class SimulationDataContainer 2020-09-21 07:16:11 +02:00
Joakim Hove 1b0cc8d2ad Rename Location -> KeywordLocation 2020-09-16 21:07:18 +02:00
Joakim Hove 4be8240771 Support alternate FIPxxx regions in region summary keywords
As part of support the RPR__xxx summary keywords the ecloutputblackoilmodule.hh
file hase been refactored significantly:

 - std::optional<> is used to manage the calculate once initial values.

 - several small functions are extracted from the outputFipLog() function.

 - std::array<> is used instead of ScalarBuffer to manage containers over all
   FipTypes.

 - SummaryConfig nodes for the requested summary output is stored in the class.

 - A small struct RegionSum is created to hold the region summed properties.
2020-09-14 11:09:37 +02:00
Joakim Hove 03852825d5 White space change 2020-09-10 13:53:39 +02:00
Joakim Hove bbcbb14a62 Merge pull request #2780 from joakim-hove/add-pinch-barrier
Add test of PINCH::ALL + MULTZ with a barrier
2020-09-10 10:06:02 +02:00
Joakim Hove a920828b1c Add test of PINCH::ALL + MULTZ with a barrier 2020-09-10 09:04:31 +02:00
Joakim Hove c0187ffc73 Use std::make_unique<> 2020-09-08 21:57:26 +02:00
Joakim Hove 00c5d9f016 Merge pull request #2775 from joakim-hove/add-report-step-arg
Add report_step argument to UDQConfig::eval()
2020-09-08 11:05:29 +02:00
Joakim Hove 7d3ff894ee Merge pull request #2765 from joakim-hove/add-pinch-testing
Add regression testing for MULTZ + PINCH::ALL
2020-09-08 10:12:22 +02:00
Joakim Hove 3a3e217941 Add regression testing for MULTZ + PINCH::ALL 2020-09-08 08:35:52 +02:00
Joakim Hove ead673b58a Add report_step argument to UDQConfig::eval() 2020-09-08 07:39:03 +02:00
Joakim Hove d330d883be Pass the UDQState member when evaluating UDQ 2020-09-01 15:09:13 +02:00
Joakim Hove 4b45623333 Merge pull request #2748 from joakim-hove/add-udq-state
Add UDQState argument to output writer
2020-09-01 15:07:21 +02:00
Joakim Hove c2f7e900b6 Add UDQState argument to output writer 2020-08-31 18:40:39 +02:00
Joakim Hove aa37f986ae Merge pull request #2736 from joakim-hove/add-udqstate
Add UDQState member to eclbasevanguard
2020-08-31 07:35:08 +02:00
Joakim Hove 0fabb02db4 Add vanguard member UDQState 2020-08-27 17:31:39 +02:00
Joakim Hove f6d2b4fd27 Merge pull request #2737 from joakim-hove/extract-eval-udq
Extract UDQ eval to separate function call
2020-08-27 17:09:33 +02:00
Joakim Hove ef4af80821 Merge pull request #2741 from joakim-hove/add-const-cast
Use const_cast< > in variant serialization
2020-08-27 15:22:19 +02:00
Joakim Hove 3c565ef59e Use const_cast< > in variant serialization 2020-08-27 11:01:22 +02:00
Joakim Hove cc32189a2e Handle serialization of std::variant<T0,T1> 2020-08-25 22:37:24 +02:00
Joakim Hove c7b68482f3 Extract UDQ eval to separate function call 2020-08-25 16:33:30 +02:00
Joakim Hove f2c1496c6e Merge pull request #2690 from hakonhagland/step_init
Implements the Python step_init() function
2020-08-24 13:50:44 +02:00
Joakim Hove f9ac56b31c Merge pull request #2689 from hakonhagland/main_ebos_constr
Capture the variables argc, argv, outputCout, and outputFiles in Opm::FlowMainEbos
2020-08-24 10:04:33 +02:00
Joakim Hove 74e9eea189 Merge pull request #2724 from joakim-hove/tlmixpar
Test TLMixpar pack/unpack
2020-08-14 12:57:06 +02:00
Joakim Hove 9f5e69cde3 Test TLMixpar pack/unpack 2020-08-12 14:46:04 +02:00
Joakim Hove 8f78a15938 Add WListManager argument when constructing ActionContext 2020-07-09 07:30:37 +02:00
Joakim Hove b9b1e734cb Add data::GroupValues member to RestartValue 2020-07-04 10:06:03 +02:00
Joakim Hove 30a4f2b34b Merge pull request #2696 from bska/chase-groupdata-api
Simulator Group Data: Chase Upstream API Update
2020-07-02 21:37:24 +02:00
Joakim Hove 5484264854 Add actionState argument also for non MPI branch 2020-06-19 05:21:05 +02:00
Joakim Hove d89a2e5eb7 Merge pull request #2674 from joakim-hove/use-action-state
Add Action::State member to EclPropblem and pass it to io/ActionX
2020-06-18 18:39:08 +02:00
Joakim Hove b52366926a Add Action::State member to EclPropblem and pass it to io/ActionX 2020-06-17 12:25:03 +02:00
Joakim Hove f03dd20b96 Merge pull request #2636 from joakim-hove/serialize-gpmaint
Instantiate packer for std::optional<GPMaint>
2020-06-12 12:19:28 +02:00
Joakim Hove bba5ca48ba Merge pull request #2668 from joakim-hove/aicd
Aicd
2020-06-12 09:12:33 +02:00
Joakim Hove 754f74df01 Adapt variant serialization to four types 2020-06-12 07:21:46 +02:00
Joakim Hove baba9b6773 Merge pull request #2642 from joakim-hove/icd-variant
Use std::variant access to Segment::icd
2020-06-11 11:32:08 +02:00
Joakim Hove be5f3ff2e1 Use std::variant access to Segment::icd 2020-06-10 20:41:14 +02:00
Joakim Hove a1306a62fc Add serialization of std::variant<T1,T2,T3> 2020-06-10 20:41:14 +02:00
Joakim Hove c977a28cfa Merge pull request #2660 from joakim-hove/restart-testing-enable-adaptive-timestepping
Changes in running of restart regression tests
2020-06-08 13:52:06 +02:00
Joakim Hove df11bb5b55 Changes in running of restart regression tests
- The parallel test gets a designated driver
 - The serial test is run with default adpative timestepping
2020-06-08 12:53:29 +02:00
Joakim Hove 04f6c24022 Merge pull request #2648 from joakim-hove/use-connections-segment-perf-length
Use WellConnections.segment_perf_length()
2020-06-05 11:05:57 +02:00
Joakim Hove 5b940836ec Remove MultisegmentWell::calculateSICDFlowScalingFactors() 2020-06-04 14:13:14 +02:00
Joakim Hove 4ab3b92298 Merge pull request #2631 from hakonhagland/refac_run_simulator
Refactor runSimulator().
2020-05-29 07:25:49 +02:00
Joakim Hove f43c997a10 Merge pull request #2640 from joakim-hove/rename-icd
Rename SpiralICD -> ICD
2020-05-29 07:24:49 +02:00
Joakim Hove 195d2b1c21 Rename SpiralICD -> SICD 2020-05-28 11:10:51 +02:00
Joakim Hove b28d926f32 Instantiate packer for std::optional<GPMaint> 2020-05-26 13:41:30 +02:00
Joakim Hove fd8c79b668 Default to initialize from restart file in case of restarted run 2020-05-21 10:15:20 +02:00
Joakim Hove b5fda287d4 Merge pull request #2555 from hakonhagland/python_simulators3
Python bindings for the blackoil simulator (simplified).
2020-05-11 18:55:04 +02:00
Joakim Hove b03609317f Merge pull request #2606 from bska/fix-missing-feature-diagnostics
Remove 'MAXVALUE' From List of Missing Features
2020-05-11 09:37:06 +02:00
Joakim Hove 1885426f3c Merge pull request #2573 from joakim-hove/segdist-refactor
Update connection <-> segment implementation
2020-05-01 08:52:58 +02:00
Joakim Hove da5042c538 Update connection <-> segment implementation 2020-04-30 14:53:35 +02:00
Joakim Hove 87a7fd1962 Merge pull request #2578 from akva2/fix_focal_packaging
changed: remove multiarch-support predepends
2020-04-30 10:28:04 +02:00
Joakim Hove 926e904e90 Instantiate std::optional<double> and std::optional<std::string> 2020-04-29 16:26:58 +02:00
Joakim Hove ec647bcc16 Merge pull request #2574 from joakim-hove/serialize-optional
Add support for serializing std::optional
2020-04-29 10:48:43 +02:00
Joakim Hove 40d7cd4381 Add support for serializing std::optional 2020-04-28 16:25:17 +02:00
Joakim Hove 303ac7fef4 Merge pull request #2566 from joakim-hove/support-viscref
Remove VISCREF from MissingFeatures
2020-04-27 12:47:06 +02:00
Joakim Hove 750070fbd7 Remove VISCREF from MissingFeatures 2020-04-27 10:30:50 +02:00
Joakim Hove 0773d07df5 Missing features (#2562)
Updates to the list of missing features
2020-04-24 13:08:55 +02:00
Joakim Hove 2696160f56 Merge pull request #2520 from akva2/extra_tests
add norne and norne_parallel as ExtraTests
2020-04-22 13:35:25 +02:00
Joakim Hove 0d78d7e80e Merge pull request #2554 from joakim-hove/update-missing
Update missing
2020-04-22 13:34:55 +02:00
Joakim Hove 192d5f7cc1 Add build/ to .gitignore 2020-04-22 13:22:54 +02:00
Joakim Hove 36647c7978 Merge pull request #2546 from joakim-hove/rename-embedded-python-switch
Rename config variable for Python
2020-04-20 11:16:09 +02:00
Joakim Hove 3189ee3a8a Rename config variable for Python 2020-04-17 14:09:56 +02:00
Joakim Hove 6260bb7851 Update api for checking availability for group control 2020-04-17 13:03:56 +02:00
Joakim Hove 745be42682 Merge pull request #2536 from joakim-hove/add-pyaction-test
Add PYACTION / UDQ testcase
2020-04-17 11:40:27 +02:00
Joakim Hove e04e77fa30 Add PYACTION / UDQ testcase 2020-04-17 11:39:43 +02:00
Joakim Hove bd27513548 Merge pull request #2544 from joakim-hove/missing-keywords
Add keywords to the list of missing features
2020-04-17 11:37:25 +02:00
Joakim Hove 11d65f41d2 Add keywords to the list of missing features 2020-04-17 08:56:10 +02:00
Joakim Hove c39c6b05eb Merge pull request #2538 from atgeirr/support-schedule-exit
Stop simulating if the schedule has set an exit condition.
2020-04-16 17:33:41 +02:00
Joakim Hove 61053fb30b Merge pull request #2537 from joakim-hove/add-actionx-test
Add test based on ACTIONX
2020-04-16 11:29:28 +02:00
Joakim Hove e64c251a8c Add test based on ACTIONX 2020-04-15 09:42:31 +02:00
Joakim Hove 02aab06363 Merge pull request #2528 from joakim-hove/apply-pyaction
Add call to evaluate PYACTION in eclproblem::applyActions()
2020-04-14 19:06:15 +02:00
Joakim Hove 5a09624ad6 Add call to evaluate PYACTION in eclproblem::applyActions() 2020-04-14 08:48:32 +02:00
Joakim Hove 6b72227b3b Merge pull request #2526 from joakim-hove/sched-python-constructor
The "default" Schedule constructor has Python argument
2020-04-11 08:01:06 +02:00
Joakim Hove fcdca0f9e5 The "default" Schedule constructor has Python argument 2020-04-10 07:53:45 +02:00
Joakim Hove fc5875d981 Remove keywords SEPARATE, RUNSUM and DATES from MissingKeywords list 2020-04-07 08:31:22 +02:00
Joakim Hove 76111897a6 MOve String utility in opm-common 2020-04-04 16:28:16 +02:00
Joakim Hove 773dbcca5d Merge pull request #2521 from hakonhagland/refactor_flow
Refactor flow.cpp
2020-04-03 16:07:24 +02:00
Joakim Hove 58717905ee Use only wconnection transmissibility without WellPI scaling 2020-03-31 18:12:29 +02:00
Joakim Hove 3c621b9f33 Merge pull request #2507 from joakim-hove/python-shared-ptr
Use std::shared_ptr for Python handle to Schedule
2020-03-31 16:50:58 +02:00
Joakim Hove d6a1d3029e Use std::shared_ptr for Python handle to Schedule 2020-03-31 12:28:07 +02:00
Joakim Hove c8524a139e Add build time to flow startup banner 2020-03-31 08:42:24 +02:00
Joakim Hove 4a6814d6bc Merge pull request #2502 from joakim-hove/msw-rst-testing
Add integration test for restart & MSW
2020-03-31 07:53:58 +02:00
Joakim Hove 51144a49a9 Add integration test for restart & MSW 2020-03-28 09:49:31 +01:00
Joakim Hove f425758c25 Merge pull request #2501 from joakim-hove/add-python-arg
Add Python argument to Schedule constructor
2020-03-27 13:44:09 +01:00
Joakim Hove ec848b08f0 Merge pull request #2499 from akva2/janitoring
prune some unnecessary includes
2020-03-26 10:46:13 +01:00
Joakim Hove 30216212c4 Add Python argument to Schedule constructor 2020-03-26 10:15:07 +01:00
Joakim Hove 54cd4f96f7 Merge pull request #2496 from akva2/tracers_from_state
Use tracers from EclipseState
2020-03-25 10:17:56 +01:00
Joakim Hove 81b9947e92 Merge pull request #2489 from joakim-hove/serialize-pyaction
Update serialization testing with PyAction
2020-03-20 18:38:34 +01:00
Joakim Hove 8cfed1ec13 Update serialization testing with PyAction 2020-03-20 17:24:42 +01:00
Joakim Hove b5160008f2 Merge pull request #2487 from joakim-hove/connections-add-global-index
Add global index to Connection
2020-03-20 09:08:56 +01:00
Joakim Hove 91572522d6 Add global index to Connection 2020-03-20 08:17:00 +01:00
Joakim Hove 006b87050d Remove numRemoved member from WellConnections 2020-03-18 15:41:21 +01:00
Joakim Hove 91d5a86392 Merge pull request #2481 from joakim-hove/move-connection-order
Move Connection ordering attribute from Well to WellConnections
2020-03-18 15:37:51 +01:00
Joakim Hove 805236ee22 Move Connection ordering attribute from Well to WellConnections 2020-03-18 14:28:29 +01:00
Joakim Hove 65f4635e20 Merge pull request #2464 from joakim-hove/relperm-diag-no-deck
Relperm diag no deck
2020-03-16 13:28:44 +01:00