OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-07-29 21:17:55 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,330 Commits 24 Branches 102 Tags
3b742e0093469c14d1270f80fd756fbe758cf06e
Commit Graph
75 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Kai Bao 2ac5146cfc Adding ErrorMacros.hpp to GeoProps.hpp 
#include <opm/core/utility/ErrorMacros.hpp>
 2014-07-29 11:40:52 +02:00
Kai Bao eb3445e6a1 Finishing compliation. 2014-07-27 17:31:00 +02:00
Kai Bao 1e8d5e65b7 Finishing changing. Testing Later 2014-07-25 19:13:23 +02:00
Kai Bao 013e4e452a Merge remote-tracking branch 'upstream/master' into New_BLACKOIL_SIMULATOR 2014-07-25 15:56:52 +02:00
Kai Bao 8da842d1f3 Commit for saving. 2014-07-24 17:06:43 +02:00
Kai Bao 51fae6ca70 Removing some comments. 2014-05-23 14:55:54 +02:00
Kai Bao f516bd6ce3 Removing some comments and debugging output. 2014-05-23 14:53:54 +02:00
Kai Bao c96637ab96 Changing detectNewtonOscillations() a little bit. 
Changing detectNewtonOscillations() a little bit for ease in reading.
 2014-05-23 14:50:49 +02:00
Kai Bao 508a0c11ef Adding some comments before calling stablizeNewton. 2014-05-23 14:25:58 +02:00
Kai Bao bb22f3572d Adding size function in LinearisedBlackoilResidual. 
int sizeNonLinear() const;
To compute the size of the non-linear system.
 2014-05-23 13:40:44 +02:00
Kai Bao 9fe98514c0 Changing the location of & when defining reference. 2014-05-23 11:39:26 +02:00
Kai Bao 1da24f3c3c Changing the way of string comparison to ==. 2014-05-23 10:07:02 +02:00
Kai Bao cb48d185b9 The reference is used for residual_histroy. 
In the detectNewtonOscillations().
 2014-05-23 09:55:29 +02:00
Kai Bao f2518b6647 Removing the output of the size of system. 2014-05-22 22:15:55 +02:00
Kai Bao cd174c5ba4 Merge branch 'specifying_maximum_iterations' into oscillation_treatment_withlimitedupdate 
Conflicts:
	opm/autodiff/FullyImplicitBlackoilSolver.hpp
	opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp
 2014-05-22 22:13:14 +02:00
Kai Bao 6e6339d8c3 Adding user-specifying max iteration. 2014-05-22 22:09:54 +02:00
Kai Bao fdb201d365 Restoring maxit to be 15. 2014-05-22 21:59:27 +02:00
Kai Bao 8a905535ce Removing some spaces. 2014-05-22 21:58:44 +02:00
Kai Bao 6ac95ac7a8 Removing some debugging output. 2014-05-22 21:56:00 +02:00
Kai Bao 5c409173b4 Removing some debugging output. 2014-05-22 20:56:22 +02:00
Kai Bao 95cd33185b Correcting the determination of stagnate. 2014-05-22 20:25:58 +02:00
Kai Bao f597e2117d Rewriting the detection function with for loop. 
It is more automatic while it remains to change to some more flexible
form.
 2014-05-22 16:07:17 +02:00
Kai Bao d7aa21dc03 Merge branch 'master' into oscillation_treatment_withlimitedupdate 
Conflicts:
	opm/autodiff/FullyImplicitBlackoilSolver.hpp
 2014-05-22 09:59:50 +02:00
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
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
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
Kai Bao 613a87eb56 Merge remote-tracking branch 'upstream/master' 2014-05-12 10:43:57 +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
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
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
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
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
Kai Bao 5c6503848e Merge remote-tracking branch 'upstream/master' 2014-04-28 15:50:34 +02:00
Kai Bao 820e65e772 Merge remote-tracking branch 'atgeirr/spe9-fixes' 2014-04-28 14:09:06 +02:00
Kai Bao 3bdfbfd78c Merge remote-tracking branch 'upstream/master' 2014-04-22 09:27:50 +02:00
Kai Bao 964a99ab3a Merge branch 'fix_welleq' 2014-04-09 09:47:13 +02:00
Kai Bao 84b98d5f31 add some breakpoints for debug 2014-04-09 09:45:59 +02: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