Commit Graph

717 Commits

Author SHA1 Message Date
Bård Skaflestad
9af8481868 Merge cfs_tpfa backout. This restores backwards compatibility. 2011-10-18 23:22:52 +02:00
Bård Skaflestad
b70a7d6832 Backed out changeset d83710dd6839 2011-10-18 23:22:26 +02:00
Bård Skaflestad
717a5cfc9b Merge 'compr_quant' backout.
This is another attempt at restoring backwards compatibility.
2011-10-18 23:20:57 +02:00
Bård Skaflestad
e3b52c3a44 Backed out changeset 9faef9e37070 2011-10-18 23:20:34 +02:00
Bård Skaflestad
8260b59942 Grab copy of 'compr_quant' module. 2011-10-18 23:19:53 +02:00
Bård Skaflestad
556724befd Merge backout. 2011-10-18 23:18:29 +02:00
Bård Skaflestad
e54f1cf147 Backed out changeset 3b7e5d602aab
We need a copy of 'compr_quant' before restoring compat.
2011-10-18 23:18:22 +02:00
Bård Skaflestad
ec5d660d67 Merge backout. 2011-10-18 23:17:33 +02:00
Bård Skaflestad
986e8183c4 Backed out changeset 6b1a90716ea5 2011-10-18 23:17:02 +02:00
Bård Skaflestad
f469234ae5 Back out cset 5e3d75476d64. 2011-10-18 23:14:15 +02:00
Bård Skaflestad
8a63636c94 Backed out changeset 5e3d75476d64
In preparation of restoring backwards compatibility in 'cfs_tpfa' module.
2011-10-18 23:13:41 +02:00
Bård Skaflestad
7bea27208e Grab copy of 'cfs_tpfa' module in preparation of restoring backwards compat. 2011-10-18 23:12:54 +02:00
Bård Skaflestad
4f657d9f87 Make first attempt at implementing the residual/Jacobian formulation.
This is a step in the direction of having a true IMPES pressure solver
and to remove the 'experimental_jacobian' option in dune-porsol.
2011-10-18 20:46:05 +02:00
Bård Skaflestad
cd02647d53 Delete trailing whitespace. 2011-10-18 20:41:44 +02:00
Bård Skaflestad
99fa7b7f0e Delete trailing whitespace. 2011-10-18 20:41:13 +02:00
Bård Skaflestad
e44b7317b8 Delete trailing whitespace. 2011-10-18 20:40:19 +02:00
Bård Skaflestad
ceaea9f987 Rework compressibility representation.
Switch to storing a complete fluid-matrix derivative in the
compr_quantities rather than the total compressibility.  Maintain the
"volume discrepancy" field.  Also, add traditional memory management
functions.
2011-10-18 20:38:28 +02:00
Halvor M. Nilsen
4750e17699 checking after introducing linesearch, do maybe work, but did not help our objektives 2011-10-18 15:08:30 +02:00
Halvor M. Nilsen
6ce89ee3c3 2011-10-17 11:36:54 +02:00
Halvor M. Nilsen
ff777eab69 probably a correction 2011-10-17 11:07:36 +02:00
Bård Skaflestad
9b0b258198 Factor pressure (increment) assignment out of _press_flux().
The linear solution h->x is the pressure increment, not the actual
pressure value, so we cannot compute fluxes based on h->x alone.
2011-10-17 11:05:04 +02:00
Halvor M. Nilsen
1cd4352beb checkin after merge 2011-10-17 10:55:20 +02:00
Halvor M. Nilsen
77c36f647a checking after getting things to run, I do not trust the results 2011-10-14 16:46:09 +02:00
Bård Skaflestad
6442d3fda2 Don't reference (non-existent) Dune directories. Remove disabled code. 2011-10-13 19:38:33 +02:00
Halvor M. Nilsen
7ac7bdfbac moved dune definishins for dune to porsol/common 2011-10-13 13:52:38 +02:00
Halvor M. Nilsen
59d0181a31 something with substate after merge 2011-10-13 11:14:36 +02:00
Halvor M. Nilsen
0a1fc38fd0 checking after changing back to grid interface euler in traits and adding boundary conditions for fixed, the code finialy does something 2011-10-13 10:26:51 +02:00
Bård Skaflestad
8df4e23f92 Support compilers for which ::std::array<> isn't available. 2011-10-12 20:50:53 +02:00
Halvor M. Nilsen
9610763e07 changes the code compile: runs: and give wrong results 2011-10-12 16:10:51 +02:00
Halvor M. Nilsen
27cecaabef changes the code compile: runs: and give wrong results 2011-10-12 16:10:51 +02:00
Halvor M. Nilsen
42e70c78d4 mearge from upstream 2011-10-12 13:23:20 +02:00
Halvor M. Nilsen
7c3c8ac3e7 changes to try to make upscaling work with implicit solver 2011-10-12 13:18:48 +02:00
Bård Skaflestad
2bc3a1d217 Remove <array> header that is no longer needed. 2011-10-11 21:17:22 +02:00
Bård Skaflestad
120153bb1f The individual sys.vector()s aren't necesserily std::vector<>s. Adjust.
While here, reduce dependency on c++11 by substituting ordinary arrays
for std::array<>s.
2011-10-11 18:00:49 +02:00
Halvor M. Nilsen
f5fa61eb13 definitions to use opmtransport in dune-upscaling 2011-10-11 14:55:11 +02:00
Halvor M. Nilsen
ee62a57dc7 added EulerUpstreamImplicit, added implicit traits: does notthing now 2011-10-11 11:42:40 +02:00
Bård Skaflestad
35a8bf54bc Spell 'libcpgpreprocess' correctly. 2011-10-07 12:01:51 +02:00
Bård Skaflestad
939f231457 huild a convenience library for consumption by libdunecornerpoint.la .
This facilitates building consumers of libdunecornerpoint.la using CMake
(and Qt Creator).
2011-10-07 11:51:17 +02:00
Bård Skaflestad
50a4869f7a Remove an unused variable. 2011-10-06 18:14:48 +02:00
Bård Skaflestad
ee43437183 Increase problem size, and report solver meta data upon completion. 2011-10-06 17:25:13 +02:00
Bård Skaflestad
c7efb7d775 Use 0.5 as an initial guess for the saturation at next time level.
This appears to be more stable in limited testing on slightly
non-linear problems.
2011-10-06 17:24:32 +02:00
Bård Skaflestad
da683da206 Add a simple saturation dump using vector_write() from OPMPressure. 2011-10-06 15:12:43 +02:00
Bård Skaflestad
c56215bdcd Use control parameters that don't lead to singular matrices. 2011-10-06 15:07:00 +02:00
Bård Skaflestad
b0e35ca07a Honour ImplicitTransport requirement introduced in cset af1c979d2947.
We need to define a coefficient matrix clearing operator.
2011-10-06 15:02:15 +02:00
Bård Skaflestad
b867283f05 Fill semantic hole in initIteration(). Store the current sat-change.
This is needed to implement the accumulation term of the residual.
2011-10-06 14:57:46 +02:00
Bård Skaflestad
255a0cf6ee Clear coefficient matrix and residual between assemblies.
Request that the user specify a suitable operator for clearing the
coefficient matrix, and call it just prior to assemble().
2011-10-06 14:54:02 +02:00
Bård Skaflestad
711e59df4c Insert glue for zeroing the coefficient matrix between Jacobian assemblies.
Specifically, request availability of a read/write access to the
Jacobian matrix, and a means to zeroing the elements of an arbitrary
matrix type (unimplemented 'MatrixZero' template class).
2011-10-06 14:51:51 +02:00
Bård Skaflestad
ff8518e55e Restore build assertion that is once more valid following cset dd4a755bc683.
Also, implement a function for zeroing a CSRMatrix, and create a
read/write reference to the underlying matrix.  Needed for clearing
the coefficient matrix between each Jacobian assembly.
2011-10-06 14:48:51 +02:00
Bård Skaflestad
7f766149b3 Order parameters correctly.
If the cell were a type other than a primitive 'int', this would have
been caught by the compiler...
2011-10-06 10:27:35 +02:00
Bård Skaflestad
a5220bcd29 Build entire system structure once, at createSystem() time.
This leads to two grid passes if the problem is linear, but saves
rebuilding the same structure at every Newton iteration.
2011-10-06 00:34:04 +02:00