OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-26 03:00:17 -06:00
Code Issues Packages Projects Releases Wiki Activity
9,533 Commits 24 Branches 101 Tags 97 MiB
080e840f2f
Commit Graph

9533 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kai Bao
080e840f2f using tolerance_wells_ for BHP control tolerance for MSW 2019-05-16 12:20:35 +02:00
Kai Bao
28f0274fb5 fixing bugs spotted in the review comments 2019-05-15 16:28:18 +02:00
Kai Bao
4593453d10 adding function checkConvergenceControlEq to refactor getWellConvergence 
only functional change is that rate control or BHP control has different
tolerance for MSW now.
 2019-05-15 16:28:18 +02:00
Atgeirr Flø Rasmussen
41ef80dd7d
Merge pull request #1842 from blattms/always-print-version-if-requested 
If requested always print version and exit.
 2019-05-15 15:13:24 +02:00
Atgeirr Flø Rasmussen
6f4c737700
Merge pull request #1847 from blattms/print-missing-deck-only-on-master 
Let only master process print information about exception.
 2019-05-15 15:10:24 +02:00
Markus Blatt
b885c1a013 Let only master process print information about exception. 
Previously, each process did this in a parallel run which
clutters the terminal output quite a bit in a parallel run.
 2019-05-15 11:14:06 +02:00
Bård Skaflestad
4a5dcdca75
Merge pull request #1793 from jalvestad/cell-summary-props 
Changes to provide Summary data output of additional block variables
 2019-05-14 18:29:12 +02:00
Andreas Lauser
2bbfb583d4
Merge pull request #1839 from totto82/fix_restart 
Fix episode index for restart
 2019-05-14 15:28:45 +02:00
Jostein Alvestad
38265ead52 Have rerwritten the code in a more compact and logical form 2019-05-14 09:31:18 +02:00
Jostein Alvestad
9d5e55180a Added corrections to cancel unintended changes to code 2019-05-14 09:31:17 +02:00
Jostein Alvestad
45e0773edd changes to provide Summary data output of additional block variables 
Provide output data for:
    BOSAT
    BWKR
    BOKR
    BKRO
    BGKR
    BKRG
    BKRW
    BWPC
    BGPC
    BVWAT
    BWVIS
    BVGAS
    BGVIS
    BVOIL
    BOVIS
 2019-05-14 09:31:16 +02:00
Atgeirr Flø Rasmussen
3ac8e0a736
Merge pull request #1837 from totto82/summaryState 
add a summary state member in eclproblem
 2019-05-14 09:25:51 +02:00
Markus Blatt
18a404768e If requested always print version and exit. 
Previously this was only done if there were no other parameters on the
command line. That approach feels a bit unusual.
 2019-05-13 14:40:42 +02:00
Tor Harald Sandve
a9b72ab45b Fix episode index for restart 2019-05-13 12:49:08 +02:00
Atgeirr Flø Rasmussen
8197bcfc54
Merge pull request #1832 from GitPaean/upding_well_control_inner_msw 
updating well control during iterateWellEquations in MSW
 2019-05-13 12:47:10 +02:00
Tor Harald Sandve
6887f3bc73
Merge pull request #1821 from andlaus/tickling_the_dragon 
flow: provide the correct episode size
 2019-05-13 12:40:35 +02:00
Tor Harald Sandve
8afdf2cdb5 add a summary state member in eclBaseVanguard 2019-05-13 12:35:06 +02:00
Atgeirr Flø Rasmussen
c2db2042ea
Merge pull request #1825 from dr-robertk/PR/fix-istl-shared-ptr 
Adjust to shared_ptr change in dune-istl >= 2.7.
 2019-05-13 09:01:29 +02:00
Atgeirr Flø Rasmussen
1a8453e52a
Merge pull request #1834 from GitPaean/fixing_output 
moving the output of the `Report step` information earlier
 2019-05-13 07:28:27 +02:00
Kai Bao
ba106602e1 moving the output of the Report step information earlier 
a lot of things have happened before the printing out the `Report step`
information. When some error messages get thrown, it is easy to make
people confused to look a the wrong report step.
 2019-05-11 14:13:26 +02:00
Kai Bao
8c96aeebbe updating well control during iterateWellEquations in MSW 2019-05-10 14:56:20 +02:00
Andreas Lauser
2d27226538
Merge pull request #1830 from akva2/fix_restart_timestep_usage_prior_to_reading 
fixed: use of restartTimeStep() before it has been read
 2019-05-09 14:59:18 +02:00
Arne Morten Kvarving
3327e69c7f fixed: use of restartTimeStep() before it has been read 
it is read in the beginRestart() method, reorder code accordingly
 2019-05-09 14:33:48 +02:00
Andreas Lauser
9b0be0f8ad flow: provide the correct episode size 2019-05-09 13:28:56 +02:00
Robert Kloefkorn
6c77fae891 [cleanup][istl] Adjust to shared_ptr change in dune-istl >= 2.7. 2019-05-09 11:28:52 +02:00
Arne Morten Kvarving
aa87e215d0
Merge pull request #1827 from akva2/fix_compareecl_flag 
changed: compareECL now needs -t UNRST
 2019-05-09 08:54:15 +02:00
Arne Morten Kvarving
cdd1048b68 changed: compareECL now needs -t UNRST 
previously this was the default, now the default is to compare
files of all types.
 2019-05-09 07:55:05 +02:00
Arne Morten Kvarving
c4bcd9e467
Merge pull request #1814 from tskille/master 
updated test scripts to use eclipse compatible restart
 2019-05-08 14:25:14 +02:00
Andreas Lauser
9136b01659
Merge pull request #1823 from akva2/fix-nnc-output 
Make NNC output more eclipse compliant - with bisectability
 2019-05-08 13:57:00 +02:00
Markus Blatt
781fb46e61 [bugfix] Search all NNCs when applying EDITNNC. 
The latter is not sorted. Therefore we either need to search the whole
range or sort it before processing it. Io pted for the former.
 2019-05-08 13:50:51 +02:00
Markus Blatt
d2efdcfaa5 Implement correct ignore thresholds for NNC with/without EDITNNC. 
It seems like eclipse ignores NNCs with small transmissibility.
Small means less than 1e-6 for Eclipse (Even if it says that it
is ignoring values below 1e-5 and/or zero values)!.
This commit now implements the same threshold during IO.

Also fixes a bug when applying EDITNNC, it needs to have cell1<=cell2 to work.
 2019-05-08 13:50:51 +02:00
Markus Blatt
7849ce690d Make sortNncAndApplyEditnnc return vector of NNCData ready to be processed. 
Previously the vector of NNCData was passed in as a reference and sorted.
Unfortunately, it needed to be transformed later to meet all prerequisites.
With this commit we do this transformations in sortNncAndApplyEditnnc.
Furthermore EDITNNC data is passed by value as it is not needed
outside and should usually not be to big. It was copied outside anyway!
 2019-05-08 13:50:50 +02:00
Markus Blatt
f02c2d4114 Factor out sorting of NNC and application of EDITNNC for reuse. 2019-05-08 13:50:50 +02:00
Markus Blatt
583741d5b1 Ignore NNCs with zero transmissibility during output. 2019-05-08 13:50:26 +02:00
Markus Blatt
5aa0399c67 Write NNCs once and honor them when writing fault transmissibility 
We first add all NNCs specified in the deck to the ouput
and then determine additional NNCs by iterating over all faces that
connect cells that are not connected in the underlying cartesian grid.
Therefore we need to make sure that we do not output NNCs twice
and for faults that also have a specified NNC we need to substract
the transmissibility specified via NNC.
 2019-05-08 13:50:26 +02:00
Atgeirr Flø Rasmussen
fe6d2376be
Merge pull request #1822 from atgeirr/move-linalg-code 
Moved files to opm/simulators/ subdirs.
 2019-05-08 13:46:10 +02:00
Atgeirr Flø Rasmussen
c17adf788f Moved files to opm/simulators/ subdirs. 2019-05-08 12:58:19 +02:00
Andreas Lauser
589db89b09
Merge pull request #1810 from totto82/rockcomp 
Rockcomp
 2019-05-08 09:59:09 +02:00
Tor Harald Sandve
890d34a9e1 Add support for water induced compaction using 
ROCKCOMP, ROCK2D, ROCK2DTR, ROCKWNOD and OVERBURD
 2019-05-07 13:17:29 +02:00
Tor Harald Sandve
71cd83bb2b
Merge pull request #1775 from andlaus/update_ewoms_simulator_in_flow 
flow: make sure that the ebosSimulator's episode machinery is up to date
 2019-05-07 10:51:52 +02:00
Andreas Lauser
dd74fe1027 document all methods of EclThresholdPressure 2019-05-03 14:07:15 +02:00
Andreas Lauser
d329547463 EclProblem: clean up the time management code 
- when an episode/report step is over, the next is started by endEpisode()
- the problem does not deal with updating the simulation time anymore
- rename `episodeIdx` in to `reportStepIdx` the 'EclWriter' because
  this variable is -- and always has been -- the report step number
  used by some parts of `opm-output`'s ECL writing code (the report
  step number is equivalent to the episode index plus 1). IMO, the
  output and parser code should be made more consistent in regard of
  whether it expects 0-based or 1-based indices, but this is a story
  for another day.
 2019-05-03 14:07:15 +02:00
Andreas Lauser
17a4092c82 EclProblem: introduce a simulator auxiliary variable in most most cases 
in most instances, this reduces the visual clutter a bit...
 2019-05-03 14:07:15 +02:00
Andreas Lauser
6e351fef2e EclProblem: limit the limitTimeStepSize() to ebos 
also, fix a few mistakes in that function.
 2019-05-03 14:07:15 +02:00
Andreas Lauser
b9995f697f well models: remove superfluous arguments 
concretely this means the `eclState` and `schedule` arguments to the
`init()` and `beginTimeStep()` methods.
 2019-05-03 14:07:15 +02:00
Andreas Lauser
7868e420c0 EclProblem: print "checking conservativeness" messages in debug mode 2019-05-03 14:06:41 +02:00
Andreas Lauser
0be0de38cb EclProblem: ensure that eclWriter_ is always present 
before patch, setting the `EnableEclOutput` parameter to `false`
resulted in the `eclWriter_` not to be allocated; yet it was used in
some places. this resulted in segfaults.
 2019-05-03 14:06:41 +02:00
Andreas Lauser
d9be3393d7 equil test decks: make them feature one time step 
the output writing code has issues if no time steps are specified...
 2019-05-03 14:06:41 +02:00
Andreas Lauser
701eb0edd3 ebos: never write restart files using the ad-hoc format 
medium term, the output and restart file writing should be refactored:
the simulator does not need to be aware of this because it can be
accomplised in the problem's endTimeStep() method.
 2019-05-03 14:06:41 +02:00
Tor Harald Sandve
e19508e599
Merge pull request #1780 from andlaus/ebos_deck_diagnostics 
Ebos deck diagnostics
 2019-05-03 13:49:02 +02:00