OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-02 12:36:54 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,724 Commits 24 Branches 102 Tags 84 MiB
9e30d4b27c
Commit Graph

4724 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Kloefkorn
9e30d4b27c Revert PR 1070 to use auto instead of preprocessor statements. 2017-02-23 15:46:52 +01:00
Atgeirr Flø Rasmussen
6024a7ad78 Merge pull request #1070 from babrodtk/eigen_3.3_fix 
This enables compiling with Eigen 3.3
 2017-02-23 14:04:51 +01:00
babrodtk
ef1c8909f2 This enables compiling with Eigen 3.3 2017-02-23 11:34:41 +01:00
Atgeirr Flø Rasmussen
2797eca463 Merge pull request #1025 from andlaus/flow_ebos-fix-FIP 
Flow ebos fix fip
 2017-02-21 14:31:21 +01:00
Andreas Lauser
9dab0323ce flow_ebos FIP: create the element iterator object as part of the for statement 
IMO, the previous solution was easier to read and a few lines shorter,
but I don't really care about how this is done...
 2017-02-21 13:53:08 +01:00
Andreas Lauser
1f7be0d324 flow_ebos FIP: add comments about the pore volume calculation 2017-02-21 13:33:24 +01:00
Andreas Lauser
a27a2c33a7 flow_ebos FIP: consider all pore volume modifiers 
for now "all pore volume multipliers" means compressibility. the
storage term of the simulator includes them, so they need to be
considered when calculating the fluid in place as well.
 2017-02-21 10:03:11 +01:00
Andreas Lauser
9df4b21369 flow_ebos: fix the calculation of the original fluid in place 
for Norne the numbers are now very close to those of the ECL
reference. ("very close" means < 0.01 % deviation of pressure and
initial fluid volume for the field totals.)
 2017-02-20 16:28:20 +01:00
Andreas Lauser
55547a1b86 flow_ebos FIP: try to fix hcpv and pres in the parallel case 
the global reduction must be done _after_ the local computation, not
before it...

thanks to [at]blattms and [at]atgeirr.
 2017-02-20 16:28:20 +01:00
Andreas Lauser
d03dbb7e2c flow_ebos FIP: unify the parallel and non-parallel versions 2017-02-20 16:28:20 +01:00
Andreas Lauser
76a825f36d flow_ebos: make the FIP code consistent with flow_legacy 
in particular, the rock compressibility effects are not considered in
the FIP numbers anymore. While I'm not sure if this is correct or not,
it at least makes the results consistent with those produced by
'flow_legacy'.
 2017-02-20 16:28:20 +01:00
Andreas Lauser
6949de699f flow_ebos: improve the FIP code 
in particular, it can now be called if the cache for the intensive
quantities is "cold".
 2017-02-20 16:28:20 +01:00
Alf Birger Rustad
cac6a33a51 Merge pull request #1045 from akva2/more_summary_analysis 
[WIP] Perform more analysis of summary regression test failures
 2017-02-18 11:35:33 +01:00
Atgeirr Flø Rasmussen
d8aa0b7ddf Merge pull request #1056 from babrodtk/pdpb_output 
Added output of dew and bubble point pressures
 2017-02-17 13:41:10 +01:00
babrodtk
d21443ae60 Updated auxillary=>auxiliary in new code 2017-02-17 10:44:52 +01:00
babrodtk
c39964c712 Added try-catch to computation of bubble/dew point pressure 2017-02-17 10:40:43 +01:00
babrodtk
4a46451d95 Added output of dew and bubble point pressures 2017-02-17 10:40:43 +01:00
Joakim Hove
dda6f58de0 Merge pull request #1062 from joakim-hove/build-trigger 
White spcae change.
 2017-02-17 10:38:15 +01:00
Arne Morten Kvarving
6183e78402 perform some more analysis on regression test failures 2017-02-16 16:00:42 +01:00
Joakim Hove
6ed41d282e White spcae change. 2017-02-16 15:03:27 +01:00
Atgeirr Flø Rasmussen
cb899a425b Merge pull request #1044 from akva2/update_norne_reference 
added: update norne integration test from jenkins trigger
 2017-02-16 14:05:11 +01:00
Atgeirr Flø Rasmussen
232687fc58 Merge pull request #1053 from GitPaean/fixing_thp_control 
update the thp value for flow_ebos
 2017-02-16 13:16:18 +01:00
Joakim Hove
a49aaeb579 Merge pull request #1059 from babrodtk/spellingfix 
Renamed auxillary to auxiliary
 2017-02-16 12:26:09 +01:00
Arne Morten Kvarving
d2730175a0 changed: perform all comparisons in regression tests in all cases 
we want to process all comparisons, even if a previous comparison
failed. will aid further analysis
 2017-02-16 11:07:38 +01:00
Kai Bao
71d777f839 update the thp value for flow_ebos 
otherwise the thp constraint will not work.
 2017-02-15 20:50:43 +01:00
Atgeirr Flø Rasmussen
68ff44ebbd Merge pull request #1055 from GitPaean/pure_separating_standardWellsDense 
Separating the StandardWellsDense to interface file and implementation file
 2017-02-15 18:57:56 +01:00
Andreas Lauser
b088711186 Merge pull request #1057 from babrodtk/whitespace_fixes 
Minor whitespace fixes to be consistent with surrounding code
 2017-02-15 18:29:24 +01:00
babrodtk
edffbcd3f8 Renamed auxillary to auxiliary 2017-02-15 14:47:24 +01:00
babrodtk
8830fd5880 Minor whitespace fixes to be consistent with surrounding code 2017-02-15 14:30:54 +01:00
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