OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-29 20:43:49 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,847 Commits 24 Branches 101 Tags 75 MiB
85e1544553
Commit Graph

4847 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kai Bao
8b38b7b8a3 finishing separating the StandardWellsDense.hpp implementations. 2017-02-15 10:07:22 +01:00
Kai Bao
498f40f896 fourth part in separating the StandardWellsDense.hpp implementations. 2017-02-15 10:07:22 +01:00
Kai Bao
2a3fe58ac2 third part in separating the StandardWellsDense.hpp implementations. 2017-02-15 10:07:22 +01:00
Kai Bao
8de7795629 the second part in separating the StandardWellsDense.hpp implementations. 2017-02-15 10:07:22 +01:00
Kai Bao
8354f3600f the first part in separating the StandardWellsDense.hpp implementations. 
split into commits for easy debugging purpose.
 2017-02-15 10:07:22 +01:00
Atgeirr Flø Rasmussen
b358319e63 Merge pull request #1031 from totto82/newTrans 
Start using face geometry computed the Ecl way
 2017-02-15 10:04:01 +01:00
Atgeirr Flø Rasmussen
0ebff11099 Merge pull request #1047 from dr-robertk/PR/cleanup-output-writers 
[WIP] Unify output writers to avoid code duplication.
 2017-02-14 15:27:22 +01:00
dr-robertk
22cbaeea62 Merge pull request #4 from atgeirr/cleanup-output-writers-extra 
Remove pessimizing move and silence warnings.
 2017-02-14 11:08:15 +01:00
Atgeirr Flø Rasmussen
41fb8eb933 Remove pessimizing move and silence warnings. 2017-02-14 10:50:31 +01:00
Robert Kloefkorn
4c118c6455 Merge remote-tracking branch 'upstream/master' into PR/cleanup-output-writers 2017-02-13 21:28:54 +01:00
Robert Kloefkorn
b18f07c1bd Address comments. 2017-02-13 16:11:24 +01:00
Atgeirr Flø Rasmussen
7e3e5bf026 Merge pull request #1037 from GitPaean/smaller_tol_wells_ebos 
[Discussion] using smaller tolerance_wells for StandardWellsDense
 2017-02-12 14:37:59 +01:00
Atgeirr Flø Rasmussen
26447b8776 Merge pull request #1052 from atgeirr/restore-build 
Change include paths for moved headers.
 2017-02-10 16:12:38 +01:00
Atgeirr Flø Rasmussen
27c0430932 Change include paths for moved headers. 2017-02-10 16:07:25 +01:00
Atgeirr Flø Rasmussen
12adcdf218 Merge pull request #1049 from akva2/import_adaptive_time_stepping 
Import adaptive time stepping and associated classes
 2017-02-10 15:17:02 +01:00
Arne Morten Kvarving
86fbb36fd2 adjustments for imported files 
- adjust include paths
- add new test to build system
- add new example to build system
 2017-02-10 13:02:00 +01:00
Arne Morten Kvarving
109780f62f Import adaptive time stepping and simulator timer from opm-core 
also import associated tests / examples
 2017-02-10 12:04:11 +01:00
Robert Kloefkorn
82658c92d0 Removal of SimulatorFullyImplicitBlackoilOutputEbos.{h,c}pp. 
All simulators now use SimulationDataContainer to store intermediate data that
is passed to the output Solution container. This is in cases not the most
efficient way, but it's unified to avoid errors from code duplication.
 2017-02-09 16:57:45 +01:00
Arne Morten Kvarving
9f34dc492e Merge pull request #1046 from akva2/no_empty_vectors 
fixed: calculate FIP in substeps for summary output
 2017-02-09 12:07:04 +01:00
Arne Morten Kvarving
c9bd40dccd hot-fix ebos output class 
it's the pointwise addition +, not the append
 2017-02-09 09:35:40 +01:00
Arne Morten Kvarving
a14f5392ee fixed: pass the fipnum data into the adaptive timer stepper 
summary substep reports requires FIP data
 2017-02-09 09:35:40 +01:00
Arne Morten Kvarving
b5b42faba4 fixed: handle exceptions in I/O in parallel 
properly exit on all processes, instead of deadlocking.
async output will still deadlock as there is no way to handle this
without syncronization which would defeat the purpose of async.
 2017-02-09 09:35:40 +01:00
Arne Morten Kvarving
1cb81c12e8 changed: pass fipnum array into adaptive time stepping loop 
needed as substep summary reports requires FIP data to be available.
add calculation of this data if output is requested and summary
config holds relevant keywords.
 2017-02-09 09:33:32 +01:00
Arne Morten Kvarving
f9de2dee2a added: update norne integration test from jenkins trigger 2017-02-02 11:16:00 +01:00
Kai Bao
4159542186 setting tolerance_wells to be 1.e-4. 
for better convergence behavoir.
 2017-01-31 10:50:10 +01:00
Atgeirr Flø Rasmussen
c9813886ba Merge pull request #1043 from andlaus/fix_build 
fix the build
 2017-01-27 14:51:04 +01:00
Andreas Lauser
ec1f136f37 fix the build 
and also, do not std::move a unique_ptr. (that's a quite strange
thing, semantically.)
 2017-01-27 13:23:32 +01:00
Atgeirr Flø Rasmussen
511a934323 Merge pull request #1042 from andlaus/refactor_well_permeability 
do not explicitly pass the permeability to the well model anymore
 2017-01-27 13:15:59 +01:00
Andreas Lauser
42ec0ca3c3 do not explicitly pass the permeability to the well model anymore 
this information is already part of the EclipseState. The reason why
this should IMO be avoided is that this enforces an implementation
detail (ordering of the permeability matrices) of the simulator on the
well model. If this needs to be done for performance reasons, IMO it
would be smarter to pass an array of matrices instead of passing a raw
array of doubles.  I doubt that this is necessary, though: completing
the full Norne deck takes about 0.25 seconds longer on my machine,
that's substantially less than 0.1% of the total runtime.
 2017-01-27 13:06:09 +01:00
Atgeirr Flø Rasmussen
1b8dbd9411 Merge pull request #1040 from GitPaean/group_ebos_vrep 
Group ebos vrep
 2017-01-27 13:04:16 +01:00
Andreas Lauser
04a1c25ebf do not explicitly pass the permeability to the well model anymore 
this information is already part of the EclipseState. The reason why
this should IMO be avoided is that this enforces an implementation
(ordering of the permeability matrices) the simulator on the well
model. If this needs to be done for performance reasons, IMO it would
be smarter to pass an array of matrices, instead of passing a raw
array of doubles.  I doubt that this is necessary, though: completing
the full Norne deck takes about 0.25 seconds longer on my machine,
that's substantially less than 0.1% of the total runtime.

in order to avoid code duplication, the permeability extraction
function of the RockFromDeck class is now made a public static
function and used as an implementation detail of the WellsManager.

finally, the permfield_valid_ attribute is removed from the
RockFromDeck class because this data was unused and not accessible via
the class' public API.
 2017-01-27 12:51:12 +01:00
Joakim Hove
5697b4377b Merge pull request #999 from joakim-hove/restart-keys 
Passing keys to the restart load function.
 2017-01-27 08:26:19 +01:00
Atgeirr Flø Rasmussen
72a83222a1 Merge pull request #1038 from akva2/test_update_automation 
refinement in regression data update script to aid automation
 2017-01-26 13:54:03 +01:00
Arne Morten Kvarving
e12aecc3f5 bug introduced by macro reuse 
there was another reason for the dedicated macro - the output directory
for the tests. add another macro parameter to handle this
 2017-01-26 12:13:58 +01:00
Arne Morten Kvarving
c5d27bf6ed refinement in regression data update script to aid automation 2017-01-26 10:52:49 +01:00
Joakim Hove
270e5f9c0e Passing keys to the restart load function. 
- Renamed EclipseWriter -> EclipseIO.
 - Loading from restart file is a method on the EclipseIO class.
 2017-01-25 23:16:08 +01:00
Kai Bao
c3f3fed47a applying the efficiency factor to all the Jacobians 
of the cq_s when entering the reservoir mass balance equations.
 2017-01-25 15:56:15 +01:00
Kai Bao
68558bec76 moving the update the well_state at the end of the updatewellCotnrols 
in StandardWellsDense.

The reason is that the update the well controls can change the well
controls. It is better to update the well states after all the control
checking is done.
 2017-01-25 14:11:27 +01:00
Kai Bao
26785597b9 putting the update of the well states to one function 
in StandardWellsDense to simplify the updateWellControls() function.
 2017-01-25 14:11:27 +01:00
Kai Bao
19eb0d96c8 adding applyVREPGroupControl() to StandardWellsDense. 2017-01-25 14:11:27 +01:00
Kai Bao
849dae8ec5 adding computeWellVoidageRates() to StandardWellsDense 2017-01-25 14:11:27 +01:00
Kai Bao
f53bf6f957 adding a pointer to rate_converter in BlackoilModelEbos 
in StandardWellsDense.
 2017-01-25 14:11:27 +01:00
Kai Bao
af26b70fc9 adding a rate converter to BlackoilModelEbos 
and also function updateRateConverter() to update its state.
 2017-01-25 14:11:27 +01:00
Arne Morten Kvarving
4ff9996f80 Merge pull request #1035 from joakim-hove/increase-restart-tol 
Relaxed epsilon for restart test.
 2017-01-25 10:19:22 +01:00
Joakim Hove
557e4d7f04 Reversed relaxed tolerances for parellel tests. 2017-01-23 13:35:56 +01:00
Joakim Hove
ba4cc12f73 Named tolerances used for parallel testing. 2017-01-23 13:34:48 +01:00
Joakim Hove
2e721eb9e0 Relaxed tolerances for restart testing. 2017-01-23 13:34:48 +01:00
Arne Morten Kvarving
9ee2af940d Merge pull request #1036 from akva2/documentation_ramblings 
attempt to add some documentation
 2017-01-23 13:19:49 +01:00
Arne Morten Kvarving
850d9571e8 pass tolerances in the tedious way to avoid scoping confusion 2017-01-23 13:16:30 +01:00
Atgeirr Flø Rasmussen
f4ea6c0781 Merge pull request #1034 from GitPaean/fixing_ebos_lrat 
fixing the LRAT control for StandardWellsDense
 2017-01-23 13:06:39 +01:00