Commit Graph
100 Commits
Author SHA1 Message Date
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
Joakim Hove 8b844af07e Merge pull request #2470 from akva2/rename_summarynode
adjust for SummaryNode -> SummaryConfigNode rename
2020-03-13 16:53:56 +01:00
Joakim Hove 556983192e Merge pull request #2342 from joakim-hove/schedule-rst
Restart flow from restart state
2020-03-13 12:03:59 +01:00
Joakim Hove 8473aa38e5 Remove Deck argument to RelpermDiagnostic 2020-03-13 08:54:30 +01:00
Joakim Hove 3c6c889623 Endpointscaling.threepoint() instead of deck.haskeyword("SCALECRS") 2020-03-13 08:54:30 +01:00
Joakim Hove 779bc981f6 Use --sched-restart=false in restart testing 2020-03-12 15:20:39 +01:00
Joakim Hove 4dfa22e6a2 Allow flow to continue with --sched-restart=false 2020-03-12 15:20:39 +01:00
Joakim Hove bb29ad1060 Merge pull request #2392 from joakim-hove/welltype
Add serialization for WellType
2020-03-09 16:40:35 +01:00
Joakim Hove 3ab0e570c7 Use WellType when serializing and constructing Well 2020-03-09 14:45:44 +01:00
Joakim Hove 69871fdefd Add serialization for WellType 2020-03-09 14:45:44 +01:00
Joakim Hove 3f8e794234 Merge pull request #2432 from joakim-hove/testing-sched-restart
Add --sched-restart flag when running restart regression tests
2020-03-09 13:50:59 +01:00
Joakim Hove bbbf3c42fd Merge pull request #2414 from joakim-hove/serialize-dimension
Update serialization of Dimension class
2020-03-09 13:28:15 +01:00
Joakim Hove f8d7a464a8 Pass flag --sched-restart=true to restart test driver 2020-03-09 12:42:07 +01:00
Joakim Hove 25b4b9ca18 Update serialization of Dimension class 2020-03-05 13:18:31 +01:00
Joakim Hove 42f96ca039 Add commandline switch --sched-restart to control restart init 2020-03-04 15:44:32 +01:00
Joakim Hove 93964b2fa8 Merge pull request #2389 from joakim-hove/move-wellinjector-enum
InjectorType enum is moved out from Well class
2020-03-03 16:36:40 +01:00
Joakim Hove 9268bcb2ac InjectorType enum is moved out from Well class 2020-03-03 09:08:02 +01:00
Joakim Hove 2d31a192b8 Merge pull request #2371 from akva2/simplify_oilvap
adjust to upstream OilVaporization change
2020-03-03 08:22:42 +01:00
Joakim Hove c23dd11d6b Merge pull request #2362 from joakim-hove/serialize-dent
Serialize density-temparture class DenT
2020-02-26 09:56:17 +01:00
Joakim Hove 02d1d756ae Merge pull request #2364 from joakim-hove/remove-unused
Remove unsed include and variables
2020-02-25 11:21:31 +01:00
Joakim Hove 2e18107097 Add disabled functionality to init wells and group from restart file 2020-02-25 09:49:26 +01:00
Joakim Hove 8d54aae8d0 Remove unused ParseContext and ErrorGuard arguments 2020-02-25 09:33:21 +01:00
Joakim Hove d153b5ab4c Merge pull request #2360 from joakim-hove/wellsegments-serialize
Simplify serialization of WellSegments
2020-02-25 08:31:25 +01:00
Joakim Hove d94943a741 Serialize new member TableManager::gas_comp_index 2020-02-25 08:04:28 +01:00
Joakim Hove 2ce7b35e69 Serialize density-temparture class DenT 2020-02-25 06:50:31 +01:00
Joakim Hove 87ddba6028 Simplify serialization of WellSegments 2020-02-22 10:49:41 +01:00
Joakim Hove c239529565 Merge pull request #2353 from joakim-hove/aquifer-config
Add serialization for AquiferConfig
2020-02-20 08:25:20 +01:00
Joakim Hove d3bfa83c7c Merge pull request #2343 from joakim-hove/move-rstconfig
RestartConfig has moved from EclipseState to Schedule
2020-02-20 07:07:37 +01:00
Joakim Hove 9c8d5946b4 Add POC for AquiferConfig can be used 2020-02-18 16:19:25 +01:00
Joakim Hove 86972dc494 Add serialization for AquiferConfig 2020-02-18 16:12:00 +01:00
Joakim Hove 980f6488b0 Serialize Aquifer datastructures 2020-02-18 07:13:30 +01:00
Joakim Hove 3a7f5799af Refactor Aquifer datastructures to follow opm-common
- Replace use of Base:: with this-> in derived classes
- Add AquiferInterface::size() utility functions
- Remove AquiferInterface::cell_idx_ member
2020-02-18 07:13:30 +01:00
Joakim Hove 5ad4936025 RestartConfig has moved from EclipseState to Schedule 2020-02-17 21:48:12 +01:00
Joakim Hove 4bdc7d391d Merge pull request #2344 from akva2/vfp_boost_prune
Drop use of boost::multi_array in VFP classes
2020-02-17 13:57:39 +01:00
Joakim Hove 150dc54e79 Merge pull request #2298 from totto82/muliple-group-inj-phases
Allow for multiple group injection phases
2020-02-14 10:31:45 +01:00
Joakim Hove e366b4c9f4 Remove serialization support for UDQFunctionTable and UDQFunction 2020-02-13 17:19:12 +01:00
Joakim Hove 3ff6279eea Remove unused members when serializing WellSegments 2020-02-13 08:47:24 +01:00
Joakim Hove 388a44f1ad Merge pull request #2335 from joakim-hove/icd-status
Update enum used in ICD status
2020-02-13 07:47:33 +01:00
Joakim Hove f886fdd128 Update enum used in ICD status 2020-02-12 14:48:26 +01:00
Joakim Hove d17b21089f Use member variable in Aquifer code 2020-02-09 10:13:15 +01:00
Joakim Hove ac72e49a41 Merge pull request #2319 from joakim-hove/aquifer-reactor
Aquifer refactor
2020-02-07 14:28:10 +01:00
Joakim Hove 0e1a210ef2 Use std::pair<bool, double> for initial aquifer pressure 2020-02-07 12:32:09 +01:00
Joakim Hove cb8a76d098 Use [i] instead of at(i) when accessing Aquifer container 2020-02-07 07:31:25 +01:00
Joakim Hove e910ebe738 Aquifer accessor renamed 2020-02-07 07:31:25 +01:00
Joakim Hove 1c4021f0a3 Use TableManager in AquiferCT constructor 2020-02-07 07:31:25 +01:00
Joakim Hove 28cca881de Merge pull request #2314 from bska/serialize-currctrl
Add Parallel Serialization Support for CurrentControl
2020-02-06 16:36:02 +01:00
Joakim Hove 50d35c1dde Merge pull request #2317 from akva2/simplify_tuning
update for simplified Tuning data structure in opm-common
2020-02-05 07:50:33 +01:00
Joakim Hove 2a131bc46c Merge pull request #2303 from joakim-hove/serialize-rockconfig
Serialize rockconfig
2020-01-29 15:07:15 +01:00
Joakim Hove fcdd5874a3 Use RockConfig in eclproblem 2020-01-29 15:06:53 +01:00
Joakim Hove d15ad322c1 Serialize RockConfig 2020-01-29 15:06:20 +01:00
Joakim Hove 91167ad405 Merge pull request #2308 from joakim-hove/serialize-restart-config
Moved IOConfig to become member of RestartConfig
2020-01-29 08:04:46 +01:00
Joakim Hove 149722922b Moved IOConfig to become member of RestartConfig 2020-01-29 07:28:56 +01:00
Joakim Hove 3e4c6c113b Merge pull request #2307 from joakim-hove/add-SCHEDULE
Add schedule
2020-01-29 00:20:27 +01:00
Joakim Hove e6f91fa510 Add SCHEDULE header in testdata file 2020-01-28 20:34:16 +01:00
Joakim Hove 9955589b48 White space 2020-01-28 20:33:52 +01:00
Joakim Hove 27246b91f4 Merge pull request #2302 from joakim-hove/use-bc
Use bc
2020-01-28 11:03:33 +01:00
Joakim Hove bbdbf38f8a fixup! Add class BCCconfig to parallelrestart 2020-01-28 10:59:06 +01:00
Joakim Hove bc718bafc8 Use BCConfig when setting up boundary conditions 2020-01-27 15:55:04 +01:00
Joakim Hove 298f456b18 Merge pull request #2301 from bska/runspec-serialization-api-update
Chase Runspec Member Update
2020-01-27 09:45:45 +01:00
Joakim Hove c9ef6ac843 Add class BCCconfig to parallelrestart 2020-01-25 09:31:28 +01:00
Joakim Hove 1e26b7333e Remove the stale flag ENABLE_3DPROPS_TESTING 2020-01-24 17:06:56 +01:00
Joakim Hove 31102bd949 Merge pull request #2299 from akva2/ioconfig_update
fix serialization after removed member in IOCOnfig
2020-01-24 15:15:18 +01:00
Joakim Hove 7e629fdcc8 Merge pull request #2297 from joakim-hove/serialize-timemap
Use (std::vector<std::time_t>&) constructor when serialing TimeMap
2020-01-23 09:15:25 +01:00
Joakim Hove 54509c7b56 Use (std::vector<std::time_t>&) constructor when serialing TimeMap 2020-01-22 18:49:55 +01:00
Joakim Hove 2cfe1dce7f Merge pull request #2295 from akva2/noecl_flush_matman
Avoid deck usage on non-root processes setting up MaterialLawManager
2020-01-22 15:09:57 +01:00
Joakim Hove 8f52dd34ca Merge pull request #2296 from akva2/noecl_no_deck_for_existence
Avoid deck usage on non-root processes checking for keywords
2020-01-22 14:15:54 +01:00
Joakim Hove 753282c0c2 Merge pull request #2293 from akva2/noecl_flush_prestate
More serialization support
2020-01-22 06:31:21 +01:00
Joakim Hove 4f4361d291 Merge pull request #2288 from joakim-hove/remove-3dprops
Remove #include GridProperty
2020-01-20 11:35:22 +01:00
Joakim Hove d1085466e0 Remove #include GridProperty 2020-01-20 09:00:48 +01:00
Joakim Hove a4efff2d1b Merge pull request #2279 from bska/chase-rftconfig-api-update
Parallel Restart: Chase RFTConfig API Update
2020-01-14 17:40:10 +01:00
Joakim Hove 0e9535319b Simulate with only active cells (#2213)
Use FieldProps implementation for 3D properties
2020-01-13 15:46:50 +01:00
Joakim Hove c20bbbcb1d Merge pull request #2270 from totto82/trinemykk-smartwater
Trinemykk smartwater
2020-01-11 06:50:56 +01:00
Joakim Hove e8e084e10f Merge pull request #2264 from GitPaean/debugging_omega
adapting to the interface change from OPM/opm-common#1386
2020-01-07 15:05:17 +01:00
Joakim Hove 8ba5caadd4 Merge pull request #2255 from joakim-hove/missing-UDT
Mark UDT as not supported
2019-12-20 17:16:04 +01:00
Joakim Hove 8bba4f0557 Mark UDT as not supported 2019-12-20 16:33:13 +01:00
Joakim Hove a86ac2120c Throw std::runtime_error() instead of std::abort() in test failure 2019-12-20 08:33:08 +01:00
Joakim Hove eedf883a12 Merge pull request #2237 from stefoss23/add_some_keywords
adding some keywords.
2019-12-18 13:51:02 +01:00
Joakim Hove 2a0f8a0465 Merge pull request #2226 from joakim-hove/mpi-fixup
Use Dune communicator instead of raw MPI call
2019-12-14 14:48:26 +01:00
Joakim Hove d4890f81f5 Use Dune communicator instead of raw MPI call 2019-12-14 13:54:06 +01:00
Joakim Hove f07938365b Merge pull request #2216 from joakim-hove/reset-actnum
Update the internal ACTNUM in the FieldPropsManager
2019-12-14 11:17:32 +01:00
Joakim Hove ec68f4b113 Merge pull request #2219 from stefoss23/alternating_keywords
added alternating keywords.
2019-12-13 09:40:51 +01:00
Joakim Hove f28cfec56b Use throw std::runtime_error() instead of std::abort() in test 2019-12-12 20:25:53 +01:00
Joakim Hove f4aa118cc4 Update the internal ACTNUM in the FieldPropsManager 2019-12-12 12:00:51 +01:00
Joakim Hove 510fb4a4ae Merge pull request #2214 from joakim-hove/enable-3dprops-testing
Add cmake switch to enable testing of new 3D property implementation
2019-12-07 13:33:56 +01:00
Joakim Hove 5259fb93ca Add cmake switch to enable testing of new 3D property implementation 2019-12-07 12:34:07 +01:00
Joakim Hove 4ad0074552 Merge pull request #2204 from joakim-hove/shut-wells-timestep
Evaluate ACTIONX at the end of every timestep
2019-12-06 13:29:19 +01:00
Joakim Hove dc5340046a Call applyActions at the end of every timestep 2019-12-06 13:18:49 +01:00
Joakim Hove ce9108a9d2 Refactor WellState SHUT
- Move some WellState shut code to separate method.
- Add bool flag open_for_output_ to WellState to ensure that shut wells do not
  create output.
2019-12-03 19:37:44 +01:00
Joakim Hove ad00a3a891 SummaryState is updated at the end of simulator timestep 2019-12-03 15:52:47 +01:00
Joakim Hove deb397cf0e Update output from applyActions() to show date 2019-12-03 00:44:08 +01:00
Joakim Hove 190b431f42 Merge pull request #2201 from joakim-hove/add-PORO
Add PORO to testdata
2019-11-30 19:47:02 +01:00
Joakim Hove 2a45199d37 Add PORO to testdata 2019-11-30 13:52:21 +01:00
Joakim Hove 6d02923d69 Merge pull request #2200 from joakim-hove/action-eval-list-wells
List the matching wells for Action eval
2019-11-29 19:20:38 +01:00
Joakim Hove f97b76a9b5 List the matching wells for Action eval 2019-11-29 19:18:38 +01:00
Joakim Hove e74c451b7b Merge pull request #2198 from joakim-hove/add-PORO
Add PORO to testdata
2019-11-29 13:11:25 +01:00
Joakim Hove d4b9e95dfe Add PORO to testdata 2019-11-29 11:38:00 +01:00
Joakim Hove 917808cb20 Merge pull request #2190 from joakim-hove/change-sched-constructor
Use EclipseState based Schedule constructor
2019-11-27 15:02:04 +01:00
Joakim Hove 3d1eeda7ed Merge pull request #2191 from joakim-hove/actnum-fixup
Use active index in RelpermDiagnostic_impl
2019-11-27 13:34:44 +01:00
Joakim Hove 6e4d5b1e12 Use active index in RelpermDiagnostic_impl 2019-11-27 12:10:00 +01:00
Joakim Hove 099fbc05d0 Use EclipseState based Schedule constructor 2019-11-27 11:39:16 +01:00