Commit Graph

890 Commits

Author SHA1 Message Date
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
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
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
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
Kai Bao
9cd7620121 Comment out the unused np and sat
In function getConvergence()
2014-05-06 17:13:24 +02:00
Kai Bao
72c00eb3ee Comment out the cin.ignore() in sim_fibo_ad.cpp 2014-05-06 17:10:39 +02:00
Kai Bao
65350426f7 Finishing the first version of the getConvergence. 2014-05-06 17:09:00 +02:00
Kai Bao
7bb7e5fbb4 Finish the first version of getConvergence.
The determination of disgas and vapoil is omitted and should be added
later.
2014-05-06 15:47:08 +02:00
Kai Bao
cfc589b453 Add some outputing information 2014-05-05 17:54:32 +02:00
Bård Skaflestad
0ae44c32b1 Merge pull request #127 from andlaus/move_to_opm-parser
Move to opm parser
2014-05-02 17:01:27 +02:00
Andreas Lauser
ebb1da0662 replace all boost:: smart pointers by their std:: equivalents
The std variants are part of c++-2011 and it's 2014 now. (they are
also available in GCC 4.4.)
2014-05-02 16:17:54 +02:00
Andreas Lauser
b7f3ee7b79 rename "newParserDeck" to "deck" 2014-05-02 15:48:04 +02:00
Andreas Lauser
dbb19403fc completely remove the EclipseGridParser from the module 2014-05-02 15:47:52 +02:00
Andreas Lauser
553698a933 remove tests/integration_tests/sim_fibo_ad_test.cpp
this test seems to compare the old and the new parser which does not
make sense anymore once the old parser is no longer available...
2014-05-02 13:59:25 +02:00
Kai Bao
fecc161d7e The output for the first Newton iteration
output the matrix, residual and the solution for the first Newton
iteration in opm/autodiff/NewtonIterationBlackoilSimple.cpp
2014-05-02 10:49:44 +02:00
Andreas Lauser
83705279bb add the TABDIMS keyword to the data file for the fluid unit test
that's necessary because the Eclipse RM references it in the table
keywords and the opm-parser needs the keyword to be present to use
it...
2014-04-30 16:49:29 +02:00
Kai Bao
5c6503848e Merge remote-tracking branch 'upstream/master' 2014-04-28 15:50:34 +02:00
Bård Skaflestad
cd24e53d85 Merge pull request #128 from atgeirr/spe9-fixes
Spe9 fixes
2014-04-28 14:47:06 +02:00