Commit Graph

908 Commits

Author SHA1 Message Date
Bård Skaflestad
feaa79d74b Prepare to assemble RESV control target. 2011-11-24 23:21:41 +01:00
Bård Skaflestad
2d8a73776f Assemble completion-to-cell contributions. Reestablish build. 2011-11-24 22:39:17 +01:00
Bård Skaflestad
581420d845 Check-point commit to mark half-way support for well assembly.
Does not build.
2011-11-24 18:57:38 +01:00
Bård Skaflestad
3085a4d12b Implement csrmatrix_zero() in terms of vector_zero(). 2011-11-23 23:06:16 +01:00
Bård Skaflestad
8677bc3827 Compute component fluxes across completions if the model includes wells.
This necessitates a public interface change whereby the caller is
required to pass the current well (bottom-hole) pressure values into
the assembler.
2011-11-23 19:25:47 +01:00
Bård Skaflestad
9d40dcd131 Remove an instance of EOL whitespace. 2011-11-23 19:16:22 +01:00
Bård Skaflestad
79e501a5ff Name the constant 20 according to local use.
Also, replace manual modulus calculation by built-in operator.
2011-11-23 19:14:55 +01:00
Bård Skaflestad
974d665ce3 Fix small inconsistency in field output subscripts.
While here, don't assert that the number of elements is divisible by 20.

Okay'ed by: Kari B. Skjerve
2011-11-23 19:09:53 +01:00
Ingeborg Ligaarden
d999a8c259 Now works for periodic on geocell after changing f2hf-mapping on periodic boundary. 2011-11-23 18:04:57 +01:00
Kari B. Skjerve
fc992da21f Output all field values for subsamples 2011-11-23 15:28:07 +01:00
Bård Skaflestad
8937b6b283 Allocate backing store for well completion data.
Also, include well connections in system matrix.
2011-11-23 15:25:48 +01:00
Bård Skaflestad
aff142bd54 Take initial steps towards including wells in assembly.
Specifically, accept (and currently ignore), a WellCompletions
structure into the constructor, and aggregate all driving forces
(source terms, boundary conditions and all well-related structures)
into an assembler-specific "force" structure.  Accept a pointer to
such a structure into the assemble() function.  Currently ignored
except for source terms.
2011-11-23 13:20:37 +01:00
Bård Skaflestad
099fa2b612 Name the well_t and well_control_t structures. 2011-11-23 11:23:30 +01:00
Ingeborg Ligaarden
c69f82368b Go to next step in linesearch if s< s_min or s > s_max. 2011-11-18 17:50:17 +01:00
Ingeborg Ligaarden
9dc4d190b6 Initialize increment to 0, it was 'nan' and therefore made linear solver return 'nan'. 2011-11-11 14:57:39 +01:00
Ingeborg Ligaarden
298280129c Gives the same jacobi and residual for geocell for fixed as r 8522 in MATLAB modulo different transmissiblity calculations for pcflux. 2011-11-11 10:21:24 +01:00
Bård Skaflestad
b812919e27 Remove std::array<>s that are not needed.
Discovered by: Kari B. Skjerve
2011-11-08 14:34:32 +01:00
Bård Skaflestad
38e0cb08eb Remove a comment that alludes to a non-portable technique. 2011-10-26 16:19:34 +02:00
Bård Skaflestad
68c51d8ddf Guard against 'bc' being NULL.
This is in preparation of introducing compressible boundary conditions
as represented by the 'compr_bc' module.
2011-10-25 19:34:32 +02:00
Bård Skaflestad
057d291b3e Add a facility for representing compressible boundary conditions. 2011-10-24 18:10:34 +02:00
Halvor M. Nilsen
17895db0ff fixed spu_2p.cpp after change of interface of implicit transport 2011-10-24 10:33:34 +02:00
Bård Skaflestad
420b14af05 Properly initialise the cell_facepos. 2011-10-24 10:01:13 +02:00
Bård Skaflestad
b8f7cc1765 Don't use uninitialised variables. 2011-10-21 15:30:44 +02:00
Halvor M. Nilsen
da045e561f seems to work after change to correct transmissibilities on periodic boundary 2011-10-21 08:51:37 +02:00
Halvor M. Nilsen
d533a816a0 compile after changes of calculation of transmissiblities 2011-10-20 17:26:08 +02:00
Halvor M. Nilsen
2acf1db8c7 compile after changes of calculation of transmissiblities 2011-10-20 17:26:08 +02:00
Bård Skaflestad
2835762542 Fix remaining bugs for incompressible flows driven by sources.
In particular:

  - Zero sufficient portion of the ->mat_row to hold all connections
    of a cell in addition to the accumulation term.

  - Don't write the residual into the accumulation term of the
    Jacobian matrix row.
2011-10-20 13:59:15 +02:00
Bård Skaflestad
c90fc0d85d Don't pretend that the time-step is always one. 2011-10-19 22:28:41 +02:00
Bård Skaflestad
f28f1137be Account for flow-direction signs when accumulating fluxes. 2011-10-19 22:10:22 +02:00
Bård Skaflestad
803e3d1286 Check allocation status in correct scope. 2011-10-19 20:32:50 +02:00
Bård Skaflestad
735e0fca95 Implement compressible (volume flux) source term assembly. 2011-10-19 20:09:51 +02:00
Bård Skaflestad
7d097bafac Accept a set of compressible source terms rather than a double*.
While here, restore an essential semicolon lost in cset 11881e6cd650.
2011-10-19 19:54:17 +02:00
Bård Skaflestad
c2482fbf12 Remove unused function. 2011-10-19 19:48:46 +02:00
Bård Skaflestad
f87b9184ae Add a simple representation of a compressible (volume flux) source term. 2011-10-19 19:44:32 +02:00
Bård Skaflestad
0f0844b45e Clear Jacobian row before assembling local contributions. 2011-10-19 15:14:11 +02:00
Bård Skaflestad
f14b54cee8 Simplify offset calculation. 2011-10-19 15:12:16 +02:00
Bård Skaflestad
21701c8eff Correct various indexing errors. 2011-10-19 15:11:21 +02:00
Bård Skaflestad
cabd8ace6a Re-install interface pressure calculation in residual formulation. 2011-10-19 13:27:24 +02:00
Bård Skaflestad
b0645e7c9a Remove further traces of well support.
Wells will be introduced at a later time.
2011-10-19 13:11:44 +02:00
Bård Skaflestad
3393aa0d9e Hook residual formulation up to build. 2011-10-19 13:01:06 +02:00
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