Kai Bao
2733b5459e
Removing the space before ().
2014-05-21 11:02:04 +02:00
Kai Bao
252048b30a
Removing one blank line.
2014-05-21 11:00:24 +02:00
Kai Bao
0178bd1b8c
Removing the bool paramters calling stablizeNewton.
2014-05-21 10:47:55 +02:00
Kai Bao
5277fa389d
Removing two input paramters in stablizeNewton().
...
Removing the bool input parameters osicllate and stagnate from the
stablizeNewton(). Basically, the value omega will decide if the
relaxation will be applied.
2014-05-21 10:44:20 +02:00
Kai Bao
578abe3b78
Merge branch 'master' into oscillation_treatment_withlimitedupdate
...
Conflicts:
opm/autodiff/FullyImplicitBlackoilSolver.hpp
2014-05-21 10:12:49 +02:00
Atgeirr Flø Rasmussen
3e956a9659
Merge pull request #139 from GitPaean/limited_variable_update
...
Limited variable update
2014-05-20 21:52:22 +02:00
Kai Bao
827cd7e8e4
Removing the param.has() if condition.
2014-05-20 19:53:39 +02:00
Kai Bao
44a3dbd732
Finishing the workflow.
2014-05-20 19:52:15 +02:00
Kai Bao
63c53096cd
Using param.getDefault() instead of param.get().
...
And also remove the space in dsMax (), drsMaxRel (), dpMaxRel ().
2014-05-20 15:17:37 +02:00
Atgeirr Flø Rasmussen
97f572f5d4
Merge pull request #137 from atgeirr/fix-wellcontrolupdate
...
Fix two bugs in updateWellControls().
2014-05-20 15:14:09 +02:00
Kai Bao
0e244a4845
Commit to save changes.
2014-05-20 15:00:49 +02:00
Kai Bao
9557db4c15
Merge branch 'limited_variable_update' of github.com:GitPaean/opm-autodiff into oscillation_treatment_withlimitedupdate
...
Conflicts:
opm/autodiff/FullyImplicitBlackoilSolver.hpp
2014-05-20 13:45:13 +02:00
Kai Bao
c617623eb1
Adding debugging output.
2014-05-20 13:31:13 +02:00
Kai Bao
79916078f2
Changing the defalut value for the paramters.
...
Add reordering the intialization order to removing the reordered
warning.
2014-05-20 13:05:11 +02:00
Kai Bao
8dcae05a7b
Revising the function stablizeNewton().
...
For the SOR type relaxation, we need the dx from the previous iteration.
2014-05-20 11:25:04 +02:00
Kai Bao
5b6c325a32
Finish the first stablizeNewton().
2014-05-19 18:41:38 +02:00
Kai Bao
ab8636b57d
Add function detectNewtonOscillations.
2014-05-19 15:43:56 +02:00
Kai Bao
341f727467
Add the residuals() function.
2014-05-19 13:06:44 +02:00
Kai Bao
a969025c5e
Add a residuals function prototype.
2014-05-19 10:41:23 +02:00
Kai Bao
2b31ab6111
Removing one blank line.
2014-05-16 18:27:23 +02:00
Kai Bao
d461eb9e76
Cleaning up some debugging output.
2014-05-16 18:15:42 +02:00
Kai Bao
f2ecbf163e
Cleaning up some debugging output.
2014-05-16 18:13:36 +02:00
Kai Bao
cd50b54ddf
Finishing the modification for solver class.
2014-05-16 18:02:55 +02:00
Kai Bao
94e3fd3fcb
Add more residual output in getConvergence.
...
Output the residualWellFlux, residualWell, MB to monitor the convergence
process.
2014-05-16 13:52:33 +02:00
Kai Bao
55b0164d4a
Apply dpmaxrel to the update of bhp
...
And also change the default value for dpmaxrel.
2014-05-16 13:46:00 +02:00
Kai Bao
b001c580b9
Add drsmaxrel for the update of rs.
...
drsmaxrel is a relative limit.
2014-05-16 13:32:34 +02:00
Kai Bao
4cef151091
Add dsmax for the update of saturations.
...
dsmax is the absolute limit for saturation update.
2014-05-16 13:26:44 +02:00
Atgeirr Flø Rasmussen
52746a6455
Fix two bugs in updateWellControls().
...
The bugs were:
- Not accounting for the different storage orders used for the
state.qs variable and the WellState*::wellRates() field.
- When switching to rate control, well rates for phases other
than that to be controlled by were set to zero.
2014-05-16 09:07:43 +02:00
Kai Bao
613a87eb56
Merge remote-tracking branch 'upstream/master'
2014-05-12 10:43:57 +02:00
Atgeirr Flø Rasmussen
eb121f89db
Merge pull request #136 from atgeirr/fix-missing-template-keyword
...
Fix missing template keyword.
2014-05-12 09:33:16 +02:00
Atgeirr Flø Rasmussen
9e170a3f96
Fix missing template keyword.
...
When invoking a member template in a template function one must in most
cases use the template keyword as a qualifier to indicate that the member
is a template.
I do not understand why this did not trigger a compiler error for the
original author though.
2014-05-12 09:28:15 +02:00
Atgeirr Flø Rasmussen
96610704c4
Merge pull request #132 from atgeirr/remove-old-well-eq
...
Remove unused function addOldWellEq().
2014-05-09 21:28:54 +02:00
Atgeirr Flø Rasmussen
a89d67d8cb
Merge pull request #133 from GitPaean/fixing_spe3_newConvergence
...
Fixing spe3 new convergence
2014-05-09 21:27:29 +02:00
Kai Bao
756c7ca92b
Merge remote-tracking branch 'upstream/master'
2014-05-09 14:43:03 +02:00
Kai Bao
8d51dac6c6
Deleting some unused variables.
...
In FullyImplicitBlackoilSolver_impl.hpp
atol, rtol, resTooLarge
Not setting the converged to be false for the first iteration.
2014-05-09 12:48:04 +02:00
Atgeirr Flø Rasmussen
f7f286a574
Merge pull request #135 from totto82/updatePerfp
...
Update perfPressure
2014-05-09 11:30:49 +02:00
Kai Bao
02ab5b0f22
Cleaning up some commented lines.
2014-05-08 17:19:02 +02:00
Kai Bao
a8ddf7477d
Cleaningup and ready for push.
2014-05-08 14:38:09 +02:00
Tor Harald Sandve
3143333b69
Update perfPressure
...
The secondary variable perfpressure is updated when the well
equation is assembled. The perfpressure is used to calculate the
welldensity.
2014-05-08 13:32:49 +02:00
Kai Bao
aec38e503d
Using the updated rq_ instead of recomputing them.
2014-05-08 11:41:54 +02:00
Kai Bao
3798e3f69b
Add return converged for the getConvergence_b;
2014-05-08 11:21:47 +02:00
Kai Bao
5ef4976f4a
Using the units from the opm-core.
...
And a new interface for getConvergence based on x and xw.
2014-05-08 11:03:42 +02:00
Kai Bao
ccc1577f09
Deleting some spaces.
...
FullyImplicitBlackoilSolver_impl.hpp
2014-05-07 14:54:44 +02:00
Kai Bao
930beabd21
Cleaning up FullyImplicitBlackoilSolver_impl.hpp.
2014-05-07 14:52:06 +02:00
Kai Bao
be30504daa
Cleaning up debugging information.
...
NewtonIterationBlackoilSimple.cpp
SimulatorFullyImplicitBlackoil_impl.hpp
2014-05-07 14:45:10 +02:00
Kai Bao
7bd73ac54e
Cleaning debugging information in sim_fibo_ad.cpp
2014-05-07 14:42:02 +02:00
Kai Bao
4f006cad78
Merge remote-tracking branch 'upstream/master' into fixing_debugging
2014-05-07 14:34:43 +02:00
Atgeirr Flø Rasmussen
3e2dd11641
Remove unused function addOldWellEq().
2014-05-07 14:34:20 +02:00
Kai Bao
176086c61e
Merge remote-tracking branch 'upstream/master'
2014-05-07 14:31:07 +02:00
Kai Bao
414032220b
Commit before cleaning up.
2014-05-07 14:23:55 +02:00