Commit Graph
100 Commits
Author SHA1 Message Date
Bård Skaflestad 910f10d43b Merge pull request #4280 from akva2/well_instantations_simplify
simplify instantations
2022-11-21 16:27:16 +01:00
Bård Skaflestad a9cb568ed0 Merge pull request #4281 from OPM/revert-4262-fixInjTemp2
Revert "remove derivative in thermal flux for injectors"
2022-11-21 15:52:57 +01:00
Bård Skaflestad eeae2442a8 Revert "remove derivative in thermal flux for injectors" 2022-11-21 15:20:45 +01:00
Bård Skaflestad c3dceef6e0 Merge pull request #4237 from akva2/relax_factor_pass_double
changed: pass the actual update value to relaxationFactorRate
2022-11-21 13:49:02 +01:00
Bård Skaflestad 4845ad0107 Merge pull request #4180 from bska/report-segment-dyn-data
Convey More Dynamic State Values per Segment to Output Layer
2022-11-17 12:39:29 +01:00
Bård Skaflestad 936e9e87e7 Convey More Dynamic State Values per Segment to Output Layer
In particular, report local condition segment flow velocities,
segment holdup fractions, and segment phase viscosities.
2022-11-17 11:49:29 +01:00
Bård Skaflestad 085ccccb1e Capture More Dynamic State Per Segment
In particular, calculate segment flow velocities, segment holdup
fractions, and segment phase viscosities when updating the well
state.  This is purely for reporting purposes and does not affect
the multisegmented model.
2022-11-17 11:49:29 +01:00
Bård Skaflestad 2da83fa680 Expose Internal Support for Inferring Rs/Rv From Surface Volumes 2022-11-17 11:49:29 +01:00
Bård Skaflestad 7d9beb3506 Support Using Different Types for Surface and Reservoir Rates
Simplifies using pointers here.
2022-11-17 11:49:29 +01:00
Bård Skaflestad 622321a8e6 Merge pull request #4164 from bska/state-indep-resv-calc
Make Reservoir Voidage Rate Calculator Independent
2022-11-10 13:06:18 +01:00
Bård Skaflestad d388ce40e5 Revert to Original Rs/Rv Calculation Scheme for RESV Rates
Keep the alternative approach in place for reference and
experimental purposes, but disabled by a macro.
2022-11-10 09:41:47 +01:00
Bård Skaflestad f0e2a1efe0 Make Reservoir Voidage Rate Calculator Independent
This commit adds a new overload of the calcReservoirVoidageRates()
member function.  The new overload does not depend on the user
calling defineState(), but instead takes state variables as direct
input arguments.

Reimplement the state-dependent overload in terms of the new
function.  The immediate use case is calculating additional dynamic
quantities per segment in a multisegmented well model, mostly for
reporting purposes.
2022-11-09 17:08:30 +01:00
Bård Skaflestad d8c0057601 Merge pull request #4249 from bska/fix-reported-water-visc
Report Water Viscosity as WAT_VISC
2022-11-07 13:55:34 +01:00
Bård Skaflestad bbb91effae Report Water Viscosity as WAT_VISC
A misprint led to erroneously reporting the gas viscosity here.

Reported by: [at]EdmundStephens on GitHub.
2022-11-07 11:48:41 +01:00
Bård Skaflestad 87bf1b6020 Merge pull request #4245 from GitPaean/typo_correction
fixing some typos in MultisegmentWell_impl.hpp
2022-11-06 12:50:38 +01:00
Bård Skaflestad 1c0f1ad4d0 Merge pull request #4243 from blattms/drop-unused-LinearSolverRequireFullSparsityPattern
Remove ununsed ancient LinearSolverRequireFullSparsityPattern option.
2022-11-04 21:47:27 +01:00
Bård Skaflestad 6607121bcc Merge pull request #4239 from GitPaean/well_state_change_num_segments
we do not copy SegmentState if the segment number changes
2022-11-04 21:22:52 +01:00
Bård Skaflestad d095c8c287 Merge pull request #4242 from blattms/reactivate-use-gmres-flexible-solver
[bugfix] recover support for selecting GMRes as solver.
2022-11-04 21:18:30 +01:00
Bård Skaflestad de3de2cf3b Merge pull request #4236 from akva2/wellinterface_move_is_pressurecontrolled
changed: move isPressureControlled to WellInterfaceGeneric
2022-11-04 15:46:51 +01:00
Bård Skaflestad 203ade29b8 Support Variable Length Connection Data in Distributed Wells
With the addition of tracer information in the data::Rates object
we must relax the assumption that the object is POD.  Switch to
using the Point2PointCommunicator protocol for gathering connection
solutions on the well's owner before transferring well solution
objects to the I/O rank.
2022-11-03 11:37:53 +01:00
Bård Skaflestad c541ed45f5 Merge pull request #4235 from totto82/fixOutputGr
fix group switch logging
2022-11-03 11:26:51 +01:00
Bård Skaflestad cbc0a6ce41 Merge pull request #4227 from blattms/spell-fix
Fixed typo: acess -> access
2022-11-01 22:43:46 +01:00
Bård Skaflestad a49f0bc8c2 Merge pull request #4189 from plgbrts/rwgsalt
removed RWGSALT from unsupported keywords list
2022-11-01 22:11:31 +01:00
Bård Skaflestad daf65f6472 Merge pull request #4225 from GitPaean/removing_number_segments
removing unused number_segments from MultisegmentWell
2022-11-01 15:24:22 +01:00
Bård Skaflestad 73466da197 Merge pull request #4224 from akva2/wellinterface_eval_rename_assemble
Rename WellinterfaceEval to WellAssemble
2022-11-01 13:51:08 +01:00
Bård Skaflestad 5b5daadbfe Merge pull request #4198 from akva2/well_constraints
Add class for well constraints
2022-11-01 11:30:44 +01:00
Bård Skaflestad 4c2ebbd445 Merge pull request #4223 from atgeirr/unhide-option
Unhide NewtonMaxIterations.
2022-10-31 17:48:02 +01:00
Bård Skaflestad dea582d296 Merge pull request #4197 from akva2/well_group_constraints
Add class for well group constraints
2022-10-31 16:12:17 +01:00
Bård Skaflestad 278d7a0551 Merge pull request #4188 from akva2/well_bhp_thp_calc
Put well BHP/THP calculations in separate class
2022-10-31 15:17:17 +01:00
Bård Skaflestad 2840e0cc5f Merge pull request #4195 from akva2/well_group_controls
Add class for well group controls
2022-10-31 12:34:34 +01:00
Bård Skaflestad 86bbd38a55 Merge pull request #4185 from blattms/NewtonMaxIterations
Rename option FlowNewtonMaxIterations to NewtonMaxIterations.
2022-10-29 20:48:53 +02:00
Bård Skaflestad 7b499c4f0a Merge pull request #4199 from akva2/well_test
Add class for well tests
2022-10-29 13:49:22 +02:00
Bård Skaflestad 8316c59fef Merge pull request #4210 from akva2/blackoilwellmodel_guiderates
Add class for guide rate handling for BlackoilWellModel
2022-10-29 12:31:45 +02:00
Bård Skaflestad d1d5ff2831 Merge pull request #4208 from akva2/well_convergence
Add class for checking well convergence
2022-10-28 21:26:17 +02:00
Bård Skaflestad f0d4a68c29 Merge pull request #4209 from akva2/blackoilwellmodel_constraints
Add class for BlackoilWellModel constraints
2022-10-28 21:25:08 +02:00
Bård Skaflestad f373c2f908 Merge pull request #4211 from akva2/blackoilwellmodel_restart
Add class for handling restart initialization in BlackoilWellModel
2022-10-28 16:07:43 +02:00
Bård Skaflestad 9b326f91c5 Merge pull request #4216 from akva2/fix_test_names
fixed: some duplicate test case names
2022-10-28 13:35:23 +02:00
Bård Skaflestad dc2f8685d9 Merge pull request #4207 from atgeirr/fix-schedule-multflt-fastassembly
Fix case with MULTFLT in SCHEDULE for the TpfaLinearizer ("fast assembly" path)
2022-10-27 18:17:24 +02:00
Bård Skaflestad 733eb5989e Merge pull request #4212 from OPMUSER/KRNUM
Remove KRNUM from Unsupported Keyword List (Back-Port)
2022-10-27 16:53:04 +02:00
Bård Skaflestad fd145e2cd7 Merge pull request #4204 from tskille/krnum_cases
start regression testing for krnum cases
2022-10-26 14:39:10 +02:00
Bård Skaflestad edda5f5c8a Merge pull request #4205 from akva2/janitoring
Some janitoring
2022-10-26 11:48:41 +02:00
Bård Skaflestad 9378991243 Merge pull request #4171 from akva2/bcdata_members
Make related BC data a single class member
2022-10-18 13:56:45 +02:00
Bård Skaflestad 1f2496829d Merge pull request #4160 from akva2/optimize_tracer_assembly
Optimize tracer assembly
2022-10-18 11:41:17 +02:00
Bård Skaflestad 36ca7d11e9 Merge pull request #4149 from totto82/improve_conv_thp
Improve convergence for newly opened wells with thp control
2022-10-18 10:26:55 +02:00
Bård Skaflestad 77061d97ca Merge pull request #4173 from blattms/fix-4157
[bugfix] Unconditionally compile WellContributions.cpp et al
2022-10-17 18:09:27 +02:00
Bård Skaflestad 629edd3919 Add Serialization Support for std::bitset<3>
Needed in upcoming work for communicating dynamic phase quantities
per segment in a multisegmented well.
2022-10-14 18:29:52 +02:00
Bård Skaflestad 8162b97c0e Merge pull request #4167 from atgeirr/hide-all-vtk-params
Hide all vtk parameters.
2022-10-14 11:30:29 +02:00
Bård Skaflestad 7096343121 Merge pull request #4162 from akva2/use_range_generators
Use range generators for grid iterations
2022-10-13 23:42:10 +02:00
Bård Skaflestad dd61e79e86 Merge pull request #4166 from GitPaean/removing_GTotal
removing the usage of GTotal in the well code
2022-10-13 23:01:43 +02:00
Bård Skaflestad ec83f37afa Merge pull request #4147 from akva2/tracer_begin_optimize
Optimize EclTracerModel::updateStorageCache
2022-10-13 10:47:51 +02:00
Bård Skaflestad 90ddd13bcc Remove Trailing Semicolon on Function's Close Brace
This removes a GCC warning message on higher warning levels.
2022-10-13 09:57:55 +02:00
Bård Skaflestad 0da2b6e558 Merge pull request #4156 from tskille/add_regtest_krnum
start regression testing for SPE1CASE2_KRNUM
2022-10-12 10:39:11 +02:00
Bård Skaflestad 0a3ede1400 Merge pull request #4151 from GitPaean/wecon_only_producer
only enforcing production economic limit to producers.
2022-10-06 15:44:52 +02:00
Bård Skaflestad 9893f9cea3 Merge pull request #4150 from akva2/janitoring
fixed: add missing includes
2022-10-06 15:44:24 +02:00
Bård Skaflestad 0206627aad Merge pull request #4152 from tskille/add_regtest_wvfpexp02
add regression test for model WVFPEXT-02
2022-10-06 15:43:56 +02:00
Bård Skaflestad 4b7ad47b69 Merge pull request #4146 from akva2/update_property_refactor
Refactor property updating in EclProblem
2022-10-05 17:11:39 +02:00
Bård Skaflestad 5f101a3d58 Merge pull request #4144 from akva2/rename_serialize_object
adjust to renaming of serializeObject
2022-10-04 17:18:15 +02:00
Bård Skaflestad 8d85ffd916 Merge pull request #4142 from atgeirr/rename-sims
Rename flow_blackoil to flow_blackoil_legacyassembly and flow_blackoil_tpfa to flow_blackoil
2022-10-04 12:54:13 +02:00
Bård Skaflestad 66fac184ad Merge pull request #4111 from goncalvesmachadoc/test-rvw
Add unit tests for EQUIL with rvw
2022-10-02 22:11:04 +02:00
Bård Skaflestad de66f3e519 Merge pull request #4139 from GitPaean/fixing_confusion_initializeWellPerfData
fixing (partly) confusion naming in function initializeWellPerfData()
2022-10-01 01:10:35 +02:00
Bård Skaflestad ab41b06917 Merge pull request #4134 from totto82/avoidOscLratOrat
avoid oscilation between ORAT and LRAT when they are equal
2022-09-30 16:24:01 +02:00
Bård Skaflestad 3bb35b223c Merge pull request #4119 from atgeirr/refactor-boundary-flux
Refactor boundary flux
2022-09-29 16:21:34 +02:00
Bård Skaflestad eb0a516ff0 Merge pull request #4128 from ElyesAhmed/alugrid_fix
some fixes for flow_alugrid
2022-09-27 13:05:33 +02:00
Bård Skaflestad 163dd7755a Merge pull request #4133 from OPMUSER/PBUB-and-PDEW-Fix
Fix PBUB and PDEW Export to Restart File
2022-09-27 12:52:35 +02:00
Bård Skaflestad 503965ce01 Merge pull request #4127 from GitPaean/equilibration_for_zero_volume_cells
for the cells having zero thickness we use the cell center depth to do the equilibration
2022-09-23 10:58:48 +02:00
Bård Skaflestad 7b5ef36cd1 Merge pull request #4125 from atgeirr/rename-linsolver-option
Rename --linsolver option to --linear-solver
2022-09-21 11:17:10 +02:00
Bård Skaflestad 8432e4130c Merge pull request #4101 from GitPaean/fix_wells_active
Fix wells active determination
2022-09-19 10:20:30 +02:00
Bård Skaflestad 52d653efee Merge pull request #4117 from akva2/zoltan_params
added: command line option for zoltan customization
2022-09-16 16:24:24 +02:00
Bård Skaflestad 35ee6fa855 Merge pull request #4109 from akva2/serializer_split
Split up serializer and move main code to opm-common
2022-09-16 16:03:43 +02:00
Bård Skaflestad 2fb5f5bc0d Merge pull request #4118 from akva2/fix_string_packing
simplify and fix MPI packing for strings
2022-09-16 15:59:23 +02:00
Bård Skaflestad 5d0a4d588c Merge pull request #4115 from akva2/janitoring
fixed: remove default constructor declaration
2022-09-16 13:15:36 +02:00
Bård Skaflestad 304788dbe8 Merge pull request #4108 from akva2/serializer_simplify
Simplifications in serializer
2022-09-16 13:09:12 +02:00
Bård Skaflestad ec731fd523 Merge pull request #4112 from akva2/fix_regression_variadic_bcast
fixed: wrong root rank in variadic broadcast
2022-09-14 21:09:30 +02:00
Bård Skaflestad 67ec01a730 Merge pull request #4034 from plgbrts/equil2
Equilibration with water-gas ratio vs depth (RVWVD) table
2022-09-14 14:30:04 +02:00
Bård Skaflestad 7e44ddd2bd Merge pull request #4100 from totto82/wvfpexp_user
remove WVFPEXP from unsupported keywords
2022-09-13 12:46:58 +02:00
Bård Skaflestad 3fc8433cc8 Merge pull request #4092 from akva2/serializer_handle_arrays
changed: handle all arrays in eclmpiserializer
2022-09-13 12:38:36 +02:00
Bård Skaflestad 0e49eb3a52 Merge pull request #4089 from akva2/serializer_handle_optional
Optionals are handled in serializer
2022-09-13 11:30:44 +02:00
Bård Skaflestad 56c653235f Merge pull request #4087 from akva2/rename_serialization
Rename serialization files
2022-09-13 10:48:33 +02:00
Bård Skaflestad dbb2ba5cf0 Merge pull request #4091 from akva2/janitoring
Some janitoring
2022-09-09 09:42:53 +02:00
Bård Skaflestad 4778cf9d60 Merge pull request #4088 from GitPaean/removing_unused_function
removing unused setupCartesianToCompressed_ function for BlackoilWellModel
2022-09-08 14:58:23 +02:00
Bård Skaflestad 65c18183c8 Merge pull request #4085 from akva2/remove_dead_serialization
Remove unused serialization code
2022-09-07 12:59:24 +02:00
Bård Skaflestad 593e7cb656 Merge pull request #4083 from akva2/drop_serializer_data_types
drop primitive serializer support for data:: types
2022-09-07 09:49:21 +02:00
Bård Skaflestad c24796e7f5 Merge pull request #4081 from akva2/eclwriter_serializer
changed: use EclMpiSerializer in eclwriter
2022-09-07 09:44:52 +02:00
Bård Skaflestad 6b9cb43ac7 Merge pull request #4080 from akva2/parallelrestart_serializer
ParallelRestart: use eclmpiserializer
2022-09-06 12:51:24 +02:00
Bård Skaflestad 3273ef04f4 Merge pull request #4079 from akva2/summarystate_test
added: SummaryState mpiserializer test
2022-09-06 12:01:21 +02:00
Bård Skaflestad f10a71397b Merge pull request #4078 from akva2/restartvalue_test
added: RestartValue mpiserializer test
2022-09-06 10:41:59 +02:00
Bård Skaflestad 29218040e3 Merge pull request #4073 from akva2/wells_test
add data::Wells mpiserializer test
2022-09-06 10:17:21 +02:00
Bård Skaflestad 5a731eeb17 Merge pull request #4077 from akva2/aquiferdata_test
add data::AquiferData mpiserializer test
2022-09-06 09:55:53 +02:00
Bård Skaflestad 14070fdfcb Merge pull request #4072 from akva2/well_test
added: data::Well mpiserializer test
2022-09-06 09:31:34 +02:00
Bård Skaflestad a7b2ffdfdb Merge pull request #4074 from akva2/fetkovichdata_test
added: data::FetkovichData mpiserializer test
2022-09-06 09:29:16 +02:00
Bård Skaflestad e63a71a9e5 Merge pull request #4076 from akva2/numericaquiferdata_test
added: data::NumericAquiferData mpiserializer test
2022-09-05 16:27:06 +02:00
Bård Skaflestad 9d0ed4f075 Merge pull request #4075 from akva2/cartertracydata_test
added: data::CarterTracyData mpiserializer test
2022-09-05 16:19:52 +02:00
Bård Skaflestad db9578ee99 Merge pull request #4069 from akva2/segment_test
add data::Segment mpiserializer test
2022-09-05 16:19:12 +02:00
Bård Skaflestad b6a264b799 Merge pull request #4063 from akva2/groupandnetworkvalues_test
add data::GroupAndNetworkValues mpiserializer test
2022-09-05 16:18:44 +02:00
Bård Skaflestad 459b116128 Merge pull request #4068 from akva2/segmentpressures_test
added: data::SegmentPressures mpiserializer test
2022-09-05 14:23:49 +02:00
Bård Skaflestad dea0f27708 Merge pull request #4067 from akva2/connection_test
add data::Connection mpiserializer test
2022-09-05 14:10:39 +02:00
Bård Skaflestad bd95a77d7d Merge pull request #4061 from akva2/groupdata_test
data::GroupData: add mpiserializer test
2022-09-05 14:09:59 +02:00
Bård Skaflestad 674ce11265 Merge pull request #4071 from atgeirr/fix-cartmapping-wellcontrib
Use compressedIndexForInterior() for mapping cartesian indices.
2022-09-05 13:25:01 +02:00
Bård Skaflestad aabcc5161c Merge pull request #4060 from akva2/groupguiderates_test
data::GroupGuideRates: mpiserializer test
2022-09-05 13:01:52 +02:00
Bård Skaflestad 019ce8d055 Merge pull request #4070 from akva2/currentcontrol_test
added: data::CurrentControl mpiserializer test
2022-09-05 12:59:58 +02:00