OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-20 11:48:25 -06:00
Code Issues Packages Projects Releases Wiki Activity
7,981 Commits 24 Branches 102 Tags 90 MiB
78cc2b8ca4
Commit Graph

5534 Commits

Author SHA1 Message Date
Kai Bao
78cc2b8ca4 adapting to the interface change of VFP related in parser. 2018-04-20 11:29:22 +02:00
Arne Morten Kvarving
351c495388 fixed: pass by reference as intended 2018-04-13 11:25:10 +02:00
Arne Morten Kvarving
33d2095b07 initialize variable 2018-04-13 11:25:10 +02:00
Arne Morten Kvarving
4933c10035 reduce scope of variable 2018-04-13 11:25:10 +02:00
Arne Morten Kvarving
ee57c82834 changed: mark constructors explicit 2018-04-13 11:25:10 +02:00
Arne Morten Kvarving
fddad72a3e fixed: quell signed/unsigned comparison warning 2018-04-13 11:25:10 +02:00
Atgeirr Flø Rasmussen
63dabb4777
Merge pull request #1450 from GitPaean/update_VFP_related 
adapting to the change related to VFP from the parser.
 2018-04-12 11:20:21 +02:00
Kai Bao
ed49fd1e88 adapting to the change related to VFP from the parser. 2018-04-11 09:22:52 +02:00
Andreas Lauser
55093b4918 adapt to the removal of the ewoms/aux directory 2018-04-10 10:17:31 +02:00
Arne Morten Kvarving
e163c97fc2
Merge pull request #1441 from totto82/fix_co2case 
Some minor fixes to RESV and initial well composition
 2018-04-09 14:30:41 +02:00
Andreas Lauser
3924bb1e6e explicitly disable all extensions supported by black oil model for the base simulator 
this should not really be necessary because they are supposed to be
disabled by default, but it makes things a bit more explicit
 2018-04-06 11:01:33 +02:00
Andreas Lauser
b74d39f2e1 make flow compile in face of the energy conservation changes of the eWoms black oil model 
with this, flow does *not* yet support thermal simulations, this patch
merely makes it compile while nothing user-facing is supposed to
change.
 2018-04-06 11:01:33 +02:00
Bård Skaflestad
0f4354d8fd Include <sstream> for Class "ostringstream" 
Some implementations do not get a transitive definition of class
"ostringstream" in scope through the other headers and therefore
fail to compile the member function

  SimulatorReport::reportStep(std::ostringstream&)
 2018-04-04 19:00:51 +02:00
Atgeirr Flø Rasmussen
9897ae361e
Merge pull request #1428 from totto82/relax_convergence 
Add option for relaxed CNV tolerance
 2018-04-04 16:38:47 +02:00
Atgeirr Flø Rasmussen
ce308455ab
Merge pull request #1433 from totto82/fix_reportStep 
Add reportStep method in SimulatorReport and use it
 2018-04-04 15:23:01 +02:00
Atgeirr Flø Rasmussen
4f39cdc9c9
Merge pull request #1439 from GitPaean/silencing_warning_extra_ 
silencing warning related to extra ; from BlackoilAmg
 2018-04-04 14:32:18 +02:00
Atgeirr Flø Rasmussen
482c63e274
Merge pull request #1446 from GitPaean/removing_flowmainpolymer 
Removing flowmainpolymer
 2018-04-04 14:30:37 +02:00
Kai Bao
87b3cccd7f removing WPIMULT from MissingFeatures 2018-04-03 11:11:25 +02:00
Kai Bao
7eaaae3906 removing FlowMainPolymer.hpp 2018-04-03 11:08:25 +02:00
Joakim Hove
5629b9b422 Mark LGR related keywords as unsupported 2018-04-03 09:40:36 +02:00
Steinar Foss
a931901374 Made changes to comply w/ removal of MessageContainer. 2018-03-26 12:13:55 +02:00
Tor Harald Sandve
4e9403b8f8 Correct the RESV calculation for unsaturated cases 
Make sure that the reservoar volumes always stays positive. i.e. we can
not remove more dissolved gas from the rate than the total volume amout
of gas.
 2018-03-23 15:23:47 +01:00
Tor Harald Sandve
975a9a6766 Fix intial fluid distribution in the well 
Solve the well equation in order to determine the initial fluid content
of the well used for the hydrostatic pressure calculation in the well.
 2018-03-23 12:56:19 +01:00
Kai Bao
90e69b59cf silencing warning related to extra ; from BlackoilAmg 2018-03-14 12:02:07 +01:00
Andreas Lauser
a42ece61ed BlackoilModelEbos: set the default output directory to the empty string 
an empty string is interpreted as "write the output files into the
same directory as the input". this is the current 'flow' default
behavior, plain ebos uses "." as the default location for output,
i.e., the current directory from which the simulator is run from.
 2018-03-12 15:17:39 +01:00
Andreas Lauser
71d353326a move the old "ThreadHandle" mechanism back to opm-simulators 
this class is only used by the legacy simulators, `flow` uses the
`EclWriter` class provided by eWoms. In turn, this class uses the
new-and-shiny "tasklet" mechanism.
 2018-03-12 15:17:39 +01:00
Tor Harald Sandve
7c9dab1a64 Add reportStep method in SimulatorReport and use it 2018-03-12 14:48:34 +01:00
Tor Harald Sandve
15aeac3f90 Add option for relaxed CNV tolerance 
Use a relaxed tolerance for individual cells (CNV) when iter >
max_strict_iter.

tolerance_cnv_relaxed_ is defauled to 1.0e9
This assure the same behaviour as current master, where CNV criterion is
ignored when iter > max_strict_iter

TODO: Test this with a stricter default ( <= 1.0)
 2018-03-12 08:23:57 +01:00
Atgeirr Flø Rasmussen
79bc265de8
Merge pull request #1431 from GitPaean/silencing_warning_from_opm_common_pr_348 
adding POLYMW to the injectorType determination
 2018-03-10 13:19:37 +01:00
Kai Bao
b0edfd2f04 adding POLYMW to the injectorType determination 
just to silence a warning resulting from OPM/opm-common#348.
 2018-03-09 14:40:49 +01:00
Atgeirr Flø Rasmussen
1380564256
Merge pull request #1425 from totto82/fix_enable_storage_term_false 
Bugfix. enableStorageCache=false
 2018-03-09 14:13:10 +01:00
Atgeirr Flø Rasmussen
8070e9d229
Merge pull request #1397 from blattms/system-amg-rebased 
Add support for CPR (and variants) for flow_ebos
 2018-03-09 12:46:27 +01:00
Atgeirr Flø Rasmussen
717a9180e5
Merge pull request #1422 from blattms/resort-to-split-operator 
If requested use matrix with well contributions only for the preconditioner.
 2018-03-07 14:33:09 +01:00
Markus Blatt
e27fa72aee Use extended sparsity pattern also of we add well contributions to the preconditioner. 2018-03-07 13:54:21 +01:00
Tor Harald Sandve
0c4ae5991f Use advanceTimeLevel() and updatedFailed() methods from model 2018-03-06 13:18:03 +01:00
Markus Blatt
01b25f27ed Allow to add well contributions to both matrix and preconditioner matrix. 
matrix_add_well_contributions=true will add to both the preconditioner matrix
and the matrix of the linear operator. preconditioner_add_well_contributions=true
will only add the contributions to the preconditioner matrix.
 2018-03-05 16:48:10 +01:00
Markus Blatt
dc86d972d2 Removed hack to access StandardWell::addWellContributions. 2018-03-05 16:48:03 +01:00
Tor Harald Sandve
5f33a1a1bc Bugfix. enableStorageTerm=false 
Shift intensiveQuantities each timestep
 2018-03-05 14:53:59 +01:00
Andreas Lauser
999653783b do not name exception objects if they are not used 
ICC rightfully produces a warning here...
 2018-03-03 13:31:17 +01:00
Andreas Lauser
732d86613e do not mess around with GCC's optimizations 
generally, this is a bad idea because GCC is very good at determining
which optimizations should be enabled or not and also, this may
interfere with some compilers. (e.g., it produces a warning on icc)
 2018-03-03 13:31:17 +01:00
Markus Blatt
12d2114bd7 Add well contribution to preconditioner matrix and always use old operator approach for wells. 
It turned out that applying the well part of the full matrix has to be
done after the application of the non-well interactions. Otherwise we
screw up the ordering so much that convergence suffers a lot.

Kudos got Atgeirr for inspiration based on his testing.
 2018-03-02 20:57:43 +01:00
Markus Blatt
f07874cf42 Cleanup code. 
Removed unused boolean switch in WellModelMatrixAdapter and removed commented code.
 2018-03-02 20:57:10 +01:00
Markus Blatt
af3c45dd6a Do not add additional entries to matrix when not adding well contributions. 2018-03-02 20:55:58 +01:00
Atgeirr Flø Rasmussen
b276aaa16b Changes made to test variations of matrix vs matrixless(ish) operator. 2018-03-02 14:22:59 +01:00
Atgeirr Flø Rasmussen
0db0e83843
Merge pull request #1414 from GitPaean/hack_to_fix_weird_well_rate_situation 
trying to fix a problematic situation when updateWellState
 2018-02-28 16:00:42 +01:00
Kai Bao
56caffab67 fixing comments for PR#1416 2018-02-28 10:26:54 +01:00
Kai Bao
ec8dc4f534 trying to fix a problematic situation when updateWellState 
for example, distr = 0 1 0, for rate control, F = 1 0 0, we will get a
zero F_target, then it is wrong to do the division with F_target.

It is okay when target = 0. When target != 0, the result is already very
wrong. Non-linear iteration can send us anywhere, not sure the best
solution for this kind of strange situation.
 2018-02-28 09:47:22 +01:00
Kai Bao
635f6c7db2 trying to add the functionality to handle oil/water polymer 2018-02-28 08:39:38 +01:00
Markus Blatt
44d31f9dcc Removed unused variable warning in addWellContributions. 2018-02-26 16:23:13 +01:00
Markus Blatt
8aa0973cfc Removed unsused friend declaration. 
This seemed to be a leftover from the approach taken
before the refactoring of the well code.
 2018-02-26 16:20:41 +01:00