Atgeirr Flø Rasmussen
9fec84312f
Rename method linearSolve()->computeNewtonIncrement().
2014-04-08 16:16:54 +02:00
Atgeirr Flø Rasmussen
bd44127bd6
Renamed more classes.
...
FullyImplicitSystemSolver{Interface, Simple} -> NewtonIterationBlackoil{Interface, Simple}.
Change suggested by B. Skaflestad.
2014-04-08 16:11:08 +02:00
Atgeirr Flø Rasmussen
a434d39363
Modify for renamed file.
...
Forgot this for the initial renaming commit.
2014-04-08 15:59:14 +02:00
Atgeirr Flø Rasmussen
9e7ab6d1d2
Renamed class {FullyImplicit->Linearised}BlackoilResidual.
2014-04-08 15:56:08 +02:00
Atgeirr Flø Rasmussen
a19344efa9
Changed docs/comments after review suggestions.
...
Suggestions from B. Skaflestad and A. Lauser.
2014-04-08 15:28:10 +02:00
Atgeirr Flø Rasmussen
f1956f05f9
Merge branch 'cpr-preconditioning' into cpr-preconditioning-again
...
Conflicts:
examples/sim_fibo_ad.cpp
examples/test_implicit_ad.cpp
opm/autodiff/FullyImplicitBlackoilSolver.cpp
opm/autodiff/SimulatorFullyImplicitBlackoil.cpp
opm/autodiff/SimulatorFullyImplicitBlackoil.hpp
2014-04-08 15:06:01 +02:00
Bård Skaflestad
79afd9850c
Merge pull request #117 from atgeirr/fix_welleq
...
Fix NaNs for well equations.
2014-04-07 15:53:44 +02:00
Atgeirr Flø Rasmussen
e699f9e135
Remove unnecessary argument, and minor formatting corrections.
2014-04-05 00:12:03 +02:00
Atgeirr Flø Rasmussen
303bbac943
Merge remote-tracking branch 'totto82/fix_welleq' into fix_welleq
2014-04-05 00:07:00 +02:00
Atgeirr Flø Rasmussen
b78413a63a
Merge pull request #116 from andlaus/adapt_to_EclipseWriter_refactoring
...
make everything compile with the newly refactored EclipseWriter
2014-04-04 23:28:02 +02:00
Tor Harald Sandve
a905eade7a
Use preferred phase to compute wellbore mix for dead wells
...
The wellmore mix is set to preferred phase for dead wells, where the
total volumetric rates are zero. This sets the phase of the flow out of
perforations in dead wells and thus avoids zero volumerats for injecting
preforations in dead wells.
2014-04-04 11:36:02 +02:00
Andreas Lauser
8437051416
make everything compile with the newly refactored EclipseWriter
...
the states needed to be removed from the call to writeInit()...
2014-04-02 17:06:20 +02:00
Bård Skaflestad
1f8276b3d4
Merge pull request #115 from atgeirr/expand-selector-options
...
Add more options for Selector class.
2014-04-02 13:14:33 +02:00
Atgeirr Flø Rasmussen
6c4114ea69
Add more options for Selector class.
...
You can now choose which comparison to do for the indicator vector
to find when to choose the left argument. Only >= before (still default).
2014-04-01 15:49:01 +02:00
Atgeirr Flø Rasmussen
c89e9ed53d
Merge pull request #114 from andlaus/sim_fibo_ad_remove_old_parser
...
sim_fibo_ad: remove compatibility code for old parser
2014-04-01 08:39:01 +02:00
Andreas Lauser
5e7064b337
sim_fibo_ad: remove compatibility code for old parser
...
this makes the simulator quite a bit more maintainable: setting
USE_NEW_PARSER to 0 did not even compile after the the constructor for
the wells manager which took the old deck was removed last
week. Since, according to Atgeirr, SPE-1 is now producing exactly the
same results as before, it also does no longer make too much sense to
keep that code on life support...
2014-03-31 16:39:17 +02:00
Atgeirr Flø Rasmussen
b8a8242159
Merge pull request #113 from atgeirr/fix-timer-usage
...
Fix timer usage.
2014-03-28 15:52:43 +01:00
Atgeirr Flø Rasmussen
4b53f88685
Fix timer usage.
...
This makes the simulator produce proper summary output again.
2014-03-28 14:31:30 +01:00
Atgeirr Flø Rasmussen
faba01f917
Merge pull request #112 from GitPaean/fix_using_new_timer
...
A small fix to make sim_fibo_ad use the new SimulatorTimer.
2014-03-28 13:51:22 +01:00
Atgeirr Flø Rasmussen
9d9576c955
Merge pull request #110 from atgeirr/new_well_formulation
...
New well formulation
2014-03-28 12:47:29 +01:00
Kai Bao
0914841823
A small fixing to make the sim_fibo_ad using the new timer.
2014-03-27 11:15:55 +01:00
Atgeirr Flø Rasmussen
d4f1a89370
Merge pull request #111 from andlaus/FullyImplicitBlackoilSolver_throw_exception_uppon_non-finite_residual
...
FullyImplicitBlackoilSolver: Throw an exception uppon encountering a non-finite residual
2014-03-26 15:29:34 +01:00
Andreas Lauser
8cd93bf70a
FullyImplicitBlackoilSolver: cleanup the residualNorm() method
2014-03-26 15:16:43 +01:00
Atgeirr Flø Rasmussen
2db726268b
Merge pull request #108 from andlaus/FullyImplicitBlackoilSolver_unify_state_conversion
...
FullyImplicitBlackoilSolver: unify the state conversion routines
2014-03-26 14:29:08 +01:00
Atgeirr Flø Rasmussen
8663c5b604
Merge branch 'FullyImplicitBlackoilSolver_unify_state_conversion' of https://github.com/andlaus/opm-autodiff into test_andlaus
...
Conflicts:
opm/autodiff/FullyImplicitBlackoilSolver.cpp
Resolved by using the new, reduced version of constantState().
2014-03-26 14:21:23 +01:00
Andreas Lauser
2f84156b91
FullyImplicitBlackoilSolver: Throw an exception uppon encountering a non-finite residual
2014-03-26 12:54:46 +01:00
Atgeirr Flø Rasmussen
347016a066
Add more checks to cover bug that was in operator -=.
2014-03-26 12:25:11 +01:00
Atgeirr Flø Rasmussen
60ff38adc6
Added test for += and -= operators.
2014-03-26 12:03:44 +01:00
Atgeirr Flø Rasmussen
37a23825c4
Removed dead code in test_block.cpp.
2014-03-26 11:48:13 +01:00
Atgeirr Flø Rasmussen
3bc57780aa
Fix bug in -= operator.
2014-03-26 11:44:49 +01:00
Atgeirr Flø Rasmussen
5e4dff401c
Merge branch 'master' into new_well_formulation
...
Needed to avoid compile errors with updated opm-core.
2014-03-26 11:02:52 +01:00
Atgeirr Flø Rasmussen
4845fc3073
Merge pull request #109 from joakim-hove/remove-old-WellsManager
...
Removed calls to deprecated WellsManager() constructor
2014-03-25 23:28:26 +01:00
Joakim Hove
2f23e72bea
Removed calls to WellsManager() constructor which uses old EclipseGridParser.
2014-03-25 19:36:42 +01:00
Atgeirr Flø Rasmussen
a2e3ee0a81
Merge pull request #106 from andlaus/sim_fibo_ad_remove_outputwriter_from_simulator
...
don't pass the eclipsewriter to the simulator anymore
2014-03-25 19:01:28 +01:00
Atgeirr Flø Rasmussen
41fd953ba2
Fix bugs relating to wells versus perforations.
...
Two kinds of bugs: correct usage of wops_.w2p vs. wops_.p2w, and
correct sizes for some variables (nw vs. nperf).
2014-03-25 18:44:37 +01:00
Atgeirr Flø Rasmussen
dcb59a2fab
Fix bug in access order for state.qs.
...
State.qs is called well_phase_flow_rate in this function.
It is stored with wells running fastest, not phases.
2014-03-25 17:42:14 +01:00
Atgeirr Flø Rasmussen
cb50728ac2
Add end-of-line to switching message.
2014-03-25 17:41:41 +01:00
Atgeirr Flø Rasmussen
4a22c560c7
Implemented updateWellControls().
2014-03-25 14:31:06 +01:00
Andreas Lauser
168b4379d5
don't pass the eclipsewriter to the simulator anymore
...
i.e., the simulator does not deal with any output operations
anymore. This makes sense because report steps are handled by
Opm::TimeMap and the constructor for the simulator already needs more
arguments than appropriate even without this...
2014-03-25 13:17:30 +01:00
Andreas Lauser
9237aa2443
FullyImplicitBlackoilSolver: make constantState() and variableState() consistent
...
With this, constantState() just calls variableState() and throws away
the derivatives. This might be a bit slower than necessary, but it
makes these two methods automatically consistent and constantState()
is only called once per timestep anyway...
thanks to @atgeirr for the suggestion!
2014-03-25 11:55:13 +01:00
Atgeirr Flø Rasmussen
20ecd37709
Use currentControls() field of well state class.
...
Now the well state is consulted for the controls to use when assembling
the well control equations, instead of the (immutable) wells_ struct.
Also, added dummy implementation of updateWellControls().
2014-03-25 11:14:11 +01:00
Atgeirr Flø Rasmussen
bad64de4f2
Add currentControls() field to well state class.
...
This is done since the solver will need to be able to switch well controls
during Newton iterations. The current control specified in the Wells struct
will be used as default and initial value for currentControls().
2014-03-25 11:11:19 +01:00
Atgeirr Flø Rasmussen
33d58792de
Fix sign bug in well contribution to mass balance.
2014-03-24 15:28:46 +01:00
Atgeirr Flø Rasmussen
73402c892f
Merge branch 'master' into new_well_formulation
2014-03-24 14:00:24 +01:00
Atgeirr Flø Rasmussen
cdeac8eed8
Merge pull request #105 from andlaus/sim_fibo_ad_dont_instantiate_old_parser
...
sim_fibo_ad: don't instantiate an old parser object if USE_NEW_PARSER is set anymore
2014-03-21 09:03:20 +01:00
Atgeirr Flø Rasmussen
ee28454b84
Merge pull request #104 from andlaus/sim_fibo_ad_print_reportstep
...
sim_fibo_ad: re-add ouputting of the current report step when using opm-parser
2014-03-21 09:01:29 +01:00
Andreas Lauser
79c93953f8
sim_fibo_ad: don't instantiate an old parser object if USE_NEW_PARSER is set anymore
...
I thought I included this in a previous PR. Seems like I was wrong...
2014-03-20 15:44:53 +01:00
Andreas Lauser
dee6f683cb
sim_fibo_ad: re-add ouputting of the current report step when using opm-parser
...
in the old parser, this was called 'epoch'...
2014-03-20 13:14:34 +01:00
Atgeirr Flø Rasmussen
fd4f5f5a26
Merge branch 'master' into new_well_formulation
...
Conflicts:
opm/autodiff/FullyImplicitBlackoilSolver.cpp
To resolve conflicts, WellState was changed to WellStateFullyImplicitBlackoil
in multiple places, and perfRate() changed to perfPhaseRate() in
WellDensitySegmented.
2014-03-20 10:04:45 +01:00
Atgeirr Flø Rasmussen
f99b9b90a4
Merge pull request #101 from andlaus/sim_fibo_ad_use_new_wellmanager
...
sim_fibo_ad: convert to the new-style wells manager
2014-03-20 09:07:03 +01:00