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
2,218 Commits 31 Branches 117 Tags
702cd3170a7116e3e494cf477b0929d3daba00d0
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen 702cd3170a Remove unused code and fix a few warnings. 2015-12-01 00:06:44 +01:00
Atgeirr Flø Rasmussen 4dd8536afa Make multi-segment model use Base::addWellContribution...() method. 
Also make assemble() more similar to base version, using the
extractWellPerfProperties() member from Base.

To do this it was necessary to change the well_cells member of the
WellOps to be correct for the multi-segment wells (since they may
have different perforation order for some wells).
 2015-12-01 00:06:44 +01:00
Atgeirr Flø Rasmussen 44f36c45cf Add well_cells to WellOps to avoid recreating. 2015-12-01 00:06:44 +01:00
Atgeirr Flø Rasmussen b2787e24e7 Use value() in argument to make Selector constructor compile. 2015-12-01 00:06:44 +01:00
Atgeirr Flø Rasmussen 920eeed3b2 Improve assemble() with new method extractWellPerfProperties(). 2015-12-01 00:06:44 +01:00
Atgeirr Flø Rasmussen 653e55d7db Make assemble() more similar to base version. 2015-12-01 00:06:44 +01:00
Atgeirr Flø Rasmussen e6a81fca83 Make convergence methods work for multi-segment wells. 
The convergenceReduction() method no longer takes a number-of-wells argument,
instead it infers the number of well fluxes to check from the size of the
well_flux_eq member of the residual.

After this, a custom getConvergence() method is no longer required for the
multi-segment well model.
 2015-12-01 00:06:44 +01:00
Atgeirr Flø Rasmussen 1c4f4c646d Add asImpl() to some method calls. 
This enables those methods (mostly well related) to be used polymorphically.
 2015-12-01 00:06:44 +01:00
Atgeirr Flø Rasmussen ae512d5c83 Update location of ErrorMacros.hpp header in includes. 2015-12-01 00:06:44 +01:00
Atgeirr Flø Rasmussen 9e664abe6e Add a TODO comment to updateWellControls(). 2015-12-01 00:06:44 +01:00
Atgeirr Flø Rasmussen fce7247da5 Update the SolutionState's qs and bhp members. 
This way they can be used instead of repeatedly extracting the top segment data,
which also could make it possible to use more of the existing implementation.
 2015-12-01 00:06:44 +01:00
Atgeirr Flø Rasmussen 9c1c87a040 Remember to initialize the data members. 2015-12-01 00:06:44 +01:00
Atgeirr Flø Rasmussen f2c812fb3a Made WellStateMultiSegment use inheritance properly. 
Use base class' data members (via public methods),
also change method names to match existing ones.
 2015-12-01 00:06:44 +01:00
Atgeirr Flø Rasmussen 7aa2672a14 Add TODO comment. 2015-12-01 00:06:44 +01:00
Atgeirr Flø Rasmussen 5d5ae7d271 Further silencing of warnings. 2015-12-01 00:06:44 +01:00
Atgeirr Flø Rasmussen 15fd5dad47 Suppress warnings in the multisegment well code. 2015-12-01 00:06:44 +01:00
Atgeirr Flø Rasmussen c91e144a1d Merge pull request #548 from atgeirr/silence-warning 
Move boost include inside warning-suppressed block.
 2015-11-30 14:17:15 +01:00
Atgeirr Flø Rasmussen 88280c1207 Move boost include inside warning-suppressed block. 2015-11-30 14:15:19 +01:00
Atgeirr Flø Rasmussen 226e414380 Merge pull request #542 from andlaus/implement_MULTFLT_in_SCHEDULE_section 
implement abililty to change the geology during the simulation run
 2015-11-27 13:39:32 +01:00
Atgeirr Flø Rasmussen 315862ddd4 Merge pull request #545 from atgeirr/fix-min-iter 
Honor the min_iter parameter.
 2015-11-27 10:19:26 +01:00
Atgeirr Flø Rasmussen 979107ac4b Merge pull request #543 from totto82/new_trans 
Use cell centers based on cell corners
 2015-11-27 10:18:00 +01:00
Atgeirr Flø Rasmussen 99fd5e977f Remove assert() that is now wrong due to minIter() treatment. 2015-11-25 11:08:10 +01:00
Atgeirr Flø Rasmussen 9275070bad Honor the min_iter parameter. 
This also required the minIter() accessor to be made public,
so made all of the remaining accessors public.
 2015-11-24 16:09:01 +01:00
Atgeirr Flø Rasmussen a06892a070 Add asImpl() to method calls. 
This is needed by derived models.
 2015-11-19 14:39:49 +01:00
Atgeirr Flø Rasmussen 9bf79f6974 Merge pull request #506 from andlaus/thpress_from_initial 
adapt to the threshold pressure related API changes
 2015-11-17 09:03:08 +01:00
Atgeirr Flø Rasmussen 88fbe5e9b6 Ensure non-null model in constructor. 2015-11-13 15:08:00 +01:00
Atgeirr Flø Rasmussen 2a0051655c Merge pull request #520 from totto82/surface_dens 
Support for non-constant surface densities
 2015-11-13 11:40:30 +01:00
Atgeirr Flø Rasmussen 87330984aa Adapt to renaming of class. 2015-11-12 17:55:13 +01:00
Atgeirr Flø Rasmussen 29a1a891d2 Make nonlinearIteration() the only interface to the model. 
This means that details such as calling assemble(), solveJacobianSystem(),
updateState() etc. are now left to the model class. This will make it easier
to create new model classes with different behaviour (such as sequential models).
 2015-11-12 17:47:18 +01:00
Atgeirr Flø Rasmussen 7c21a630e5 Rename NewtonSolver -> NonlinearSolver. 2015-11-12 17:42:47 +01:00
Atgeirr Flø Rasmussen 9a4bb383df Merge pull request #538 from atgeirr/silence-warning 
Silence unused argument warning.
 2015-11-12 17:38:49 +01:00
Atgeirr Flø Rasmussen ea8eab6e66 Silence unused argument warning. 2015-11-12 17:38:07 +01:00
Atgeirr Flø Rasmussen d3db342085 Merge pull request #529 from dr-robertk/PR/adaptive-timestepping-revision 
BlackOilModelBase: revision of adaptive time stepping.
 2015-11-12 17:23:15 +01:00
Atgeirr Flø Rasmussen a8227f977e Modify test to trigger on buggy behaviour in AutoDiff. 2015-11-10 13:37:36 +01:00
Atgeirr Flø Rasmussen 5977590e70 Bugfix for scalar AutoDiff class. 
Missing chain-rule usage in Scalar/AD operator.
 2015-11-10 13:37:36 +01:00
Atgeirr Flø Rasmussen 7c620f11fd Add flow_solvent to list of programs to be installed. 2015-11-05 08:33:14 +01:00
Atgeirr Flø Rasmussen ef41a0db02 Merge pull request #522 from dr-robertk/PR/paralleldebugoutput-wells-init 
ParallelDebugOutput: initialize wells with current report step number.
 2015-10-28 21:14:38 +01:00
Atgeirr Flø Rasmussen 8fe406b73c Merge pull request #523 from blattms/use-local-material-manager-by-communication 
Use local material manager by communication
 2015-10-28 21:14:16 +01:00
Atgeirr Flø Rasmussen 8e5c9b77ea Merge pull request #518 from blattms/communicate-rock-properties 
Communicate rock properties, too.
 2015-10-28 16:36:38 +01:00
Atgeirr Flø Rasmussen 38bd6b1484 Merge pull request #519 from blattms/fix-parallel-equation-scaling-factor 
Correctly compute the scaling factor for the equations in parallel.
 2015-10-28 16:35:47 +01:00
Atgeirr Flø Rasmussen 235570410d Bump version and unify format of dune.module. 2015-10-23 13:18:47 +02:00
Atgeirr Flø Rasmussen 0ffcaeb9f0 Merge pull request #513 from atgeirr/add-moduleversion 
Add moduleVersion() utility and update dune.version.
 2015-10-23 13:10:38 +02:00
Atgeirr Flø Rasmussen bb7530edc3 Add and use moduleVersion() utility. 2015-10-23 11:25:06 +02:00
Atgeirr Flø Rasmussen 6636d8e566 Update dune.module with correct deps and version. 2015-10-23 11:12:39 +02:00
Atgeirr Flø Rasmussen a362f2cf09 Merge pull request #509 from joakim-hove/use-opm-data 
Use opm data
 2015-10-21 21:57:45 +02:00
Atgeirr Flø Rasmussen f15be17d14 Merge pull request #508 from joakim-hove/cpr-config 
Changes to solver approach configuration:
 2015-10-21 13:04:58 +02:00
Atgeirr Flø Rasmussen 1028af6aff Merge pull request #507 from akva2/update_redhat_packaging 
update redhat packaging
 2015-10-20 18:34:10 +02:00
Atgeirr Flø Rasmussen a106ef0636 Merge pull request #504 from akva2/update_debian_packaging 
update debian packaging
 2015-10-20 10:20:02 +02:00
Atgeirr Flø Rasmussen 9cbae76d06 Merge pull request #503 from babrodtk/openpm_experiment 
Added/fixed comments
 2015-10-20 09:32:30 +02:00
Atgeirr Flø Rasmussen 98a3d1675a Merge pull request #454 from babrodtk/openpm_experiment 
Parallel assembly (partial)
 2015-10-19 15:32:50 +02:00
Atgeirr Flø Rasmussen 2bf42e1eb2 Merge pull request #494 from totto82/crossflow 
Add support for banning cross-flow in a well
 2015-10-19 14:41:17 +02:00
Atgeirr Flø Rasmussen 0f40727fa2 Merge pull request #502 from atgeirr/new-arg-add-well 
Add "allow crossflow" argument to add_well() calls.
 2015-10-15 10:04:09 +02:00
Atgeirr Flø Rasmussen 67f1def789 Add "allow crossflow" argument to add_well() calls. 2015-10-15 09:54:53 +02:00
Atgeirr Flø Rasmussen df668cc5e7 Merge pull request #497 from andlaus/error_macros_to_opm_common 
Error macros to opm common
 2015-10-12 13:31:54 +02:00
Atgeirr Flø Rasmussen 57dfce29be Merge pull request #499 from blattms/remove-source-file-for-flow_cp-and-rename-to-flow_parallel 
Renamed flow_cp to flow_mpi
 2015-10-12 11:18:14 +02:00
Atgeirr Flø Rasmussen 6170542e2f Fix compile warning and error message. 2015-10-09 13:49:00 +02:00
Atgeirr Flø Rasmussen 46afd22860 Merge pull request #496 from dr-robertk/PR/variable-np-in-newton 
NewtonBlackølInterationInterleaved: allow np to be variable.
 2015-10-09 13:43:39 +02:00
Atgeirr Flø Rasmussen 9be05f4206 Undo changes to NewtonIterationsBlackoilInterleaved. 2015-10-08 15:11:50 +02:00
Atgeirr Flø Rasmussen 9e3d360b5b Silence warnings (shadowing and unused argument). 2015-10-07 10:07:45 +02:00
Atgeirr Flø Rasmussen 68caa026d9 Merge pull request #487 from totto82/solventModel 
Changes to the solvent model
 2015-10-06 11:19:58 +02:00
Atgeirr Flø Rasmussen 64c5b29b87 Merge pull request #492 from atgeirr/refactor-convergence-report 
Refactor convergence reduction and report
 2015-10-06 10:03:37 +02:00
Atgeirr Flø Rasmussen 85d7f6c904 Merge pull request #482 from babrodtk/autodiffmatrix_documentation 
Autodiffmatrix beautification
 2015-10-02 12:48:16 +02:00
Atgeirr Flø Rasmussen 39a0766b8c Refactor MPI version of convergenceReduction(). 2015-10-01 11:05:35 +02:00
Atgeirr Flø Rasmussen d29ee6967c Also refactor getWellConvergence() like getConvergence(). 2015-09-30 15:20:04 +02:00
Atgeirr Flø Rasmussen dcb78877eb Separate phase and material concepts. 2015-09-30 14:44:50 +02:00
Atgeirr Flø Rasmussen 01f7e48693 Implement numPhases() by phase_name_.size(). 
This makes it easier for derived models to add a phase.
 2015-09-30 13:46:57 +02:00
Atgeirr Flø Rasmussen 67ac59288d Make numPhases() calls use asImpl(). 2015-09-30 13:28:08 +02:00
Atgeirr Flø Rasmussen 3d86b9b619 Refactor getWellConvergence() similar to getConvergence(). 2015-09-30 13:28:08 +02:00
Atgeirr Flø Rasmussen 6a0964851c Make convergence checks and output work with active phases. 2015-09-30 13:28:08 +02:00
Atgeirr Flø Rasmussen 4f72bfdbcf Added phaseName() method. 2015-09-30 13:28:08 +02:00
Atgeirr Flø Rasmussen aac34009e1 Use active and not canonical phases in getConvergence() etc. 2015-09-30 13:28:08 +02:00
Atgeirr Flø Rasmussen 57deb18dc4 Merge pull request #484 from dr-robertk/PR/Parallel-output-only-in-parallel-runs 
ParallelDebugOutput: only use parallel output when mpi size > 1.
 2015-09-30 09:42:28 +02:00
Atgeirr Flø Rasmussen 5c8b6702e7 Merge pull request #491 from blattms/fix-hydrostatic-corrections-for-unperforated-wells 
Return 0 as hydrostatic correction for unperforated cells.
 2015-09-28 11:23:14 +02:00
Atgeirr Flø Rasmussen 1f6d957cd4 Change the way the interleaved matrix is built. 
Note that this implementation may not be robust since the getSparse()
method throws if the AutoDiffMatrix is not of general sparse type (S),
 2015-09-17 15:59:56 +02:00
Atgeirr Flø Rasmussen 2d4c10d919 Silence unused argument warning. 2015-09-17 14:56:59 +02:00
Atgeirr Flø Rasmussen e49f852b98 Merge pull request #477 from dr-robertk/PR/terminal-output-in-parallel 
SolverFullyImpl: avoid multiple output of redundant information in parallel.
 2015-09-16 18:43:45 +02:00
Atgeirr Flø Rasmussen 57840a3153 Merge pull request #479 from akva2/fix_sibling_builds 
fixed: make sure opm-common can be (re-)found
 2015-09-16 16:30:56 +02:00
Atgeirr Flø Rasmussen 55f8ebacfc Merge pull request #476 from dr-robertk/PR/ParallelDebugOutput 
Pr/parallel debug output fixes
 2015-09-16 13:25:49 +02:00
Atgeirr Flø Rasmussen 35136f5f6a Merge pull request #471 from dr-robertk/PR/ParallelDebugOutput 
ParallelDebugOutput: make the output in ecl format work in parallel.
 2015-09-16 12:48:49 +02:00
Atgeirr Flø Rasmussen 9a0f0a944c Merge pull request #463 from bska/active-regions 
Chase API update of opm-core's RegionMapping
 2015-09-16 09:04:48 +02:00
Atgeirr Flø Rasmussen 85993f4eb0 Silence some more warnings. 2015-09-14 17:23:20 +02:00
Atgeirr Flø Rasmussen 23c28201a5 Update for changes in SaturationPropsFromDeck. 2015-09-14 15:05:32 +02:00
Atgeirr Flø Rasmussen 62d633a8ff Update for removed constructor args. 2015-09-14 10:32:07 +02:00
Atgeirr Flø Rasmussen c19df37af5 Merge pull request #466 from blattms/fix-MatrixBlockError-on-some-processes 
Introduces parallel exception handling for ILU0 preconditioner.
 2015-09-14 08:19:03 +02:00
Atgeirr Flø Rasmussen 6474e22c7e Merge pull request #465 from akva2/rename_common 
changed: sync with renaming to opm-common
 2015-09-09 11:37:22 +02:00
Atgeirr Flø Rasmussen 6728bb1672 Merge pull request #445 from GitPaean/improving_scaling 
update scaling factors for mass balance equations.
 2015-09-08 11:22:59 +02:00
Atgeirr Flø Rasmussen 89ae28d3c5 Merge pull request #456 from babrodtk/autodiff-matrix-types 
Autodiff matrix types
 2015-09-08 08:34:43 +02:00
Atgeirr Flø Rasmussen 73170c4281 Add forgotten constructor delegation. 2015-09-07 13:00:41 +02:00
Atgeirr Flø Rasmussen 61c352ca3b Add move constructor and assignment to AutoDiffMatrix. 
This is necessary, and done using swap(), since (current version)
Eigen::SparseMatrix does not support move semantics.
 2015-09-07 13:00:41 +02:00
Atgeirr Flø Rasmussen 097542a527 Whitespace fixes. 
It turns out I accidentally used tabs for a while, this commit
fixes that for all touched files.
 2015-09-07 13:00:41 +02:00
Atgeirr Flø Rasmussen 3c905845f9 Use std::vector instead of DiagonalMatrix. 
This is because DiagonalMatrix lacks a swap() method.
 2015-09-07 13:00:02 +02:00
Atgeirr Flø Rasmussen 87f677af02 Fix bug in fastDiagSparseProduct(). 2015-09-07 13:00:02 +02:00
Atgeirr Flø Rasmussen 11a33b3017 Experiment with fast diagonal-sparse products. 2015-09-07 13:00:02 +02:00
Atgeirr Flø Rasmussen 1f32594f79 Fix bug in prodDD(), add test. 2015-09-07 13:00:02 +02:00
Atgeirr Flø Rasmussen 51dde7cec5 In collapseJacs(), avoid explicit zeros. 2015-09-07 13:00:02 +02:00
Atgeirr Flø Rasmussen dd52d444e7 Fix print() method. 2015-09-07 13:00:02 +02:00
Atgeirr Flø Rasmussen c795113ce3 Changes to make flow compile with AutoDiffMatrix. 2015-09-07 13:00:02 +02:00
Atgeirr Flø Rasmussen c712d0070d Bugfixes for AutoDiffMatrix. 2015-09-07 12:58:51 +02:00
Atgeirr Flø Rasmussen ffeaa5143d Add more ops and methods to AutoDiffMatrix. 
To make it possible to use it instead of Eigen::SparseMatrix in
a range of cases.
 2015-09-07 12:58:51 +02:00
Atgeirr Flø Rasmussen 47e7dbe943 New implementation of AutoDiffMatrix, some tests. 
Compiles and tests successfully, but test coverage very
limited. New approach based on relatively primitive
run-time switching instead of trying to use inheritance.
 2015-09-07 12:58:51 +02:00