Commit Graph
100 Commits
Author SHA1 Message Date
Atgeirr Flø Rasmussen 26aa03e7ae Merge pull request #1291 from akva2/workaround_eigen_operator_issue
workaround eigen 3.3.2 issue
2017-10-06 14:27:34 +02:00
Atgeirr Flø Rasmussen 396b9886cc Merge pull request #1290 from atgeirr/test-tolerance
Further slacken coarse test tolerance for the benefit of test 27.
2017-10-06 13:03:51 +02:00
Atgeirr Flø Rasmussen 597021084f Further slacken coarse test tolerance for the benefit of test 27. 2017-10-06 11:49:54 +02:00
Atgeirr Flø Rasmussen 66cbc30bf6 Merge pull request #1288 from atgeirr/improve_test_macros_modified
Improve test macros modified
2017-10-06 10:38:41 +02:00
Atgeirr Flø Rasmussen 6c1ae7a658 Make tests pass across Dune 2.4 and 2.5. 2017-10-06 09:26:37 +02:00
Atgeirr Flø Rasmussen 5aa78bd0f8 Merge pull request #1278 from akva2/fix_flow_ebos_spe1_2p
fixed: spe1_2p is not run with flow_ebos, it is run with flow_ebos_2p
2017-09-26 08:43:10 +02:00
Atgeirr Flø Rasmussen f7529cf33e Merge pull request #1269 from GitPaean/fixing_well_efficiency
correcting the way to use efficiency factor in assembleWelEq
2017-09-25 10:26:55 +02:00
Atgeirr Flø Rasmussen 26cd61b107 Merge pull request #1274 from akva2/update_packaging_libecl
update packaging to reflect new libecl
2017-09-25 10:05:24 +02:00
Atgeirr Flø Rasmussen 83ca6d41e3 Merge pull request #1263 from totto82/gasoil
Make 2p gas oil compile and run
2017-09-21 14:03:33 +02:00
Atgeirr Flø Rasmussen c1024ce2d1 Merge pull request #1268 from blattms/log-wells-debug-messages-only-on-master
Log debug messages about wells only on master.
2017-09-21 10:33:04 +02:00
Atgeirr Flø Rasmussen 60fe6b2687 Fix report step number associated with substeps.
It appears summary files by convention expect all substep data points to
be chunked together with the data point at the end of the report step.
2017-09-15 12:04:30 +02:00
Atgeirr Flø Rasmussen 77f3bdaeda Merge pull request #1257 from totto82/add_invert4x4
Add invert4x4 specialization for invertMatrix()
2017-09-04 09:08:32 +02:00
Atgeirr Flø Rasmussen a162d883bf Merge pull request #1261 from GitPaean/recovering_model2_running
not throwing when encountering multisegment wells.
2017-08-29 11:21:45 +02:00
Atgeirr Flø Rasmussen 160314424e Merge pull request #1250 from GitPaean/refactoring_well_model_June_2017_rebase
well refactoring for flow_ebos
2017-08-28 14:36:18 +02:00
Atgeirr Flø Rasmussen 58eea94460 Merge pull request #1247 from totto82/removeState-PR
Remove reservoirState from BlackoilModelEbos
2017-08-22 20:47:16 +02:00
Atgeirr Flø Rasmussen 3d0e1c053e Merge pull request #1256 from akva2/spe9group_update_data
add spe9group to reference data update script
2017-08-22 14:42:36 +02:00
Atgeirr Flø Rasmussen 8998207d7e Merge pull request #1253 from blattms/print-bubble-dew-point-problems-only-on-0
Output bubble/dew point computation problems only on rank 0.
2017-08-17 22:25:53 +02:00
Atgeirr Flø Rasmussen a9eb98d620 Merge pull request #1254 from atgeirr/fix-warning
Silence unused variable warnings.
2017-08-16 10:28:56 +02:00
Atgeirr Flø Rasmussen e3ceecdfa4 Silence unused variable warnings. 2017-08-15 11:17:30 +02:00
Atgeirr Flø Rasmussen c6e729b1bf Merge pull request #1252 from atgeirr/debug-reordering-solver
Fixing bugs and improving the reordering solver
2017-08-10 14:09:58 +02:00
Atgeirr Flø Rasmussen 67823c5893 Disable debugging output of detailed cell data. 2017-08-10 13:09:22 +02:00
Atgeirr Flø Rasmussen a3aa4539be Merge pull request #1251 from GitPaean/fixing_group_control2
Simulator Blackoil and StandardWellsDense uses same rate_converter
2017-08-10 12:57:59 +02:00
Atgeirr Flø Rasmussen 784bcf6892 Experiment with relaxing single cell iterations. 2017-08-10 12:31:04 +02:00
Atgeirr Flø Rasmussen 9cf6832140 Ignore limits to rs and rv changes.
As implemented with a relative limit, even with 1e9 default limit it
would still be impossible to get away from a zero value. It is
possible that the limits may return later, implemented in a less
buggy way, however for now they do not seem necessary.
2017-08-10 11:25:47 +02:00
Atgeirr Flø Rasmussen 0a440d98ce Merge pull request #1238 from totto82/removeConvertResults2
Ask ebos to formulate the equation by surface volumes directly
2017-08-10 10:01:32 +02:00
Atgeirr Flø Rasmussen 1e0facec4a Fix updateState() saturation update. 2017-08-09 15:47:39 +02:00
Atgeirr Flø Rasmussen 4ca5260545 Merge pull request #1249 from GitPaean/fixing_vfp_flow_ebos
Fixing vfp related running with flow_ebos
2017-08-07 16:42:27 +02:00
Atgeirr Flø Rasmussen 608a674858 Make dh_sat behave like in coupled transport solver. 2017-08-07 16:17:57 +02:00
Atgeirr Flø Rasmussen c39341006d Bugfix: follow opm-material convention for capillary pressure 2017-08-04 11:39:51 +02:00
Atgeirr Flø Rasmussen e9e4416428 Make computeCellState() a const method. 2017-08-04 11:39:09 +02:00
Atgeirr Flø Rasmussen 31f74cc476 Merge pull request #1246 from atgeirr/pass-oip-if-required-by-oe
Create oil-in-place data if overall efficiency is requested by output.
2017-08-02 09:04:29 +02:00
Atgeirr Flø Rasmussen 12bd67e248 Create oil-in-place data if overall efficiency is requested by output. 2017-08-01 16:40:34 +02:00
Atgeirr Flø Rasmussen babf06eade Merge pull request #1243 from blattms/write-initial-oip
Write the initial OIP values if requested.
2017-08-01 16:15:46 +02:00
Atgeirr Flø Rasmussen f0b60cfeed Merge pull request #1235 from dr-robertk/PR/bo-two-phase
Added two-phase executable for numEq = 2.
2017-06-29 14:35:07 +02:00
Atgeirr Flø Rasmussen f5501198e2 Merge pull request #1217 from atgeirr/reordering-transport
Reordering transport model
2017-06-28 10:04:38 +02:00
Atgeirr Flø Rasmussen a980993289 Make reordering solver work with iterated implicit.
Also tighten tolerances. They were too slack, giving significant
differences from non-reordering implementation towards the end of
SPE1CASE2 for example.
2017-06-28 07:47:17 +02:00
Atgeirr Flø Rasmussen 9b2d696b86 Tweak tolerance.
Note that a more proper dimensionless residual check is still a good idea.
2017-06-28 07:47:17 +02:00
Atgeirr Flø Rasmussen c40ef4d9d0 Modifications to catch up with master branch. 2017-06-28 07:47:17 +02:00
Atgeirr Flø Rasmussen 4f9a9359ee Refine convergence check, retain max change info. 2017-06-28 07:47:17 +02:00
Atgeirr Flø Rasmussen 6167fff62a WIP: change what is logged, keep track of max change. 2017-06-28 07:47:17 +02:00
Atgeirr Flø Rasmussen ab735b33e1 WIP: add sequential model for debugging. 2017-06-28 07:47:17 +02:00
Atgeirr Flø Rasmussen 0f8cd2c212 Bugfix: use correct sign for z gradient. 2017-06-28 07:47:17 +02:00
Atgeirr Flø Rasmussen e653067951 Adapt new interface with timers. 2017-06-28 07:47:16 +02:00
Atgeirr Flø Rasmussen b5b8fa14de Bugfix: use correct pv multiplier for initial and current state. 2017-06-28 07:47:16 +02:00
Atgeirr Flø Rasmussen fb6dd3adf8 Add well flux terms. 2017-06-28 07:47:16 +02:00
Atgeirr Flø Rasmussen 2c20bb6cde Bugfix: take absolute value of residuals for comparison.
Also tighten hardcoded tolerance for testing, and update a comment.
2017-06-28 07:47:16 +02:00
Atgeirr Flø Rasmussen 87477f7a44 Bugfix: update output reservoir state. 2017-06-28 07:47:16 +02:00
Atgeirr Flø Rasmussen 79fed93b76 Fix saturation bug. 2017-06-28 07:47:16 +02:00
Atgeirr Flø Rasmussen f12c781f3e Fix bugs. 2017-06-28 07:47:16 +02:00
Atgeirr Flø Rasmussen e83b8cd0ac Finished updateState(). 2017-06-28 07:47:16 +02:00
Atgeirr Flø Rasmussen 0a3c65707d More work in progress... 2017-06-28 07:47:16 +02:00
Atgeirr Flø Rasmussen 56853a0272 Avoid derivative pollution. 2017-06-28 07:47:16 +02:00
Atgeirr Flø Rasmussen 5b21cdf54f Still working on reordering solver. 2017-06-28 07:47:16 +02:00
Atgeirr Flø Rasmussen fae4922482 More work in progress for reordering solver. 2017-06-28 07:47:16 +02:00
Atgeirr Flø Rasmussen 1a8e28bd7e More work in progress on reordering solver. 2017-06-28 07:47:15 +02:00
Atgeirr Flø Rasmussen ad6b5ec812 Work in progress (still) on reordering solver. 2017-06-28 07:47:15 +02:00
Atgeirr Flø Rasmussen ad3e8b591b Add pvtRegions() accessor. 2017-06-28 07:47:15 +02:00
Atgeirr Flø Rasmussen edeeb3e0ad Work in progress on reordering solver. 2017-06-28 07:47:15 +02:00
Atgeirr Flø Rasmussen 5e34ba33a2 Add access to low-level functionality. 2017-06-28 07:47:15 +02:00
Atgeirr Flø Rasmussen 4590481686 Added flow_reorder. 2017-06-28 07:47:15 +02:00
Atgeirr Flø Rasmussen 803b40b82f Work in progress on BlackoilReorderingTransportModel. 2017-06-28 07:47:15 +02:00
Atgeirr Flø Rasmussen 293a7abfa2 Add skeleton of reordering transport solver. 2017-06-28 07:47:15 +02:00
Atgeirr Flø Rasmussen 0d6bf85f96 Merge pull request #1189 from blattms/fix-amg-support
Fix the PR that said it activated AMG.
2017-06-27 22:40:14 +02:00
Atgeirr Flø Rasmussen 4b5c9c03a4 Merge pull request #1237 from atgeirr/fix-auto-grid
[bugfix][StandardWellsDense] Remove auto from method parameter list, take 2
2017-06-27 22:09:34 +02:00
Atgeirr Flø Rasmussen fa4c4ccee6 Remove 'auto' from one more parameter list. 2017-06-27 20:06:44 +02:00
Atgeirr Flø Rasmussen bf0937fae1 Merge pull request #1220 from totto82/impl_polymer_simpleWellModel
Add flow_ebos_polymer and flow_ebos_solvent
2017-06-27 10:51:42 +02:00
Atgeirr Flø Rasmussen 730ab5526c Merge pull request #1233 from nairr/term_output_mod
Multiple problem logging for linear solver failure
2017-06-26 13:58:21 +02:00
Atgeirr Flø Rasmussen 90e99c8719 Merge pull request #1230 from atgeirr/relax-tolerance-spe5case
Relax the tolerance for the SPE5 case.
2017-06-25 19:51:18 +02:00
Atgeirr Flø Rasmussen 398ef61da0 Relax the tolerance for the SPE5 case.
The production curve oscillate very strongly, yet the comparison
routine only looks at the values at a single point in time, and
does not compare to the overall magnitude (over time). Therefore,
when comparing near the bottom of a "wave" a small error compared
to the overll magnitude (value at top of a "wave") can be categorised
as a large relative error.
2017-06-23 13:21:27 +02:00
Atgeirr Flø Rasmussen cefe483f66 Merge pull request #1229 from atgeirr/update-readme
Update README.
2017-06-23 10:23:35 +02:00
Atgeirr Flø Rasmussen 70e86997bb Update README. 2017-06-23 09:27:05 +02:00
Atgeirr Flø Rasmussen 2ceca48f04 Merge pull request #1206 from GitPaean/switching_well_primary_variables
Not switching the order of well primary variables and well equations
2017-06-22 19:37:40 +02:00
Atgeirr Flø Rasmussen 757320c57d Merge pull request #1224 from blattms/only-created-step_timings.txt-if-output
Only create step_timing.txt file if it gets written to.
2017-06-21 09:01:33 +02:00
Atgeirr Flø Rasmussen f48acb8807 Merge pull request #1226 from blattms/use-output-to-skip-debug-or-all-files
Use output to skip debug or all files
2017-06-21 09:01:17 +02:00
Atgeirr Flø Rasmussen 513b25f63f Merge pull request #1221 from andlaus/flow_ebos-remove-fluidprops
flow_ebos: do not use BlackoilPropsAdFromDeck anymore
2017-06-20 09:05:21 +02:00
Atgeirr Flø Rasmussen 56cef57c8d Merge pull request #1218 from blattms/faster-ilu-old-order
This is the faster ilu pull request but with the traversal of the columns of upper in the original ordering
2017-06-15 14:23:17 +02:00
Atgeirr Flø Rasmussen dd453d3e50 Merge pull request #1211 from andlaus/improve_cnv
Improve stability by changing the convergence check
2017-06-15 10:39:13 +02:00
Atgeirr Flø Rasmussen 7195102ec6 Merge pull request #1219 from atgeirr/remove-old-sim
Remove unused simulator program.
2017-06-14 20:21:39 +02:00
Atgeirr Flø Rasmussen 699b0678a0 Remove unused simulator program.
This stand-alone simulator is no longer needed since
flow_polymer supports two-phase runs.
2017-06-14 14:15:13 +02:00
Atgeirr Flø Rasmussen d284a657cf Merge pull request #1213 from nairr/terminal_output
remove debug info from convergence failure terminal output
2017-06-14 07:43:00 +02:00
Atgeirr Flø Rasmussen a064f1bae2 Merge pull request #1215 from atgeirr/transport-solver-bugfixes
Transport solver bugfixes
2017-06-13 14:26:35 +02:00
Atgeirr Flø Rasmussen 1679078c51 Make scripts run on older bash versions. 2017-06-13 14:11:19 +02:00
Atgeirr Flø Rasmussen f37a72da71 Merge pull request #1209 from dr-robertk/PR/remove-uninitialized-vars
[cleanup] initialized Eval variables with 0.
2017-06-13 08:56:23 +02:00
Atgeirr Flø Rasmussen 6ed3721906 Merge pull request #1214 from akva2/add_solvent_regtest
add spe5 flow_solvent regression test
2017-06-12 16:08:45 +02:00
Atgeirr Flø Rasmussen e0570fc980 Fix issues for iterated sequential implicit. 2017-06-12 15:36:56 +02:00
Atgeirr Flø Rasmussen e01eca28ca Bugfix: avoid modification of flux data every iteration. 2017-06-12 15:36:48 +02:00
Atgeirr Flø Rasmussen 2941f85706 Merge pull request #1182 from akva2/polymer_regtest
add regression test for flow_polymer
2017-06-09 14:57:38 +02:00
Atgeirr Flø Rasmussen 462d90aeb1 Merge pull request #1207 from GitPaean/improve_WellModelMatrixAdapter
making wellMod_ in WellModelMatrixAdapter is actually a well model
2017-06-09 10:46:13 +02:00
Atgeirr Flø Rasmussen fa4d4fb0fb Make argument of setParameters() a const reference. 2017-06-08 11:03:27 +02:00
Atgeirr Flø Rasmussen 2f30897c70 Make proper convergence check for iterated sequentical implicit. 2017-06-08 11:03:26 +02:00
Atgeirr Flø Rasmussen fd36a122c6 Modifications to catch up with master branch. 2017-06-08 11:03:26 +02:00
Atgeirr Flø Rasmussen 1a3c1d3058 Further templatized sequential model and simulator classes.
Now the actual pressure and transport model classes are not specified,
but taken as template template parameters, also grid and well model
are templates for both the sequential model and the simulator class,
although at this point only StandardWells is expected to work with
the sequential model.
2017-06-08 11:03:26 +02:00
Atgeirr Flø Rasmussen 6e66d885fb Pass 0 min_iter for pressure and transport solve. 2017-06-08 11:03:26 +02:00
Atgeirr Flø Rasmussen 5290b000ef Add setParameters(), return int from minIter(), maxIter(). 2017-06-08 11:03:26 +02:00
Atgeirr Flø Rasmussen 56597a9238 Merge pull request #1205 from atgeirr/tcpu-work
Implement TCPU
2017-06-08 09:08:51 +02:00
Atgeirr Flø Rasmussen 60985fdbeb Merge pull request #1168 from nairr/term_output_mod
Logging of multiple problems/warnings
2017-06-07 15:47:34 +02:00
Atgeirr Flø Rasmussen 42aa343d9f Write total solver time to TCPU. 2017-06-06 21:35:05 +02:00
Atgeirr Flø Rasmussen 2d0701c1e8 Include possibility for arbitrary summary data.
This adapts to the upstream API change in opm-data, and adds a
proof-of-concept dummy TCPU field.
2017-06-06 11:42:51 +02:00
Atgeirr Flø Rasmussen e5732ea0a7 Merge pull request #1204 from atgeirr/all-messages-to-terminal-option
Logging flexibility improvements.
2017-06-06 07:13:52 +02:00
Atgeirr Flø Rasmussen b62d84f7b8 Logging flexibility improvements.
Added "all_messages_to_terminal" parameter (defaulting to false),
it true, all messages (including note and debug) will be sent to
the terminal.

In addition, parser messages are tagged, to make the terminal output
less likely to be overwhelmed.
2017-06-02 15:26:23 +02:00