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
11,653 Commits 31 Branches 117 Tags
68add695fefed44e2b63b9b856cc56f61af2bfc2
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen 68add695fe Merge pull request #2735 from hakonhagland/python_step2 
Implements a Python step() method.
 2020-09-22 15:47:48 +02:00
Atgeirr Flø Rasmussen 04732f596b Merge pull request #2794 from bska/prepare-nodepress-smry-output 
Chase Group/Node Summary API Update
 2020-09-21 09:21:46 +02:00
Atgeirr Flø Rasmussen 8dffd39b0a Rewrite communicateGroupRates() to do a single sum(). 2020-09-18 09:50:41 +02:00
Atgeirr Flø Rasmussen 0816e21846 Merge pull request #2787 from akva2/fix_optional_deserialization 
Fix optional deserialization
 2020-09-16 09:41:53 +02:00
Atgeirr Flø Rasmussen 76384344ca Merge pull request #2777 from GitPaean/adding_well_assembly_timing 
adding timing for the well assembly
 2020-09-08 16:02:16 +02:00
Atgeirr Flø Rasmussen 3dffb5d4da Use log mechanism for info output, and tell the user the deck has been read. 2020-09-03 15:11:25 +02:00
Atgeirr Flø Rasmussen 92bdcbf597 Reinstate lost logging of header and parameters. 
Also re-add the ability to do strict parsing.
 2020-09-03 14:07:33 +02:00
Atgeirr Flø Rasmussen 4f7421d64d Merge pull request #2746 from bska/restart-active-group-constraints 
Restore Groups' Active Constraints on Restart
 2020-09-03 10:35:55 +02:00
Atgeirr Flø Rasmussen 8d999ad448 Merge pull request #2664 from GitPaean/addinginneritartionsstdwell 
Adding inner iterations for standard wells.
 2020-08-11 16:37:00 +02:00
Atgeirr Flø Rasmussen 3a0469cde1 Merge pull request #2704 from bska/remove-basic-warning 
Cell Data: Don't Warn About Supported Output Directives
 2020-07-28 15:52:59 +02:00
Atgeirr Flø Rasmussen af413f474c Merge pull request #2715 from atgeirr/fix-opencl-cmake 
Fix CMake variable case bug.
 2020-07-28 13:17:13 +02:00
Atgeirr Flø Rasmussen 0205f54caf Fix CMake variable case bug. 
This caused compile failure on a system without the c++ OpenCL binding header cl.hpp.
 2020-07-28 12:42:55 +02:00
Atgeirr Flø Rasmussen f2395f6d94 Merge pull request #2695 from totto82/addBrineOutput 
Add brine to output
 2020-07-01 11:46:23 +02:00
Atgeirr Flø Rasmussen a66260fe87 Merge pull request #2684 from totto82/convertUsingPriviousRates 
use rates from previous time-step in the guiderate conversion
 2020-07-01 11:04:22 +02:00
Atgeirr Flø Rasmussen 4448d8f5ed Merge pull request #2691 from bska/prepare-guiderate-smry 
EclWriter: Refactor Cell Loop out to Helper Function
 2020-07-01 10:48:03 +02:00
Atgeirr Flø Rasmussen 3554fae75b Merge pull request #2693 from totto82/addOilWaterBrine 
Add oil water brine specialization
 2020-07-01 09:58:45 +02:00
Atgeirr Flø Rasmussen c94eec872f Allow well operators with FlexibleSolver. 2020-06-30 12:33:57 +02:00
Atgeirr Flø Rasmussen 8b67b23c6e Merge pull request #2687 from atgeirr/improve-preconditioner-factory 
Make ghost-last feature available in PreconditionerFactory.
 2020-06-26 14:38:42 +02:00
Atgeirr Flø Rasmussen c59f4f7118 Make ghost-last feature available in PreconditionerFactory. 2020-06-25 10:56:11 +02:00
Atgeirr Flø Rasmussen 02be5d1ced Merge pull request #2686 from atgeirr/separate-wellops 
Move well operators to separate file, and generalize
 2020-06-25 10:53:04 +02:00
Atgeirr Flø Rasmussen c2c79f0903 Move well operators to separate file. 
Also introduce new class WellModelAsLinearOperator making a well model
into an actual Dune::LinearOperator, this prevents the TypeTag dependent
type from leaking into the type of the WellModelMatrixAdapter instantiation.

As a side benefit, the adapter classes can now adapt (i.e. combine with a
matrix operator) any linear operator.
 2020-06-25 10:13:12 +02:00
Atgeirr Flø Rasmussen 7a69db02de Merge pull request #2685 from blattms/fix-owner-cells-not-first 
Alternative fix running in parallel with --owner-cells-first=false
 2020-06-25 00:29:58 +02:00
Atgeirr Flø Rasmussen d3efb01e89 Merge pull request #2645 from hakonhagland/refac_fullyimpl 
Refactor run() in `SimulatorFullyImplicitBlackoilEbos.hpp`
 2020-06-24 16:35:09 +02:00
Atgeirr Flø Rasmussen 3766f19de3 Merge pull request #2680 from atgeirr/minor-flexible-solver-improvements 
Minor flexible solver improvements
 2020-06-21 14:37:01 +02:00
Atgeirr Flø Rasmussen c58456faae Add missing include. 2020-06-20 16:28:59 +02:00
Atgeirr Flø Rasmussen 427eac5132 Use macro for instantiations, and clean up includes. 2020-06-19 16:37:43 +02:00
Atgeirr Flø Rasmussen 171656144f Install FlexibleSolver_impl.hpp for downstream users. 2020-06-19 16:04:27 +02:00
Atgeirr Flø Rasmussen fb99dd6fee Use unique_ptr rather than shared_ptr. 2020-06-19 16:03:46 +02:00
Atgeirr Flø Rasmussen 226697ec6f Merge pull request #2679 from akva2/janitoring 
make parseSuccess dependent on MPI
 2020-06-19 15:10:38 +02:00
Atgeirr Flø Rasmussen 5105b80e50 Merge pull request #2667 from atgeirr/flexible-solver-separate-compile-unit 
Use explicit instantiation for FlexibleSolver to reduce compile times.
 2020-06-19 15:03:30 +02:00
Atgeirr Flø Rasmussen faddef0321 Do not instantiate things requiring MPI when HAVE_MPI is false. 2020-06-19 10:01:16 +02:00
Atgeirr Flø Rasmussen 678756b9e1 Merge pull request #2678 from joakim-hove/fix-sequential 
Add actionState argument also for non MPI branch
 2020-06-19 06:54:16 +02:00
Atgeirr Flø Rasmussen e4ea932a9d Merge pull request #2661 from totto82/fixUpwindMSW_clean 
Fix upwinding for friction, acceleration, valve and SIGD for MSW
 2020-06-18 11:40:31 +02:00
Atgeirr Flø Rasmussen dcd5d21415 Split constructor to reduce instantiation. 
Without the split, certain combinations with Dune::Amg::SequentialInformation
as template argument for Comm needlessly get instantiated.
 2020-06-18 08:28:20 +02:00
Atgeirr Flø Rasmussen 3784ab9d77 Amended copyrights and made the _impl.hpp a proper header file. 2020-06-17 21:07:13 +02:00
Atgeirr Flø Rasmussen f24b2cd708 Split instantiation files to enable parallel build. 2020-06-17 13:03:57 +02:00
Atgeirr Flø Rasmussen 2dc2e053d1 Change order of constructor arguments. 
This allows simplification, and having just two constructors.
 2020-06-17 09:31:19 +02:00
Atgeirr Flø Rasmussen a6d186551b Use explicit instantiation for FlexibleSolver to reduce compile times. 2020-06-17 07:43:30 +02:00
Atgeirr Flø Rasmussen 9c552ec812 Merge pull request #2675 from totto82/changeRstTest 
change MSW restart test to read the schedule
 2020-06-16 19:48:13 +02:00
Atgeirr Flø Rasmussen 16a599684d Merge pull request #2672 from akva2/fix_harmless_ubsan 
changed: delay deck dereference
 2020-06-15 10:42:44 +02:00
Atgeirr Flø Rasmussen dd8e42958a Prettifying and reducing log output from MSW. 2020-06-10 16:36:17 +02:00
Atgeirr Flø Rasmussen 1afbe4b0a8 Merge pull request #2659 from akva2/move_timestamp 
changed: move moduleVersion to a separate object library
 2020-06-08 12:51:56 +02:00
Atgeirr Flø Rasmussen e8f49d61a3 Merge pull request #2646 from atgeirr/fix-closing-wells-after-chopping 
Fix bug in well closing, and allow more chopping by default.
 2020-06-02 19:17:31 +02:00
Atgeirr Flø Rasmussen a75d21e403 Fix bug in well closing, and allow more chopping by default. 2020-06-02 12:44:46 +02:00
Atgeirr Flø Rasmussen 6f1a159adc Merge pull request #2611 from totto82/improveConvergenceMSW 
Improve convergence msw
 2020-05-30 17:00:30 +02:00
Atgeirr Flø Rasmussen b5bee4d114 Treat zero rate case for VFP tables. 2020-05-29 14:06:51 +02:00
Atgeirr Flø Rasmussen dba1b46e8c Merge pull request #2643 from atgeirr/fix-casename 
Always create proper case name.
 2020-05-29 13:48:18 +02:00
Atgeirr Flø Rasmussen 300bd7d81a Merge pull request #2641 from atgeirr/bump-version 
Bump version number
 2020-05-29 13:35:20 +02:00
Atgeirr Flø Rasmussen cdbbdd828e Always create proper case name. 
Without this, rank 0 gets an empty case name, resulting in
buggy VTK output with filenames containing the genereric stem
"sim" rather than the case name as stem.
 2020-05-29 10:28:42 +02:00
Atgeirr Flø Rasmussen 2261c1ee74 Merge pull request #2637 from hnil/hide_vtk 
Hide vtk
 2020-05-29 08:21:31 +02:00
Atgeirr Flø Rasmussen 432dd31af8 Bump version number 2020-05-28 16:50:44 +02:00
Atgeirr Flø Rasmussen 20c63f9f49 Merge pull request #2624 from OPM/fix/adapt-to-propertysystem-changes 
adapt to changes in the property system
 2020-05-28 12:05:17 +02:00
Atgeirr Flø Rasmussen 83cafe9517 Merge pull request #2632 from atgeirr/add-printvfp-util 
Add a small utility to print a slice of a VFP table.
 2020-05-27 09:34:22 +02:00
Atgeirr Flø Rasmussen 62a689944d Merge pull request #2634 from joakim-hove/default-restart-init 
Default to initialize from restart file in case of restarted run
 2020-05-26 13:04:12 +02:00
Atgeirr Flø Rasmussen 13181925fd Merge pull request #2635 from bska/remove-unused-variable 
Check GCONSALE Limits: Remove Unused Variable
 2020-05-25 08:46:40 +02:00
Atgeirr Flø Rasmussen cb3165e681 Add a small utility to print a slice of a VFP table. 2020-05-20 11:27:28 +02:00
Atgeirr Flø Rasmussen 94ea40b253 Merge pull request #2619 from hakonhagland/refactor_execute 
Refactor `execute()` in `FlowMainEbos.hpp`
 2020-05-19 13:58:10 +02:00
Atgeirr Flø Rasmussen 77132af517 Merge pull request #2623 from atgeirr/fix-wrong-message 
Correct messages for group control switching.
 2020-05-15 11:32:09 +02:00
Atgeirr Flø Rasmussen 5aa2a785af Correct messages for group control switching. 2020-05-14 17:31:21 +02:00
Atgeirr Flø Rasmussen 53e11899fd Merge pull request #2621 from akva2/janitoring 
Some janitoring
 2020-05-14 17:04:31 +02:00
Atgeirr Flø Rasmussen 35cf505d14 Merge pull request #2618 from blattms/actually-use-trueimpes-for-cpr-trueimpes 
Use "trueimpes" for weight_type for configuration cpr_trueimpes.
 2020-05-14 09:57:12 +02:00
Atgeirr Flø Rasmussen 883b987837 Set default smoother relaxation to 1.0. 2020-05-13 17:08:38 +02:00
Atgeirr Flø Rasmussen ebce35b318 Add specialization for ParallelOverlappingILU0. 2020-05-13 17:08:38 +02:00
Atgeirr Flø Rasmussen 654fbf864e Merge pull request #2609 from hakonhagland/refactor_flowebos2 
Refactors flow_ebos_blackoil.cpp (2)
 2020-05-13 15:04:23 +02:00
Atgeirr Flø Rasmussen bf0e7f0e4a Split file to ensure correct authorship and license is applied. 2020-05-13 13:53:45 +02:00
Atgeirr Flø Rasmussen df58d44f70 Merge pull request #2612 from blattms/fix-flexible-parallel-verbosity 
Make only rank zero honor verbosity in flexible solvers.
 2020-05-13 08:41:01 +02:00
Atgeirr Flø Rasmussen 7beabdb9fb Merge pull request #2599 from atgeirr/improve-matrix-output 
Improvements to matrix writing facility.
 2020-05-08 15:41:33 +02:00
Atgeirr Flø Rasmussen 329036612b Enable matrix dumping also without MPI. 
Also remove the need for the reinterpret_cast by adding some extra
implementation details for more general block matrices.
 2020-05-08 13:32:36 +02:00
Atgeirr Flø Rasmussen 1e0b1b4a2b Merge pull request #2598 from atgeirr/timestepreport-revised 
Add writing detailed performance report
 2020-05-08 12:41:23 +02:00
Atgeirr Flø Rasmussen d108f9afa6 Avoid file-ending starting with S or A to not confuse comparison program. 2020-05-08 11:56:52 +02:00
Atgeirr Flø Rasmussen cf7b258f72 Minor adjustments from review. 2020-05-08 09:21:25 +02:00
Atgeirr Flø Rasmussen 561bec4a64 Make CASENAME.STEPINFO the name of the step info report file. 2020-05-07 22:29:01 +02:00
Atgeirr Flø Rasmussen 9458357009 Use = rather than += when appropriate for reports. 2020-05-07 22:09:17 +02:00
Atgeirr Flø Rasmussen 9dd2275af9 Remove seconds and add timestep to ITERINFO report. 2020-05-07 21:19:31 +02:00
Atgeirr Flø Rasmussen 769028b591 Remove 'verbosity' member and reorganize. 2020-05-07 21:00:39 +02:00
Atgeirr Flø Rasmussen 8dd53a38e9 Refactor SimulatorReport system. 
Now SimulatorReport object contains a vector of SimulatorReportSingle objects,
for both successful and failing steps.
 2020-05-07 16:13:39 +02:00
Atgeirr Flø Rasmussen cfdb2b9be6 Modifications of formatting, compile fix. 2020-05-07 15:04:20 +02:00
Atgeirr Flø Rasmussen 9476dfc35a Merge pull request #2594 from atgeirr/writematrix-revised 
Add a writeSystem() helper and use it to write system matrices.
 2020-05-07 09:07:07 +02:00
Atgeirr Flø Rasmussen 9357919201 Do not run setupParameter_() twice for the static-typed sims. 2020-05-05 16:19:10 +02:00
Atgeirr Flø Rasmussen 7dbbc0f2e5 Merge pull request #2588 from totto82/addMinMaxSupportGCONSALE 
Implement min/max for GCONSALE
 2020-05-05 15:46:36 +02:00
Atgeirr Flø Rasmussen 859db45e45 Merge pull request #2590 from totto82/fixSolventRein 
Fix solvent reinjection when different reinjection group is given
 2020-05-05 11:36:50 +02:00
Atgeirr Flø Rasmussen f0b1ee76b8 Ensure that the typetag used for initialization is correct. 
Without this, properties set in the static variants of flow such as
flow_blackoil_dunecpr.cpp will be honored in the run. However, the
text for '--help' and the property printout in the .DBG file will not
reflect the true type tag, but the default.

This bug was added during the recent refactoring of all Flow variants
to use the same initialization and setup code.
 2020-05-04 08:52:49 +02:00
Atgeirr Flø Rasmussen 8b77d68d9c Merge pull request #2572 from bska/prune-unused 
Remove Unused 'currentControl' Variable
 2020-04-28 08:09:17 +02:00
Atgeirr Flø Rasmussen 14bde098ce Merge pull request #2570 from blattms/fix-prec-factory-dune-master 
Complete future-proofing ILU usage in the preconditioner factory.
 2020-04-27 16:37:27 +02:00
Atgeirr Flø Rasmussen 06e5e6b6ac Merge pull request #2565 from totto82/avoidOscNupcol 
use nupcol to avoid oscillation between group controls
 2020-04-27 16:02:32 +02:00
Atgeirr Flø Rasmussen 6684cd7cb3 Merge pull request #2564 from totto82/fixGCONSALE 
Fix GCONSALE
 2020-04-27 15:59:29 +02:00
Atgeirr Flø Rasmussen a720bf9942 Add logging of linear solver parameter tree. 2020-04-24 14:52:04 +02:00
Atgeirr Flø Rasmussen c4e020c179 Merge pull request #2556 from totto82/test_atg 
Fix how the group reduction works
 2020-04-24 11:13:22 +02:00
Atgeirr Flø Rasmussen 196d6c95ec Merge pull request #2530 from bska/equil-subdiv-fipcalc 
Equilibration: Add Experimental Support for Horizontal Subdivision
 2020-04-23 16:50:41 +02:00
Atgeirr Flø Rasmussen 0df3a96fa6 Fix how group rate reductions work. 2020-04-23 09:39:03 +02:00
Atgeirr Flø Rasmussen 92d404de96 Merge pull request #2541 from joakim-hove/group-controls-update 
Check availability for group control separately for inj/prod
 2020-04-17 16:40:31 +02:00
Atgeirr Flø Rasmussen a1091bd718 Stop simulating if the schedule has set an exit condition. 
The program will return the value set in the EXIT keyword.
 2020-04-16 15:42:17 +02:00
Atgeirr Flø Rasmussen 88525f7c39 Merge pull request #2516 from hakonhagland/refactor_flow_run 
Refactor main() in flow.cpp.
 2020-04-16 13:28:03 +02:00
Atgeirr Flø Rasmussen 07d9ec135b Make Main a non-template class again, simplify. 2020-04-16 11:35:01 +02:00
Atgeirr Flø Rasmussen b7902ebfda Merge pull request #2539 from blattms/remove-stale-cpr-files 
Removes stale CPR headers that have been superseeded.
 2020-04-16 08:51:24 +02:00
Atgeirr Flø Rasmussen 2159a83b49 Merge pull request #2524 from hakonhagland/flow_tag2 
Refactor away flow_tag.hpp
 2020-04-15 17:16:05 +02:00
Atgeirr Flø Rasmussen 7e1f8ecb8a Merge pull request #2527 from bska/refactor-equilibration 
Refactor Equilibration Procedure
 2020-04-15 13:30:38 +02:00
Atgeirr Flø Rasmussen 302474ade6 Merge pull request #2535 from hakonhagland/flow_tag_new_try 
Merge flow_tag.hpp into Main.hpp (new try)
 2020-04-15 13:29:59 +02:00
Atgeirr Flø Rasmussen e7e4cf6f20 Silence warnings and fix whitespace. 2020-04-08 10:41:20 +02:00
Atgeirr Flø Rasmussen 0c8ce54b71 Merge pull request #2498 from blattms/cherry-pick-hnil-flexible-clean-interface-rebased 
Cleaned up flexible solver improvements.
 2020-04-02 15:28:10 +02:00