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
12,128 Commits 31 Branches 117 Tags
6b1c6e7d9e65ca860b58fa6c623a1ea1ca8d5ff1
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Hove 6b1c6e7d9e Merge pull request #2999 from joakim-hove/serialize-chrono 
Serialize std::chrono::system_clock::time_point through std::time_t
 2021-01-05 09:23:07 +01:00
Joakim Hove fff19a2cf3 Serialize std::chrono::system_clock::time_point through std::time_t 2021-01-03 10:30:51 +01:00
Joakim Hove 36d679fc20 Merge pull request #2985 from joakim-hove/msw-shut-wells 
Msw shut wells
 2020-12-14 10:19:38 +01:00
Joakim Hove ab143d15c7 Make sure well is open before copying MSW well state from previous 2020-12-14 09:01:42 +01:00
Joakim Hove aa345a36f1 Fetch connpos and number of perforations from WellInfo for MSW wells 2020-12-14 09:01:37 +01:00
Joakim Hove cd19e987cf Merge pull request #2981 from joakim-hove/skip-prev-closed-well 
Skip previously shut wells in WellState init
 2020-12-11 17:01:46 +01:00
Joakim Hove 8c17172f08 Skip previously shut wells in WellState init 2020-12-10 16:41:10 +01:00
Joakim Hove f5f3d8a98e Introduce WellState::stopWell() 2020-12-10 09:54:37 +01:00
Joakim Hove bd3fa0af88 Use enum Well::Status for well status in WellState 2020-12-10 08:11:19 +01:00
Joakim Hove e4303c6784 Change access to connpos to use WellMap instead of index counting 2020-12-09 16:49:10 +01:00
Joakim Hove 66a532f33e Merge pull request #2957 from joakim-hove/wbp-collect 
Wbp collect
 2020-12-04 09:11:21 +01:00
Joakim Hove 7e8132b965 Merge pull request #2951 from GitPaean/wsegaicd 
supporting WSEGAICD
 2020-12-04 08:52:50 +01:00
Joakim Hove 72905f3e3b Gather WBP pressure data before summary eval 2020-12-03 09:40:40 +01:00
Joakim Hove ced3c99e09 Merge pull request #2953 from joakim-hove/udq-eval-off-by-one 
Shift the report step argument used when calling UDQ eval
 2020-12-02 08:34:43 +01:00
Joakim Hove 1d86e2dc97 Pass wbp index list to output module 2020-12-01 07:52:58 +01:00
Joakim Hove 1bb7b0d30f Use unique_ptr for outputmodule member in EclWriter 2020-11-30 13:31:04 +01:00
Joakim Hove 1fbc25979f Merge pull request #2940 from joakim-hove/pavg-calculators 
WIP: Pavg calculators
 2020-11-30 13:17:23 +01:00
Joakim Hove c0e3de3815 Pass WBP calculators to Summary::eval 2020-11-30 11:30:00 +01:00
Joakim Hove 11bbb33337 Shift the report step argument used when calling UDQ eval 2020-11-30 10:14:20 +01:00
Joakim Hove 62b119170d Pass Inplace argument to Summary::eval() 2020-11-24 12:33:05 +01:00
Joakim Hove df292baeea Use Inplace::Phase enums instead of string tags 2020-11-24 12:33:05 +01:00
Joakim Hove 26c3262a2a Merge pull request #2935 from joakim-hove/add-inplace 
Pass the initial inplace values to Summary::eval()
 2020-11-20 14:13:00 +01:00
Joakim Hove e962374856 Pass the initial inplace values to Summary::eval() 2020-11-20 10:02:16 +01:00
Joakim Hove b2896d09ff Merge pull request #2920 from joakim-hove/use-original-IP 
Pass region in place values to the summary writer
 2020-11-19 17:13:04 +01:00
Joakim Hove 6084f7c4d4 Use class Inplace to manage aggregated region properties in output 2020-11-19 11:38:18 +01:00
Joakim Hove 2043d792c1 Remove arguments 2020-11-18 15:40:22 +01:00
Joakim Hove 20f7503d67 Merge pull request #2913 from joakim-hove/add-parallel-test-pavg 
Add packing test for class PAvg
 2020-11-17 08:19:28 +01:00
Joakim Hove 2d137e706f Merge pull request #2918 from joakim-hove/summary-RRPV 
Change output name of Region Pore Volume
 2020-11-16 10:37:37 +01:00
Joakim Hove 582980627d Merge pull request #2907 from joakim-hove/nnc-error-message 
Improve error message for problematic NNCEDIT
 2020-11-13 08:27:07 +01:00
Joakim Hove cddc8044b3 Change output name of Region Pore Volume 2020-11-13 08:21:22 +01:00
Joakim Hove f4deebeb77 Add packing test for class PAvg 2020-11-11 15:17:34 +01:00
Joakim Hove da2bc2affd Refactor application of NNC / EDITNNC 
- The edit manipulations from EDITNNC have already been applied to the NNC data
  from opm-common

- The NNC data structures are guaranteed to be ordered, both with cell1 <= cell2
  and the NNCs are in ascending order

- The NNC output to EGRID / INIT files is based on std::vector<NNCdata>
 2020-11-10 16:59:30 +01:00
Joakim Hove 9e08e1324c Merge pull request #2900 from joakim-hove/ref-test-cmpl 
Add regression test for summary + completion variables
 2020-11-10 08:33:41 +01:00
Joakim Hove b46a98e6dc Add regression test for summary + completion variables 2020-11-09 16:06:58 +01:00
Joakim Hove e2909958c8 Merge pull request #2844 from hakonhagland/poro2 
Implements access to the porosity from Python.
 2020-11-05 11:15:12 +01:00
Joakim Hove a28bd3ab90 Merge pull request #2830 from hakonhagland/step_cleanup 
Implements a Python step_cleanup() method.
 2020-11-04 14:27:38 +01:00
Joakim Hove 68e8c4a900 Use python pushd 2020-11-04 14:24:39 +01:00
Joakim Hove a2148446e0 Merge pull request #2897 from alfbr/sched-restart 
Switch default for restarting to read historic schedule
 2020-11-03 21:10:31 +01:00
Joakim Hove 9fe6595a36 Merge pull request #2887 from joakim-hove/well-matcher 
Add wellmatcher argument when evaluating UDQ expressions
 2020-11-03 11:22:18 +01:00
Joakim Hove 082fed2d78 Add wellmatcher argument when evaluating UDQ expressions 2020-10-30 23:34:07 +01:00
Joakim Hove 67ae9c6cb8 Merge pull request #2870 from joakim-hove/add-reperf-test 
Add integration test for reporforated norne model
 2020-10-27 17:13:00 +01:00
Joakim Hove f46e7d998f Add integration test for reporforated norne model 2020-10-27 11:53:52 +01:00
Joakim Hove ea43f8fb0a Merge pull request #2873 from joakim-hove/udq-test-M3 
Udq test m3
 2020-10-27 11:52:00 +01:00
Joakim Hove ba25f35c57 Add regression testing for model UDQ_M3 2020-10-26 11:21:47 +01:00
Joakim Hove 887b13705d Merge pull request #2743 from joakim-hove/udq-test-M2 
Add udq test UDQ_M2
 2020-10-23 20:32:00 +02:00
Joakim Hove 237db3be6d Add udq test UDQ_M2 2020-10-22 17:12:35 +02:00
Joakim Hove d69d0e95e7 Merge pull request #2869 from joakim-hove/update-referencedata 
Use cmake testname in dictionary of tests in update_reference_data.sh
 2020-10-22 17:11:31 +02:00
Joakim Hove 1dc586272b Use cmake testname in dictionary of tests in update_reference_data.sh 2020-10-22 11:43:17 +02:00
Joakim Hove 15be2f32d4 Merge pull request #2742 from joakim-hove/udq-test-M1 
Add regression test udq_actionx/UDQ_M1
 2020-10-22 11:24:24 +02:00
Joakim Hove de5eaa8227 Add regression test udq_actionx/UDQ_M1 2020-10-22 09:03:29 +02:00
Joakim Hove 5f8238915b Merge pull request #2810 from joakim-hove/pass-location 
Pass location to ParseContext.handleError()
 2020-09-29 22:15:17 +02:00
Joakim Hove 0092ef0cf0 Pass location to ParseContext.handleError() 2020-09-28 16:58:37 +02:00
Joakim Hove 5985dee574 Merge pull request #2813 from joakim-hove/flow-exceptions 
Flow exceptions
 2020-09-28 16:57:02 +02:00
Joakim Hove a755a2d056 Do not print error message when flow exits 2020-09-28 11:03:45 +02:00
Joakim Hove 76f57f5a1d Catch OpmInputError in addition to std::exception 2020-09-28 11:03:45 +02:00
Joakim Hove 0b5134521e Add inline fmtlib code in source tree 2020-09-28 11:01:13 +02:00
Joakim Hove 2c447ae829 Merge pull request #2805 from akva2/serializer_optional 
Optional support in eclmpiserializer
 2020-09-24 07:33:16 +02:00
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 d5bc4d539c Distribute transmissibility calculator of the FieldPropsManager 2020-09-15 17:15:03 +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