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
3,441 Commits 31 Branches 117 Tags
9aa64340e45a5e2e267f1b0e662ba6cd4633d28a
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen 9aa64340e4 Move GridManager to grid subdir. 
Also remove GridAdapter (moved to dune-cornerpoint), and
moved grid.c implementation file to grid subdir.
 2016-04-14 11:32:07 +02:00
Atgeirr Flø Rasmussen 01d376deb6 Removed unneeded simulator class, renamed a simulator. 2016-04-14 11:32:07 +02:00
Atgeirr Flø Rasmussen 391bda4711 Merge pull request #645 from akva2/add_shared_opm_data 
Use shared copy of opm-data when possible
 2016-04-12 14:38:40 +02:00
Atgeirr Flø Rasmussen fc0943c4e8 Merge pull request #642 from akva2/import_files_from_opm_core 
Import some files from opm core (with history)
 2016-04-11 10:54:13 +02:00
Atgeirr Flø Rasmussen b5cf0763c5 Also change library name opmautodiff -> opmsimulators. 2016-04-08 20:33:18 +02:00
Atgeirr Flø Rasmussen ff549195ab Rename opm-autodiff -> opm-simulators. 2016-04-08 14:58:07 +02:00
Atgeirr Flø Rasmussen 3f70248415 Remove the m4 directory. 
Artifact left over from the autotools days.
 2016-04-08 14:35:44 +02:00
Atgeirr Flø Rasmussen b4b9d10c3a Merge pull request #628 from dr-robertk/PR/async-output 
Pr/async output
 2016-04-08 13:43:24 +02:00
Atgeirr Flø Rasmussen 079fce79d9 Merge pull request #640 from GitPaean/wells_moving_out 
Moving the StandardWells class definition to separate files.
 2016-04-07 11:18:56 +02:00
Atgeirr Flø Rasmussen cebc393caf Merge pull request #635 from GitPaean/wells_refactoring 
A first step towards Wells refactoring
 2016-04-06 16:08:18 +02:00
Atgeirr Flø Rasmussen 09b52a8d7e Merge pull request #638 from atgeirr/module-renaming 
Module renaming
 2016-04-06 15:38:01 +02:00
Atgeirr Flø Rasmussen c00376e506 Renamed in Jenkins scripts. 2016-04-06 13:32:27 +02:00
Atgeirr Flø Rasmussen 6cd1d28696 Rename in travis script. 2016-04-06 13:31:07 +02:00
Atgeirr Flø Rasmussen 37c4bd16b1 Adapt code to dune-cornerpoint -> opm-grid renaming. 2016-04-06 13:29:47 +02:00
Atgeirr Flø Rasmussen 6f1cec4eec Rename dune-cornerpoint -> opm-grid. 2016-04-06 13:29:47 +02:00
Atgeirr Flø Rasmussen b7fc614356 Merge pull request #636 from bska/travis-request-opm-output 
Request requisite module opm-output in Travis builds
 2016-04-05 13:59:43 +02:00
Atgeirr Flø Rasmussen 25cd84b6a2 Merge pull request #622 from totto82/refact_sovlent 
Refactor the solvent model
 2016-04-05 10:46:28 +02:00
Atgeirr Flø Rasmussen 16c8ca40cd Merge pull request #634 from totto82/fix_test_solventProps 
Fixes to test_solventprops_ad
 2016-04-05 09:11:29 +02:00
Atgeirr Flø Rasmussen eefa5d7864 Merge pull request #631 from andlaus/update_dune.module 
dune.module: add all modules which opm-autodiff depends on explicitly
 2016-04-04 19:07:45 +02:00
Atgeirr Flø Rasmussen 0e7e45c129 Merge pull request #627 from totto82/well_potentials 
Compute well potentials
 2016-04-04 15:11:19 +02:00
Atgeirr Flø Rasmussen cf6ed11f46 Merge pull request #626 from qilicun/adapt-changes 
adapt changes to relpermDiagnostics.
 2016-04-04 15:04:50 +02:00
Atgeirr Flø Rasmussen e07c8f05a8 Merge pull request #611 from totto82/TLpressure 
Implement pressure effects in the Todd-Longstaff mixing parameter
 2016-04-04 14:45:22 +02:00
Atgeirr Flø Rasmussen 8c9b17b943 Merge pull request #615 from totto82/fixes_solvent_model 
Fixes to the solvent model
 2016-04-01 13:40:00 +02:00
Atgeirr Flø Rasmussen 5c1703c3a5 Merge pull request #607 from qilicun/change-PRT-folder 
Save PRT in the same folder as summary file.
 2016-04-01 08:21:08 +02:00
Atgeirr Flø Rasmussen 6549658622 Merge pull request #624 from GitPaean/polymer_linearsolver 
making the interleaved solver works for blackoil polymer simulator.
 2016-03-31 15:39:54 +02:00
Atgeirr Flø Rasmussen 543c1655b9 Merge pull request #616 from jokva/accept-filename-without-DATA 
Flow accepts base name for input Deck
 2016-03-31 15:33:23 +02:00
Atgeirr Flø Rasmussen b5c216f4f3 Merge pull request #621 from totto82/fix_lrat 
Bugfix. Fix setting initial rates in updateWellControls
 2016-03-31 14:33:33 +02:00
Atgeirr Flø Rasmussen 3aa5158842 Merge pull request #619 from kjellkongsvik/Move_OutputWriter_to_opm-output 
Refactored to use OutputWriter from opm-output
 2016-03-31 09:44:09 +02:00
Atgeirr Flø Rasmussen 6a4bd4516c Merge pull request #625 from OPM/revert-623-PR/async-output 
Revert "Asynchronous output."
 2016-03-31 09:43:15 +02:00
Atgeirr Flø Rasmussen 13b86a7825 Revert "Asynchronous output." 2016-03-31 09:43:01 +02:00
Atgeirr Flø Rasmussen e676aa7114 Merge pull request #623 from dr-robertk/PR/async-output 
Asynchronous output.
 2016-03-31 09:42:50 +02:00
Atgeirr Flø Rasmussen 463866b523 Create state_ in all cases. 2016-03-29 10:48:36 +02:00
Atgeirr Flø Rasmussen 98862f449c Restore compilation (init -> constructor). 
Also suppress new warnings due to unsigned/signed comparisons.
 2016-03-29 10:48:36 +02:00
Atgeirr Flø Rasmussen a3ae13b892 Merge pull request #612 from qilicun/enable-solvent-diagnostics 
enable relperm diagnostics for solvent model.
 2016-03-16 10:32:18 +01:00
Atgeirr Flø Rasmussen 77ea648e6a Merge pull request #610 from GitPaean/performance_multisegment 
adding flag to wops_ms_ to indicate if MSW is involved.
 2016-03-09 12:54:30 +01:00
Atgeirr Flø Rasmussen d75516a705 Merge pull request #609 from totto82/powADB 
Add power method for general f^g in the AutoDiffBlock
 2016-03-08 11:15:00 +01:00
Atgeirr Flø Rasmussen 235bdedc55 Merge pull request #605 from totto82/supportForPMISC 
Add support for PMISC
 2016-03-08 10:03:03 +01:00
Atgeirr Flø Rasmussen 597cda6cbb Merge pull request #608 from totto82/relperm_diagnostic_solvent 
Skip the relperm diagnostics for the solvent model.
 2016-03-08 08:41:27 +01:00
Atgeirr Flø Rasmussen bfda0e13f6 Merge pull request #588 from andlaus/opm-material_blackoil_PVT 
fix the fallout of the removal of the opm-core black-oil PVT classes
 2016-03-07 13:40:27 +01:00
Atgeirr Flø Rasmussen 96938548c1 Merge pull request #603 from atgeirr/remove-unused-parameter 
Adapt to removed init() parameter.
 2016-03-04 11:22:08 +01:00
Atgeirr Flø Rasmussen f7f18c70bb Merge pull request #604 from atgeirr/minor-fixes 
Fix minor initialization and overriding bugs.
 2016-03-04 11:21:09 +01:00
Atgeirr Flø Rasmussen a19607fabc Merge pull request #593 from qilicun/integrate_diagnostics 
integrate relperm diagnostics into flow.
 2016-03-04 09:49:10 +01:00
Atgeirr Flø Rasmussen 7bfa8f405e Fix bug in overriding method. 2016-02-29 11:18:51 +01:00
Atgeirr Flø Rasmussen b0b42d7dc7 Add missing initializer for 'singlePrecision'. 2016-02-29 11:17:54 +01:00
Atgeirr Flø Rasmussen 6dd3f0ebb3 Adapt to removed init() parameter. 2016-02-29 11:05:35 +01:00
Atgeirr Flø Rasmussen 95c645cc72 Merge pull request #598 from andlaus/allow_temperature_to_default 
BlackoilPropsAdFromDeck: allow the AutoDiffBlock which represents temperature to be empty
 2016-02-22 17:09:06 +01:00
Atgeirr Flø Rasmussen 5bb705fda8 Merge pull request #953 from andlaus/const_gridproperties 
fix the build
 2016-02-19 11:46:32 +01:00
Atgeirr Flø Rasmussen af2455fdbe Merge pull request #590 from dr-robertk/PR/bugfix-in-backup-restore 
Bugfix in backup/restore.
 2016-02-19 11:37:57 +01:00
Atgeirr Flø Rasmussen 319960dbda Merge pull request #592 from blattms/distribute_threshold_pressure 
Fixes the exception for models with threshold pressures.
 2016-02-19 08:49:37 +01:00
Atgeirr Flø Rasmussen 569df33ab2 Merge pull request #583 from totto82/solventSupportRegions 
Support regions in the solvent model
 2016-02-18 15:43:27 +01:00
Atgeirr Flø Rasmussen 8dfc8d82fc Merge pull request #582 from dr-robertk/PR/fast-sparse-add 
Fast sparse add.
 2016-02-17 19:55:15 +01:00
Atgeirr Flø Rasmussen 8bc9789556 Merge pull request #585 from blattms/fix-opm-matrix-dune-2.4 
Account for variable change in 2.4.1
 2016-02-16 21:09:23 +01:00
Atgeirr Flø Rasmussen a6c8db34e0 Merge pull request #584 from jepebe/travis 
Added Travis support
 2016-02-16 11:05:54 +01:00
Atgeirr Flø Rasmussen 704603e2b2 Merge pull request #578 from dr-robertk/PR/amg-for-interleaved 
AMG for Interleaved solver and other goodies.
 2016-02-16 10:15:55 +01:00
Atgeirr Flø Rasmussen eb228835c2 Merge pull request #577 from totto82/solventMiscible 
Add miscible effects to the solvent model
 2016-02-12 11:21:56 +01:00
Atgeirr Flø Rasmussen 3b294beb51 Merge pull request #575 from dr-robertk/PR/make-compile-with-current-master 
DuneMatrix: adjust to changes in dune 3.0
 2016-02-12 10:23:40 +01:00
Atgeirr Flø Rasmussen 885e3aa561 Merge pull request #576 from andlaus/opm-material_PVT 
use the blackoil PVT classes from opm-material instead of the opm-core ones
 2016-02-11 22:39:38 +01:00
Atgeirr Flø Rasmussen 2d7b9f7663 Merge pull request #580 from atgeirr/master 
Fix minor issue with const POD requirements.
 2016-02-11 16:21:49 +01:00
Atgeirr Flø Rasmussen a356a100f7 Fix minor issue with const POD requirements. 
A user-defined default constructor is required in this situation
unless explicitly using the empty-brace-init syntax.

See discussion here:
http://stackoverflow.com/questions/7411515/why-does-c-require-a-user-provided-default-constructor-to-default-construct-a
 2016-02-11 16:17:17 +01:00
Atgeirr Flø Rasmussen 19c168caca Merge pull request #570 from atgeirr/fix-api-change 
Fix change in signature of extractPvtTableIndex() in solvent props.
 2016-01-08 14:49:50 +01:00
Atgeirr Flø Rasmussen 7e1af01ad7 Fix change in signature of extractPvtTableIndex() in solvent props. 2016-01-08 14:47:41 +01:00
Atgeirr Flø Rasmussen d47202b676 Merge pull request #569 from chflo/OPM-163 
OPM-163: Changed signature for method extractPvtTableIndex
 2016-01-08 13:36:22 +01:00
Atgeirr Flø Rasmussen 2505183887 Improve threshold pressure mismatch error message. 2015-12-28 09:22:53 +01:00
Atgeirr Flø Rasmussen 5315a0dfba Merge pull request #561 from atgeirr/refactor-extended-mains 
Refactor main functions of all Flow variants.
 2015-12-22 15:20:59 +01:00
Atgeirr Flø Rasmussen 6839b811f2 Make polymer solver use direct solver only. 
The interleaved solver should work for this case, but does not currently.
 2015-12-21 15:05:32 +01:00
Atgeirr Flø Rasmussen 8507427d83 Use correct syntax for logical not. 2015-12-21 14:55:33 +01:00
Atgeirr Flø Rasmussen dc4274f4a2 Include nncs in threshold pressures. 
This was left out when rebasing (it had been introduced in the flow etc. mains).

This also fixes a bug: the nnc thresholds should be inserted at the end of the
vector to be consistent with the operators, not at the beginning.
 2015-12-21 11:12:55 +01:00
Atgeirr Flø Rasmussen 78dbb79ea4 Fix compile error for in-class member init. 
Reported by Kai Bao.
 2015-12-21 11:12:01 +01:00
Atgeirr Flø Rasmussen bfcbd09488 Create and use FlowMainPolymer class. 2015-12-18 13:58:13 +01:00
Atgeirr Flø Rasmussen b420cccfc3 Add warning about simulating without WPOLYMER. 
Warning was in the main() of flow_polymer.cpp,
but will disappear from there after refactoring.
 2015-12-18 13:58:13 +01:00
Atgeirr Flø Rasmussen b156ce0b55 Create and use FlowMainSolvent class. 2015-12-18 13:58:13 +01:00
Atgeirr Flø Rasmussen 39900761a8 Transform FlowMain to use CRTP. 
Main content is now in FlowMainBase, which takes Implementation as
a template parameter. FlowMain inherits from FlowMainBase with itself
as Implementation template parameter. Only the createSimulator() method
is implemented in FlowMain (as opposed to in FlowMainBase). All subclasses
must implement createSimulator().
 2015-12-18 13:58:13 +01:00
Atgeirr Flø Rasmussen bb49ddbfc4 Improve comments. 2015-12-18 13:58:13 +01:00
Atgeirr Flø Rasmussen 4d31a99f5b Moved content of warnIfUnusedParams() into runSimulator(). 2015-12-18 13:58:13 +01:00
Atgeirr Flø Rasmussen 4711fd3dfe Complete refactoring of FlowMain. 2015-12-18 13:58:13 +01:00
Atgeirr Flø Rasmussen 7a536570dc Split out readDeckInput() method. 2015-12-18 13:58:13 +01:00
Atgeirr Flø Rasmussen 4fae28f3d3 Split out setupOutput() method. 2015-12-18 13:58:13 +01:00
Atgeirr Flø Rasmussen 64eef0609a Split out setupParameters() method. 2015-12-18 13:58:12 +01:00
Atgeirr Flø Rasmussen 966ace2c53 Split out printStartupMessage() method. 2015-12-18 13:58:12 +01:00
Atgeirr Flø Rasmussen c1bd7670c6 Refine OpenMP number-of-threads output. 
Now each MPI rank will report, making it easier to see how
MPI and OpenMP interacts w.r.t. processes and threads.
 2015-12-18 13:58:12 +01:00
Atgeirr Flø Rasmussen f7c96b4fc5 Split out function setupParallelism(). 2015-12-18 13:58:12 +01:00
Atgeirr Flø Rasmussen e3ceac44a6 Renamed flowMain.hpp -> FlowMain.hpp. 2015-12-18 13:58:12 +01:00
Atgeirr Flø Rasmussen abf5443f33 Replace flowMain() function with FlowMain class. 2015-12-18 13:58:12 +01:00
Atgeirr Flø Rasmussen 8e2cb4161a Merge pull request #553 from atgeirr/refactor-flow-main 
Minor refactoring in flow.cpp
 2015-12-18 13:47:24 +01:00
Atgeirr Flø Rasmussen b10b028aa1 Documented flowMain(). 2015-12-14 16:11:35 +01:00
Atgeirr Flø Rasmussen 29d18261c6 Make multisegment flow variants use flowMain(). 2015-12-14 16:11:35 +01:00
Atgeirr Flø Rasmussen f02fd71404 Use Simulator::ReservoirState in flowMain(). 2015-12-14 16:11:06 +01:00
Atgeirr Flø Rasmussen 460f0cb451 Use the new flowMain() function. 
Also add it to the CMake file list.
 2015-12-14 16:11:06 +01:00
Atgeirr Flø Rasmussen 51a03e6212 Extract content of flow main() to separate template function. 
The function is templated on grid and simulator class, so this allows
flow and flow_mpi to be implemented without any macro tricks, instead
simply including and using different grid types.
 2015-12-14 16:07:47 +01:00
Atgeirr Flø Rasmussen be9b6a3cd2 Unconditionally instantiate the (possibly fake) MPI helper. 
This reduces the difference between flow and flow_mpi. For builds
without MPI, the fake helper from Dune is instantiated, which has
the same interface.
 2015-12-14 16:07:47 +01:00
Atgeirr Flø Rasmussen 7c5256031c Use GridInit in flow.cpp. 2015-12-14 16:07:47 +01:00
Atgeirr Flø Rasmussen af980ed93c Creates GridInit template class. 2015-12-14 16:07:46 +01:00
Atgeirr Flø Rasmussen dc3a290327 Merge pull request #560 from atgeirr/silence-warning 
Silence int vs. size_t warnings.
 2015-12-14 15:56:21 +01:00
Atgeirr Flø Rasmussen e74a36d939 Silence int vs. size_t warnings. 2015-12-14 15:55:30 +01:00
Atgeirr Flø Rasmussen bd82e5ade9 Merge pull request #554 from totto82/nnc_thpress 
NNC and threshold pressure
 2015-12-14 11:33:30 +01:00
Atgeirr Flø Rasmussen d30147abfd Merge pull request #555 from totto82/residualSaturations 
Add methods for critial gas and gas in oil saturations
 2015-12-11 13:08:54 +01:00
Atgeirr Flø Rasmussen 73a26fb8dd Merge pull request #558 from totto82/powerAD 
Add power operator to AutoDiffBlock
 2015-12-11 09:49:25 +01:00
Atgeirr Flø Rasmussen 630454691e Merge pull request #557 from blattms/fix-pr541-for-parallel 
Guard access of well variable with asImpl().localWellsActive()
 2015-12-11 09:40:47 +01:00
Atgeirr Flø Rasmussen ef07b8daef Update run() calls in polymer fully implicit sims. 2015-12-07 13:45:07 +01:00
Atgeirr Flø Rasmussen ffc91bc35e Remove unnecessary EclipseState argument from run(). 2015-12-07 13:40:06 +01:00