Commit Graph
1194 Commits
Author SHA1 Message Date
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
Bård Skaflestad 3678464d51 Merge pull request #141 from atgeirr/master
Fix warnings
2014-05-21 20:02:49 +02:00
Atgeirr Flø Rasmussen cb327ce63a Warning removal: const on return types not needed. 2014-05-21 19:49:29 +02:00
Atgeirr Flø Rasmussen 4734052d86 Bugfix: local variable shadowed proper variable. 2014-05-21 19:48:48 +02:00
Bård Skaflestad f0d908d104 Merge pull request #140 from atgeirr/cpr-preconditioning
Cpr preconditioner
2014-05-21 15:36:12 +02:00
Atgeirr Flø Rasmussen 3b80724581 Update Eigen requirements. 2014-05-21 13:57:16 +02:00
Atgeirr Flø Rasmussen f48ee55c0d Change error message. 2014-05-21 13:15:42 +02:00
Atgeirr Flø Rasmussen e9ab64fd18 Remove usage of DUNE_UNUSED_PARAMETER. 2014-05-21 13:14:02 +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
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
Atgeirr Flø Rasmussen fec6154d81 Remove unused data members and parameters. 2014-05-20 15:23:04 +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
Atgeirr Flø Rasmussen 023a46fa12 Put creation of elliptic system in separate function. 2014-05-20 14:24:24 +02:00
Atgeirr Flø Rasmussen b823324e59 Cite CPR article by Gries, Stuben et al. 2014-05-20 14:23: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
Atgeirr Flø Rasmussen 307cd6ef33 Add convergence check, local whitespace cleanup. 2014-05-19 11:21:23 +02:00
Atgeirr Flø Rasmussen ec03062b51 Remove unused code. 2014-05-19 11:13:17 +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