OilfieldToolsNet/opm-simulators
4
0 Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-10-13 17:32:03 -05:00
Code Issues Packages Projects Releases Wiki Activity
12,697 Commits 31 Branches 117 Tags
377d7eca609192bd49e2580fce62d6c0f22b390a
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Bård Skaflestad 15116bf2a9 Reduce Aquifer Data Copying 
This commit switches to using 'map<>::insert_or_assign()' as the
primary interface for collecting dynamic aquifer data.  In turn,
this activates move semantics for the substructures and reduces the
number of times the data is copied.

Insert_or_assign requires the key, so provide this value--i.e., the
aquifer ID--as part of the AquiferInterface.
 2021-05-17 23:24:52 +02:00
Bård Skaflestad 4386f521a1 Merge pull request #3265 from akva2/ecloutputblackoilmodule_cleanups 
Some small cleanups in ecloutputblackoilmodule
 2021-05-17 22:36:18 +02:00
Bård Skaflestad 00b6a9102b Merge pull request #3260 from verveerpj/keyword_validation_small_improvement 
Simplify the error message on invalid item values for keywords with only a single record
 2021-05-15 12:19:14 +02:00
Bård Skaflestad 9b936390bf Merge pull request #3258 from akva2/janitoring 
quell warnings in serial build
 2021-05-14 00:23:13 +02:00
Bård Skaflestad 993c973340 Merge pull request #3247 from akva2/cleanup_vanguard 
Some small cleanups
 2021-05-12 17:20:51 +02:00
Bård Skaflestad be0908a3f8 Merge pull request #3251 from akva2/keyword_validation_rebuilds 
Avoid full simulator rebuilds when updating keyword validation lists
 2021-05-12 16:47:40 +02:00
Bård Skaflestad 4f5b1defea Merge pull request #3249 from goncalvesmachadoc/patch-4 
Remove COPYREG and add RPTSOL
 2021-05-12 14:27:14 +02:00
Bård Skaflestad 5cafd7268e Merge pull request #3242 from bska/fix-debug-builds 
Restore Debug Builds
 2021-05-12 09:39:32 +02:00
Bård Skaflestad 57d45011af Restore Debug Builds 
This was broken in commit b5580f39f (PR #3222) which removed the
'start_perf_next_well' symbol but did not update every use location.
 2021-05-12 08:37:19 +02:00
Bård Skaflestad aea80db23a Merge pull request #3238 from akva2/fix_equil_cart_mapper_regression 
fix regression: do not unconditionally dereference equilCartMapper
 2021-05-11 16:36:56 +02:00
Bård Skaflestad dc8bbc9e5a Merge pull request #3218 from akva2/eclbase_vanguard_separate 
eclbasevanguard: separate template and non-template parts
 2021-05-11 11:01:51 +02:00
Bård Skaflestad 38292aca72 Merge pull request #3225 from totto82/refactorAssembleWellEq 
Avoid code duplication
 2021-05-10 12:27:52 +02:00
Bård Skaflestad 9d3cf25366 Merge pull request #3217 from akva2/adjust_enums 
adjust to upstream enum changes
 2021-05-07 21:48:19 +02:00
Bård Skaflestad a6c7453a24 Merge pull request #3212 from joakim-hove/num-connections 
Store the number of connections in separate vector
 2021-05-05 22:11:26 +02:00
Bård Skaflestad e73be1352b Merge pull request #3211 from totto82/removeUnusedVFPcode 
remove unused calculateBhpWithTHPTarget
 2021-05-05 18:53:45 +02:00
Bård Skaflestad f8e2aa74de Merge pull request #3207 from akva2/targetcalc_comp_unit 
TargetCalculator: move to separate compile unit
 2021-05-05 18:53:07 +02:00
Bård Skaflestad 9139e3c2f1 Merge pull request #3213 from akva2/no_opm_in_opm 
fixed: do not use Opm:: prefix when inside namespace Opm
 2021-05-05 16:15:50 +02:00
Bård Skaflestad 6b02180ca3 Merge pull request #3208 from akva2/fix_gaslift_impl_include 
fixed: do not include headers into Opm namespace
 2021-05-04 18:04:35 +02:00
Bård Skaflestad 4e830980e7 Merge pull request #3206 from akva2/wellgrouphelpers_comp_unit 
WellGroupHelpers: make templates private
 2021-05-04 11:33:58 +02:00
Bård Skaflestad c0b68ea117 Merge pull request #3205 from akva2/relperm_compile_unit 
RelpermDiagnostics: make templates private
 2021-05-04 00:19:24 +02:00
Bård Skaflestad 9c897dc38c Merge pull request #3193 from joakim-hove/global-well-info 
Add class GlobalWellInfo and use it from WellState
 2021-05-03 17:43:37 +02:00
Bård Skaflestad 9ae3329c5f Merge pull request #3202 from totto82/item9notSupported 
add throw for unsupported positive item 9 in EQUIL
 2021-05-03 15:13:14 +02:00
Bård Skaflestad ff2caa5675 Well Model Test: Supply Valid 'ecl_index' Values 
The WellInterface::initCompletions() member function needs these.
 2021-04-30 17:05:20 +02:00
Bård Skaflestad aa1df1352f Merge pull request #3197 from akva2/move_to_comp_units 
Move to separate compilation units
 2021-04-30 16:50:54 +02:00
Bård Skaflestad 7be6e5bbf1 Merge pull request #3196 from akva2/use_forwarding 
Use forwarding where possible in some headers
 2021-04-30 16:00:41 +02:00
Bård Skaflestad f273e06c66 Merge pull request #3198 from akva2/janitoring 
Remove some unused members and quell some warnings
 2021-04-30 15:08:48 +02:00
Bård Skaflestad 704bc51251 Merge pull request #3183 from totto82/refactorWellStateTarget 
Remove code duplication between STW and MSW
 2021-04-30 11:14:39 +02:00
Bård Skaflestad dae6b61370 Merge pull request #3189 from joakim-hove/alqstate 
Add class ALQState to manage the ALQ state in the WellState
 2021-04-28 11:52:40 +02:00
Bård Skaflestad eb8e270b50 Merge pull request #3190 from akva2/fix_missing_include 
fixed: include <cstring> for strlen
 2021-04-28 11:03:55 +02:00
Bård Skaflestad a6c374a27c Compute Well-Level PI For Shut Wells 
This commit includes the shut wells in 'wells_ecl_' and expands the
PI/II value calculation to apply to those shut wells too.  With this
in place we are able to run cases that have a 'WELPI' keyword before
the well opens, even at the very first report step.
 2021-04-27 14:51:18 +02:00
Bård Skaflestad 6e9d2bd89e Initialise More Data Members at Construction Time 
In particular, apply explicit default constructors to most data
members and push initialisation to initialiser list if convenient.

While here, also split long lines and apply const in more places.
Finally, reset well- and connection-level PI values to zero in
WellState::shutWell().  This is in preparation of including shut
wells in BlackoilWellModel's internal state.
 2021-04-27 14:50:37 +02:00
Bård Skaflestad 3faaab3c9f Merge pull request #3182 from bska/forward-well-potentials 
Forward Potential Rates to Next Report Step
 2021-04-27 09:26:52 +02:00
Bård Skaflestad 1f14c6ddef Forward Potential Rates to Next Report Step 
These are used as part of calculating the BHP/THP when computing new
potential rates in models that feature VFP tables and must therefore
be properly initialised in the next report step's well state object.
 2021-04-27 07:58:21 +02:00
Bård Skaflestad 6cbe5ae8f4 Merge pull request #3178 from joakim-hove/wellstate-internalize-pu 
WellState will internalize PhaseUsage member
 2021-04-27 06:33:18 +02:00
Bård Skaflestad 266197fd75 Merge pull request #3186 from akva2/include_headers 
fixed: include required headers where needed
 2021-04-27 06:31:34 +02:00
Bård Skaflestad e258e69802 Merge pull request #3185 from joakim-hove/phaseusage-std-array 
Use std::array<> in PhaseUsage
 2021-04-26 23:43:01 +02:00
Bård Skaflestad 708645a2c0 Merge pull request #3181 from joakim-hove/call-end-episode 
Call endEpisode() for WellModel and Aquifer model
 2021-04-26 16:25:11 +02:00
Bård Skaflestad 7842b74808 Merge pull request #3170 from GitPaean/fixing_serial_building 
fixing the serial running due to including of eclmpiserializer.hh
 2021-04-21 18:26:43 +02:00
Bård Skaflestad 4c76489cbc Merge pull request #3166 from totto82/fixSaltVdExt 
extrapolate saltvd table

Closes #2889.
 2021-04-20 11:30:07 +02:00
Bård Skaflestad 32a035f8a5 Merge pull request #3163 from akva2/janitoring 
fixed: mark possibly unused variables as such to quell warnings
 2021-04-19 11:34:43 +02:00
Bård Skaflestad 481c72a0fc Merge pull request #3156 from joakim-hove/well-init-restart-bug 
Well init restart bug
 2021-04-14 09:10:30 +02:00
Bård Skaflestad b165e8d3c5 Merge pull request #3155 from alfbr/supported 
Removed four supported keywords
 2021-04-14 00:25:22 +02:00
Bård Skaflestad 55b38056f3 Merge pull request #3153 from joakim-hove/report-pinch 
Report cell volume removed due to MINPV
 2021-04-13 09:00:05 +02:00
Bård Skaflestad e8d4dace7c Merge pull request #3061 from verveerpj/missing_features 
Better handling of non- or partially supported keywords
 2021-04-12 18:32:48 +02:00
Bård Skaflestad 9def2fab12 Unpack Aquifer Subobjects Too 
This is needed to properly communicate type-specific parameters to
other processes.  In particular, outputting the Carter-Tracy summary
vectors AAQTD and AAQPD needs this in a parallel simulation run.
 2021-04-10 17:28:57 +02:00
Bård Skaflestad 2985b9bc0a Merge pull request #3151 from joakim-hove/starting-timestep 
Change output to indicate start of time step
 2021-04-10 15:08:49 +02:00
Bård Skaflestad 2f6863f7b3 Merge pull request #3144 from joakim-hove/ep-value 
Use value object for endpoints
 2021-04-07 17:33:21 +02:00
Bård Skaflestad 160f20975b Support Block-Level Two-Phase Subsystem Kro Summary Output 
This commit adds support for calculating and reporting block-level
values of the relative permeability of oil in the two-phase oil/gas
and oil/water subsystems of a three-phase simulation run.  These are
activated through summary keywords BKROG and BKROW, respectively.
 2021-04-07 08:09:46 +02:00
Bård Skaflestad 35646178ae Merge pull request #3143 from joakim-hove/spe-import-test 
Add SPE1 testcase where grid data is loaded iwth IMPORT
 2021-03-31 23:54:36 +02:00
Bård Skaflestad 2efee18b07 Add LICENSE File 
Contains copy of GPL v3.  Forgotten earlier.
 2021-03-30 10:41:18 +02:00
Bård Skaflestad ee20d1c1c1 Merge pull request #3138 from totto82/debugThermal 
Fix thermal conductivity
 2021-03-27 13:59:59 +01:00
Bård Skaflestad 498efe11a7 Merge pull request #3133 from GitPaean/fixing_segmentation_fault_drsdt 
only when both oil and gas exist, we handle drsdt and drvdt
 2021-03-25 12:03:28 +01:00
Bård Skaflestad 7503cfd76a Address PR Review Comments 2021-03-24 23:13:50 +01:00
Bård Skaflestad 578fa4b6c3 Report Dimensionless Time and Pressure for CT Aquifers 
This commit adds support for calculating and reporting the
dimensionless time (simulator time divided by aquifer's time
constant) and pressure (influence function evaluated at
dimensionless time) values as part of the Carter-Tracy aquifer's
'aquiferData()' reporting function.

These values are useful in their own right, e.g., for summary output
through the keywords AAQTD and AAQPD, but they are also needed for
ECLIPSE restart purposes.
 2021-03-24 23:13:50 +01:00
Bård Skaflestad fa534f77e8 Merge pull request #3124 from GitPaean/interface_numercial_aquifer 
updating the interface of function processEclipseFormat
 2021-03-24 19:19:11 +01:00
Bård Skaflestad c23ce16879 Merge pull request #3120 from totto82/refactorBAVG 
only compute Bavg once pr timestep
 2021-03-24 11:34:13 +01:00
Bård Skaflestad f980ff5f77 Merge pull request #3128 from totto82/fixTarget 
reset target from wconprod and wconinje
 2021-03-23 23:59:27 +01:00
Bård Skaflestad 9d72ee157c Merge pull request #3130 from totto82/addCO2testCases 
add more co2 tests to ctest
 2021-03-23 20:55:41 +01:00
Bård Skaflestad 41fd301d16 Merge pull request #3131 from fgfuchs/global_time_fix 
fix bug that sets global_time to 0
 2021-03-23 15:51:47 +01:00
Bård Skaflestad 537a59a65d Merge pull request #3129 from totto82/removeDiffusionSpecializatoins 
remove unnecessary diffusion specializations
 2021-03-23 13:29:21 +01:00
Bård Skaflestad 0468b2eee6 Merge pull request #2972 from goncalvesmachadoc/spider 
Add cases to regression tests
 2021-03-20 01:14:13 +01:00
Bård Skaflestad 120afea99a Merge pull request #3079 from totto82/testDiff 
FOR TESTING. Enable Diffusion by default
 2021-03-19 23:49:19 +01:00
Bård Skaflestad f82386c2d5 Merge pull request #3122 from joakim-hove/throw-std-logic-error 
Deferred logger will throw "correct" exception
 2021-03-19 17:26:42 +01:00
Bård Skaflestad 984ea28d6f Merge pull request #3121 from bska/prune-unused-object 
Push 'corners' Object into Assert
 2021-03-19 12:23:05 +01:00
Bård Skaflestad c220d7f127 Push 'corners' Object into Assert 
That way we don't get "unused variable" warnings when someone
defines NDEBUG.  While here, also switch to using Geometry
references where appropriate to avoid needlessly copying Geometry
objects.
 2021-03-19 09:42:27 +01:00
Bård Skaflestad 2b34dc843c Merge pull request #3119 from totto82/mintimestep 
Change minimum timestep size to 1e-12
 2021-03-19 09:39:35 +01:00
Bård Skaflestad b982ad0fd2 Record Dynamic Well Status in 'wellData()' Output 
This commit sets the 'data::Well::dynamicStatus' based on the
dynamically updated 'Schedule' object (i.e., from ACTIONX and
similar) and the results of well/operability testing (WECON and/or
WTEST).  If a well is closed due to economic limits (WECON) we still
provide summary-style data at the timestep that closed the well, but
omit this data at later steps until the well reopens.

We add a new parameter to WellState::report() to distinguish these
situations.

This is in preparation of making the 'BlackoilWellModel' manage both
open and shut wells alike.
 2021-03-18 17:28:28 +01:00
Bård Skaflestad 65edfb702c Preparations for Recording Dynamic Well State 
Coalesce blocks with same conditions, split long lines, and apply
'const' where appropriate.  While here, also tighten the "rate = 0"
criterion to include denormalised numbers.
 2021-03-18 17:28:28 +01:00
Bård Skaflestad 0667497108 Merge pull request #3039 from GitPaean/new_numerical_aquifer 
New numerical aquifer
 2021-03-16 16:30:53 +01:00
Bård Skaflestad 4ed085ddc3 Merge pull request #3073 from joakim-hove/timemap-api 
Remove timemap member from Schedule
 2021-03-03 18:17:27 +01:00
Bård Skaflestad d78f5dc259 Merge pull request #3083 from totto82/fixMPIThrow 
Fix MPI issues in the well model
 2021-03-02 12:04:39 +01:00
Bård Skaflestad a2a9ed192d Merge pull request #3084 from totto82/onlyLogOnRank0 
only log changes of group controls on rank 0
 2021-03-01 22:10:05 +01:00
Bård Skaflestad f3511548d8 Merge pull request #3092 from joakim-hove/dist-comment 
Add comment about distribution
 2021-03-01 20:46:52 +01:00
Bård Skaflestad 27fdb01a01 Merge pull request #3090 from OPM/revert-3085-rewrite-msg 
Revert "Use fmt::format() for two messages"
 2021-03-01 15:48:27 +01:00
Bård Skaflestad 945686ddb6 Merge pull request #3077 from totto82/testTestCo2store 
Add CO2STORE test to ctest
 2021-02-24 12:25:46 +01:00
Bård Skaflestad 2594a9af83 Merge pull request #3023 from totto82/addFlowCo2 
Add diffusion in Flow
 2021-02-18 18:33:38 +01:00
Bård Skaflestad 4f112e443f Merge pull request #3055 from joakim-hove/wellpi-update-connections 
Extract functionality to update ecl_well
 2021-02-10 21:15:20 +01:00
Bård Skaflestad 93cf3127d8 Merge pull request #3049 from joakim-hove/wellpi-no-scaling 
Pass unscaled newWellPI to Schedule::applyWellProdIndexScaling()
 2021-02-08 23:30:15 +01:00
Bård Skaflestad c15aa9586e Merge pull request #3041 from bska/support-bsX-quantities 
Support Aliases for Block Level Quantities
 2021-02-02 13:42:33 +01:00
Bård Skaflestad 03a616e08a Support Aliases for Block Level Quantities 
In particular, treat BSOIL, BSGAS, BSWAT, and BPRESSUR as aliases
for BOSAT, BGSAT, BWSAT, and BPR respectively.
 2021-02-02 11:36:41 +01:00
Bård Skaflestad 609cf77663 Merge pull request #3038 from bska/reset-nonlinit-count 
Reset Non-Linear Iteration Count Before 'beginTimeStep'
 2021-02-01 14:33:50 +01:00
Bård Skaflestad 76c59978b6 Reset Non-Linear Iteration Count Before 'beginTimeStep' 
While here, also fix a couple of misprints in a nearby comment.
 2021-01-29 12:30:34 +01:00
Bård Skaflestad 3e71c6fd65 Merge pull request #3036 from akva2/use_compile_time_info 
changed: this is known on compile time
 2021-01-28 16:31:58 +01:00
Bård Skaflestad 1c81dca30f Merge pull request #3014 from bska/chase-eps-api-update 
Chase Unscaled Endpoint API Update
 2021-01-27 18:31:17 +01:00
Bård Skaflestad d1ad97a7f1 Chase Unscaled Endpoint API Update 
We no longer need to pass the "family" as an argument.
 2021-01-27 15:04:26 +01:00
Bård Skaflestad 9360d0a646 Merge pull request #3033 from totto82/fixEmptyEquilOutput 
Fix empty region output in parallel
 2021-01-27 15:03:06 +01:00
Bård Skaflestad 27a11508ae Merge pull request #3031 from totto82/relperm_diag 
Removing explicit usage of the Grid in the relperm diagnostics
 2021-01-27 09:18:16 +01:00
Bård Skaflestad 7684f22073 Merge pull request #3000 from totto82/substituteSolveWellEq 
substitute solveWellEq with inner iterations and initial solve
 2021-01-26 09:59:37 +01:00
Bård Skaflestad 57d158bbbe Merge pull request #3024 from bska/initialise-aquct 
Ensure Well Defined Initial Values for CT Data Members
 2021-01-22 11:06:55 +01:00
Bård Skaflestad f8e4346e6d Ensure Well Defined Initial Values for CT Data Members 2021-01-22 09:04:08 +01:00
Bård Skaflestad 4d3a9af7d2 Merge pull request #3025 from totto82/fix2pEnergy 
fix well model for gasoil thermal
 2021-01-21 21:44:53 +01:00
Bård Skaflestad 42a6a3b573 Merge pull request #2974 from bska/chase-eps-api-update 
Relperm Diagnostics: Chase EPS API Update
 2021-01-05 11:53:49 +01:00
Bård Skaflestad cc6d0e35a3 Relperm Diagnostics: Chase EPS API Update 
The API for extracting unscaled (raw) saturation end-points has
changed in opm-material.  Follow that change here.
 2021-01-05 09:59:07 +01:00
Bård Skaflestad ca8cd922ac Merge pull request #2994 from bska/fix-bosat-smry-2p 
Extract SOIL Directly for 'BOSAT' Summary Vector
 2020-12-21 15:58:54 +01:00
Bård Skaflestad 27acd13a83 Merge pull request #2988 from akva2/add_autoicd_serialize_test 
add serialization test for AutoICD
 2020-12-21 15:33:58 +01:00
Bård Skaflestad a657f2371a Merge pull request #2996 from totto82/outputStoppedWells 
output stopped wells
 2020-12-21 15:22:25 +01:00
Bård Skaflestad e7ca9df998 Extract SOIL Directly for 'BOSAT' Summary Vector 
This works better in two-phase runs (G/O or O/W).
 2020-12-21 13:57:31 +01:00
Bård Skaflestad eb4aabc71a Merge pull request #2986 from totto82/scalePot 
Initial well rates with the well potentials and scale the segment rates
 2020-12-18 23:03:37 +01:00
Bård Skaflestad a325c5ff5f Merge pull request #2992 from alfbr/fix-missing 
Remove WSEGAICD from missing features
 2020-12-18 12:33:52 +01:00
Bård Skaflestad 38eb0802d6 Merge pull request #2984 from blattms/do-not-include-config.h-in-header 
Do not include config.h in header (not even in *_impl.hpp)
 2020-12-11 20:47:08 +01:00