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
15,505 Commits 31 Branches 117 Tags
949d03e564f151a6765ff430355a8e586ec274a0
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Bård Skaflestad 949d03e564 Merge pull request #4448 from akva2/eclgenerictracermodel_remove_unused_member 
EclGenericTracerModel: remove unused tracerResidual_ member
 2023-02-09 10:37:26 +01:00
Bård Skaflestad 4148df3752 Merge pull request #4444 from akva2/adaptivetimesteppingebos_cleanups 
AdaptiveTimeSteppingEbos: some cleanups
 2023-02-08 16:41:46 +01:00
Bård Skaflestad c451c2aada Merge pull request #4439 from akva2/targetcalculator_missing_include 
TargetCalculator: add missing include
 2023-02-08 14:55:15 +01:00
Bård Skaflestad 65efc26faa Merge pull request #4438 from akva2/parallel_restart_variadic_bcast 
ParallelRestart: use variadic broadcast
 2023-02-08 12:33:51 +01:00
Bård Skaflestad 80daae74b9 Merge pull request #4431 from OPMUSER/KRNUM- 
Add KRNUM*- Keywords as Unsupported
 2023-02-07 17:24:07 +01:00
Bård Skaflestad b598c27605 Merge pull request #4415 from GitPaean/time_step_nochange 
fix the running when solution does not change between time steps
 2023-02-02 23:45:09 +01:00
Bård Skaflestad e6042cdc62 Merge pull request #4275 from daavid00/flres 
FLOWS and FLORES support
 2023-02-02 13:03:57 +01:00
Bård Skaflestad 27b794f8c0 Merge pull request #4423 from akva2/banners 
changed: move banner printing to separate compile unit
 2023-02-02 09:52:18 +01:00
Bård Skaflestad e25cabd06c Merge pull request #4424 from akva2/cleanup_parallel_file_merger 
ParallelFileMerger: some cleanups
 2023-02-01 17:26:44 +01:00
Bård Skaflestad 5daf355a7b Merge pull request #4418 from akva2/fix_prt_header_regression 
fixed: regression from 82d2146c90
 2023-01-31 15:52:41 +01:00
Bård Skaflestad db292c8519 Merge pull request #4405 from GitPaean/adding_optional_header 
including <optional> header to WellContainer
 2023-01-24 11:09:16 +01:00
Bård Skaflestad 7c1cf03773 Merge pull request #4400 from blattms/use-cpr-from-datafile 
Use CPR if specified in RUNSPEC / Make cprw the default
 2023-01-19 16:59:48 +01:00
Bård Skaflestad 697179f584 Merge pull request #4403 from akva2/backend_includes 
add missing includes
 2023-01-19 16:10:44 +01:00
Bård Skaflestad 73968d9c6d Merge pull request #4399 from akva2/fix_damaris 
fix Damaris setup in Main
 2023-01-18 17:54:13 +01:00
Bård Skaflestad 1f85b1640c Merge pull request #4398 from akva2/summaryconfig_hpp_include 
Cleanup SummaryConfig.hpp includes and forward
 2023-01-18 15:43:49 +01:00
Bård Skaflestad da4e2deb6a Merge pull request #4397 from akva2/summarystate_hpp_include 
SummaryState.hpp: add missing and forward where possible
 2023-01-18 14:58:47 +01:00
Bård Skaflestad 8dcab4b236 Merge pull request #4392 from akva2/well_hpp_include 
eclgenerictracermodel.cc: add missing Well.hpp include
 2023-01-17 17:08:56 +01:00
Bård Skaflestad 4ec94ec442 Merge pull request #4391 from akva2/errorguard_hpp_cleanup 
Main.hpp: avoid ErrorGuard.hpp include
 2023-01-17 15:18:54 +01:00
Bård Skaflestad 9c3d1237bd Merge pull request #4389 from akva2/parsercontext_hpp_cleanup 
Main.hpp: avoid ParseContext.hpp include
 2023-01-17 13:26:39 +01:00
Bård Skaflestad 6eb97c0165 Merge pull request #4388 from akva2/parser_hpp_cleanup 
Main.hpp: remove unneccesary Parser.hpp include
 2023-01-17 09:20:07 +01:00
Bård Skaflestad 537542e6ae Merge pull request #4387 from akva2/arraydimchecker_cpp_cleanup 
Main.hpp: remove unnecessary ArrayDimChecker.hpp include
 2023-01-17 09:19:43 +01:00
Bård Skaflestad 00376d39e0 Merge pull request #4386 from akva2/welltestconfig_hpp_include 
add missing WellTestConfig.hpp includes
 2023-01-17 09:19:17 +01:00
Bård Skaflestad fa32882bcc Merge pull request #4385 from akva2/inputerroraction_hpp_include 
add missing InputErrorAction.hpp includes
 2023-01-16 23:29:59 +01:00
Bård Skaflestad 4dc068c87f Merge pull request #4383 from akva2/restartvalue_hpp_include 
add missing RestartValue.hpp include
 2023-01-16 16:14:26 +01:00
Bård Skaflestad 40c51f9829 Merge pull request #4381 from bska/tag-unused-parameters 
Tag Unused Parameter as [[maybe_unused]]
 2023-01-16 15:31:52 +01:00
Bård Skaflestad 171a591659 Tag Unused Parameter as [[maybe_unused]] 
Suppresses warnings about unused arguments.  While here, also split
a long line for readability and include a number of standard headers
that were missing before.
 2023-01-16 14:50:58 +01:00
Bård Skaflestad 7eaa2b91bc Merge pull request #4382 from akva2/units_hpp_cleanups 
Units.hpp: some cleanup
 2023-01-16 13:47:49 +01:00
Bård Skaflestad dce81569fe Merge pull request #4380 from akva2/fielddata_hpp_include 
add missing FieldData.hpp includes
 2023-01-16 13:15:26 +01:00
Bård Skaflestad 11c0e085f9 Merge pull request #4193 from hnil/amgcl_fix 
- fix compilation of amgcl bindings in bda by not doing anything for …
 2023-01-16 11:23:39 +01:00
Bård Skaflestad 2691e6328f Merge pull request #4372 from totto82/fix_gp 
output gas pressure for gas-water case
 2023-01-16 11:11:39 +01:00
Bård Skaflestad afe3bd01e4 Merge pull request #4379 from akva2/units_hpp_include 
add missing Units.hpp includes
 2023-01-16 11:04:38 +01:00
Bård Skaflestad bb53e3428e Merge pull request #4378 from akva2/wvfpexp_hpp_include 
add missing WVFPEXP.hpp includes
 2023-01-14 13:19:35 +01:00
Bård Skaflestad e104ee13a2 Merge pull request #4377 from akva2/welleconproductionlimits_hpp_include 
add missing WellEconProductionLimits.hpp includes
 2023-01-13 16:09:38 +01:00
Bård Skaflestad 1f29b7cef0 Merge pull request #4375 from akva2/wellpolymerproperties_hpp_include 
add missing WellPolymerProperties.hpp includes
 2023-01-13 14:00:15 +01:00
Bård Skaflestad 9a9bed06c5 Merge pull request #4374 from akva2/welltracerproperties_hpp_include 
add missing WellTracerProperties.hpp includes
 2023-01-13 12:47:31 +01:00
Bård Skaflestad dcfa1ef24e Merge pull request #4373 from akva2/wellbrineproperties_hpp_include 
add missing WellBrineProperties.hpp includes
 2023-01-13 12:03:08 +01:00
Bård Skaflestad 4eaf3b8270 Merge pull request #4316 from totto82/gaswater_equil 
Suppot EQUIL + WATER + GAS
 2023-01-13 11:26:02 +01:00
Bård Skaflestad c29b41ef51 Merge pull request #4371 from akva2/wellfoamproperties_hpp_include 
add missing WellFoamProperties.hpp includes
 2023-01-13 11:12:56 +01:00
Bård Skaflestad adda7e4a3c Merge pull request #4369 from akva2/wellsegments_hpp_include 
add missing WellSegments.hpp includes
 2023-01-12 16:45:31 +01:00
Bård Skaflestad 0078dd5df6 Merge pull request #4368 from akva2/wellconnections_hpp_include 
Avoid WellConnections.hpp in simulator objects
 2023-01-12 14:28:44 +01:00
Bård Skaflestad 4aca97c475 Merge pull request #4367 from akva2/rftconfig_hpp_include 
add missing RFTConfig.hpp includes
 2023-01-12 11:38:42 +01:00
Bård Skaflestad 9356179042 Merge pull request #4366 from akva2/udqconfig_hpp_include 
add missing UDQConfig.hpp includes
 2023-01-12 10:30:58 +01:00
Bård Skaflestad b39d4835f6 Merge pull request #4365 from akva2/udqactive_hpp_include 
add missing UDQActive.hpp include
 2023-01-11 16:09:41 +01:00
Bård Skaflestad 56ad05dc9f Merge pull request #4364 from akva2/actions_hpp_include 
add missing Actions.hpp includes
 2023-01-11 14:40:19 +01:00
Bård Skaflestad 6c1bcd6fbf Merge pull request #4362 from akva2/extnetwork_hpp_include 
add missing ExtNetwork.hpp includes
 2023-01-11 11:25:47 +01:00
Bård Skaflestad fe9fa04d0e Merge pull request #4361 from akva2/gconsale_hpp_include 
add missing GConSale.hpp includes
 2023-01-11 09:37:18 +01:00
Bård Skaflestad 11a988aaf9 Merge pull request #4358 from akva2/gconsump_hpp_include 
add missing GConSump.hpp includes
 2023-01-10 16:00:50 +01:00
Bård Skaflestad c5be1226d7 Merge pull request #4357 from akva2/nameorder_hpp_include 
add missing NameOrder.hpp includes
 2023-01-10 13:53:18 +01:00
Bård Skaflestad 0fa9d8732e Merge pull request #4356 from akva2/wellmatcher_hpp_include 
Add missing WellMatcher.hpp includes
 2023-01-10 12:40:06 +01:00
Bård Skaflestad 5cf5ea5569 Merge pull request #4355 from akva2/simulatorupdate_hpp_include 
add missing SimulatorUpdate.hpp include
 2023-01-10 11:08:43 +01:00
Bård Skaflestad f5f3b41120 Merge pull request #4352 from akva2/gasliftop_hpp_include 
GasLiftOpt.hpp: minimize include
 2023-01-10 11:08:14 +01:00
Bård Skaflestad 0a35edd0f5 Merge pull request #4354 from akva2/rptconfig_hpp_include 
add missing RPTConfig.hpp includes
 2023-01-09 16:07:08 +01:00
Bård Skaflestad fdbf77e10a Merge pull request #4353 from akva2/gasliftconfig_hpp_include 
add missing GuideRateConfig.hpp includes
 2023-01-09 15:21:03 +01:00
Bård Skaflestad b029419b3e Merge pull request #4351 from akva2/python_hpp_include 
add missing include
 2023-01-09 13:21:30 +01:00
Bård Skaflestad 0c07e27d26 Merge pull request #4350 from akva2/pinchmode_enum_class 
adjust to PinchMode now being an enum class
 2023-01-05 16:44:28 +01:00
Bård Skaflestad 63c6b102d4 Merge pull request #4349 from akva2/runspec_improvements 
Small Runspec improvements
 2023-01-05 14:14:21 +01:00
Bård Skaflestad 716ea14cb0 Merge pull request #4345 from akva2/fix_macro 
avoid double underscored symbol
 2023-01-03 17:14:29 +01:00
Bård Skaflestad 181a883370 Merge pull request #4344 from akva2/trim_iostream 
Trim some iostream includes
 2023-01-03 16:02:12 +01:00
Bård Skaflestad d58efe3bf9 Merge pull request #4343 from akva2/remove_sstream 
Remove sstream use in exception handling
 2023-01-02 16:37:33 +01:00
Bård Skaflestad be55de8176 Merge pull request #4338 from atgeirr/adjust-cpr-defaults 
Adjust cpr-related defaults
 2022-12-23 17:55:13 +01:00
Bård Skaflestad 2bc065fce6 Merge pull request #4337 from akva2/deferred_logger_no_sstream 
Avoid use of sstream in deferred logger header / macros
 2022-12-23 15:25:48 +01:00
Bård Skaflestad d9126d315d Merge pull request #4339 from akva2/cleanup_eval 
Evaluation cleanups
 2022-12-23 15:14:39 +01:00
Bård Skaflestad 8dcb37570b Rename Convergence Output Option 
This commit renames the previously introduced command line option
ExtraConvergenceOutput (--extra-convergence-output) into the more
descriptive

    OutputExtraConvergenceInfo (--output-extra-convergence-info)

Suggested by: [at]OPMUSER
 2022-12-20 12:32:14 +01:00
Bård Skaflestad 858ca8fa49 Output Non-Linear Convergence to Separate File if Requested 
This commit enables outputting non-linear convergence metrics, i.e.,
the MB and CNV values, per phase, for each non-linear iteration in
each timestep.  If the user passes the option value "iterations" to
the --extra-convergence-output command line option, this commit will
create a new output file, CASE.INFOITER, that holds

    * report step
    * time step within that report step
    * elapsed time
    * MB and CNV values per phase
    * well convergence status

for each non-linear iteration.

We use an asynchronous file writing procedure and confer ownership
of the report step's unprocessed convergence reports to this
procedure just before the end of

    SimulatorFullyImplicitBlackoilEbos::runStep()

At that point, the convergence reports are about to go out of scope.
The asynchronous protocol uses a dedicated queue of output requests,
class ConvergenceReportQueue, into which the producer-i.e., member
function runStep()-inserts new convergence reports and from which
the output thread, ConvergenceOutputThread::writeASynchronous(),
retrieves those requests before writing the file data.
 2022-12-20 10:14:13 +01:00
Bård Skaflestad 74811e8780 Merge pull request #4334 from akva2/msw_segments 
added: MultisegmentWellSegments
 2022-12-19 17:48:43 +01:00
Bård Skaflestad fe96a7181d Merge pull request #4333 from akva2/msw_primaries 
added: MultisegmentWellPrimaryVariables
 2022-12-19 14:01:29 +01:00
Bård Skaflestad c50cdc2454 Merge pull request #4331 from akva2/msw_avoid_mutable 
MultisegmentWell: avoid mutable primary variables
 2022-12-19 12:34:13 +01:00
Bård Skaflestad c42e0051e3 Merge pull request #4329 from blattms/treat-connection-not-attached-to-segments-correctly 
[bugfix,mswells] Throw for connections not attached to segments correctly.
 2022-12-16 17:12:27 +01:00
Bård Skaflestad 4827de23ce Merge pull request #4322 from bska/conditional-infostep-output 
Don't Output INFOSTEP File by Default
 2022-12-15 17:46:03 +01:00
Bård Skaflestad 63654a73fc Don't Output INFOSTEP File by Default 
This commit introduces a new helper class,

    ConvergenceOutputConfiguration

which parses comma separated option strings into a runtime
configuration object for whether to output additional convergence
information and, if so, what information to output.

Supported option string values are

  * "none"       -- Dont want any additional convergence output.

  * "steps"      -- Want additional convergence output pertaining to the
                    converged solution at the end of each timestep.

  * "iterations" -- Want additional convergence output pertaining to each
                    non-linar ieration in each timestep.

Option value "none" overrides all other options.  In other words, if the
user requests "none", then there will be no additional convergence
output, even if there are other options in the option string.

We add a new option, ExtraConvergenceOutput (command line option
--extra-convergence-output), which takes a string argument expected
to be a comma separated combination of these options.  The default
value is "none".  Finally, make the INFOSTEP file output conditional
on the user supplying "steps" as an argument to the new option.
 2022-12-15 13:02:09 +01:00
Bård Skaflestad 81650a620d Merge pull request #4320 from blattms/honor-multz--with-pinch 
Honor MULTZ- when determining TRANSZ over pinched cells (pinch all)
 2022-12-14 15:04:22 +01:00
Bård Skaflestad 44aaaf319e Merge pull request #4321 from akva2/use_common_exceptions 
use exception classes from opm-common
 2022-12-14 09:48:12 +01:00
Bård Skaflestad bb649097b9 Merge pull request #4317 from akva2/adjust_enums 
Adjust to upstream enum entry changes
 2022-12-12 23:57:09 +01:00
Bård Skaflestad 1de821ca62 Merge pull request #4314 from akva2/epsscalingpoints_encapsulate 
add missing include
 2022-12-12 09:43:36 +01:00
Bård Skaflestad ba54effb6a Merge pull request #4313 from akva2/epsgridprops_encapsulate 
RelpermDiagnostics: add more forwards
 2022-12-09 23:11:35 +01:00
Bård Skaflestad 4e3eea0447 Merge pull request #4312 from bska/capture-convergence-history 
Capture Timestep's Non-Linear Convergence History
 2022-12-09 16:36:30 +01:00
Bård Skaflestad 3c63a7aa6d Capture Timestep's Non-Linear Convergence History 
This enables outputting a formatted record of the limiting MB and
CNV quantities as time and non-linear iterations progress.  This, in
turn, is intended for diagnostic and analysis purposes and will not
be output unless specifically requested.

In particular, add a new type,

    ConvergenceReport::ReservoirConvergenceMetric

which captures the convergence metric type (MB or CNV) along with
the associate phase and numerical value of the convergence metric.
We add a vector of these convergence metric objects as a new data
member of the ConvergenceReport.

Finally, foreshadowing the intended use case, also store the report
time in the ConvergenceReport object.
 2022-12-09 16:22:36 +01:00
Bård Skaflestad 8997437ede Merge pull request #4305 from bska/activate-welpi-regression-tests 
Enable Regression Testing of WELPI and CPI/CTFAC
 2022-12-09 16:19:48 +01:00
Bård Skaflestad 364b87afc9 Enable Regression Testing of WELPI and CPI/CTFAC 
Forgotten at the time we developed the WELPI support.
 2022-12-09 13:09:02 +01:00
Bård Skaflestad f42beb24f4 Merge pull request #4303 from akva2/remove_material 
adjust jenkins script and buildsystem
 2022-12-09 12:48:35 +01:00
Bård Skaflestad de84ea65a7 Merge pull request #4251 from GitPaean/fixing_singluar_frictional_pressure_drop 
rewrting frictionPressureLoss fucntion for better jacobian matrix
 2022-12-09 11:04:33 +01:00
Bård Skaflestad 1221936791 Merge pull request #4311 from bska/publish-component-names 
Capture Component Names in Independent Datastructure
 2022-12-09 10:13:42 +01:00
Bård Skaflestad 149ae34dd2 Capture Component Names in Independent Datastructure 
This is in preparation of enabling separate convergence output
for diagnostic purposes.
 2022-12-09 09:41:22 +01:00
Bård Skaflestad 58cf299171 Merge pull request #4306 from akva2/msw_assemble 
add: MultisegmentWellAssemble
 2022-12-05 15:45:23 +01:00
Bård Skaflestad 4f38217fc8 Merge pull request #4302 from akva2/msw_equations 
Added: MultisegmentWellEquations
 2022-12-05 11:05:31 +01:00
Bård Skaflestad e7b620dcb2 Merge pull request #4278 from tskille/supported_keyw 
Updates related to unsupported keywords and options
 2022-12-02 14:02:15 +01:00
Bård Skaflestad a57d73336d Merge pull request #4304 from GitPaean/fixing_cpi_output 
using correct CPI indices for connections in WellState::reportConnections()
 2022-12-01 16:15:36 +01:00
Bård Skaflestad 2e15513b43 Merge pull request #4300 from akva2/msw_simplify_invert 
MSWellHelpers: reverse order of template parameters
 2022-12-01 00:02:35 +01:00
Bård Skaflestad 79c8bc75bc Merge pull request #4299 from akva2/remove_test_ecl_output 
remove test_ecl_output
 2022-11-30 16:39:41 +01:00
Bård Skaflestad 70027d541e Merge pull request #4298 from tskille/gridunit_regtesting 
add regression testing for grid unit models
 2022-11-30 11:19:37 +01:00
Bård Skaflestad 06b48193b9 Merge pull request #4261 from bska/declare-wrftlplt-supported 
Promote Segment Data in WRFTPLT to Supported Status
 2022-11-28 14:50:22 +01:00
Bård Skaflestad e3d05d1129 Promote Segment Data in WRFTPLT to Supported Status 
While there are a few arrays we admittedly don't create, the level
of support is now sufficiently complete that declaring values other
than 'NO' as "supported" is warranted.
 2022-11-28 11:33:34 +01:00
Bård Skaflestad fe7da56268 Merge pull request #4293 from akva2/stdwell_conn 
added: StandardWellConnections
 2022-11-25 15:31:53 +01:00
Bård Skaflestad a66b9a008e Merge pull request #4294 from akva2/stdwell_avoid_mutable 
StandardWell: avoid mutable primary variables
 2022-11-25 15:12:00 +01:00
Bård Skaflestad 669c68d803 Merge pull request #4286 from akva2/no_deck_in_simulator 
Remove Deck member from simulators
 2022-11-24 13:46:52 +01:00
Bård Skaflestad aabf00a3ad Merge pull request #4285 from akva2/use_internalized_thpresft 
Use internalized THPRESFT
 2022-11-24 12:07:19 +01:00
Bård Skaflestad f401540e22 Merge pull request #4284 from akva2/remove_check_deck 
changed: remove EclProblem::checkDeckCompatibility
 2022-11-24 10:30:12 +01:00
Bård Skaflestad e524acd5b2 Merge pull request #4283 from akva2/stdwellass_simplify 
StandardWellAssemble: simplify by using primary variables class
 2022-11-23 23:29:42 +01:00
Bård Skaflestad 5b69890ece Report Solution GOR and OGR at Segment Level 
This enables calculating the SOFRF and SGFRF summary vectors.
 2022-11-22 18:06:05 +01:00
Bård Skaflestad fa1ea7f997 Merge pull request #4282 from totto82/fixInjTemp2 
remove derivative in thermal flux for injectors
 2022-11-22 17:29:24 +01:00