Atgeirr Flø Rasmussen
ec5eec23b1
Merge pull request #19 from akva2/redhat_packaging
...
added: redhat packaging spec file
2013-03-22 03:51:26 -07:00
Atgeirr Flø Rasmussen
e07543afc5
Merge pull request #21 from atgeirr/install-programs
...
Add simulator programs to be installed.
2013-03-22 03:15:22 -07:00
Atgeirr Flø Rasmussen
acdb476311
Merge pull request #18 from akva2/debian_packaging
...
added: debian packaging control files
2013-03-20 03:31:46 -07:00
Bård Skaflestad
8200b5dff7
Merge pull request #17 from atgeirr/combined
...
Adapt to changes in OPM/opm-core#203
2013-03-18 12:14:46 -07:00
Atgeirr Flø Rasmussen
7d5d314fc0
Update to match opm-core changes.
2013-03-18 13:10:32 +01:00
Atgeirr Flø Rasmussen
4fc8f52fb2
Moved ColumnExtract and initState.
...
ColumnExtract -> opm/core/grid/ and initState -> opm/core/simulator/.
2013-03-18 12:47:23 +01:00
Atgeirr Flø Rasmussen
44fa7ec920
Further reorganising of opm-core.
...
Deleted some unused code (or moved to opm-porsol), moved all code dealing with
time-of-flight to opm/core/tof, moved code for implicit transport solver to
opm/core/transport/implicit, spu_[im|ex]plicit.[ch] to opm/core/transport/minimal.
2013-03-18 12:38:04 +01:00
Atgeirr Flø Rasmussen
e319fd1e38
Renamed newwells.h -> wells.h.
...
Also moved implementation file to subdir.
2013-03-18 10:33:34 +01:00
Atgeirr Flø Rasmussen
c7789d7e52
Move GridManager to grid subdir.
...
Also remove GridAdapter (moved to dune-cornerpoint), and
moved grid.c implementation file to grid subdir.
2013-03-18 10:16:46 +01:00
Atgeirr Flø Rasmussen
3d5bd7ef96
Merge remote-tracking branch 'upstream/release/2013.03' into combined
2013-03-18 08:37:54 +01:00
Atgeirr Flø Rasmussen
1f64098baf
Merge pull request #14 from rolk/014_cmakeupd
...
Update CMake scripts to commit 9c1da9f5 from opm-core
2013-03-17 13:17:27 -07:00
Atgeirr Flø Rasmussen
c16cb6987b
Renames classes in line with opm-core changes.
2013-03-15 18:33:41 +01:00
Atgeirr Flø Rasmussen
04abba4d5e
Adapt to changed opm-core header name.
2013-03-15 17:55:24 +01:00
Atgeirr Flø Rasmussen
e42cfc1303
Reinstate correct porevolume usage.
...
The porevolume at the start of the timestep should be provided to
the solver.
2013-03-15 15:10:16 +01:00
Atgeirr Flø Rasmussen
63c7380d04
Bugfix: check for null ptr before use.
2013-03-15 15:02:42 +01:00
Atgeirr Flø Rasmussen
3a063e22d9
Bugfix: order of arguments in function call.
2013-03-15 15:00:18 +01:00
Atgeirr Flø Rasmussen
25bacfd231
Make SimulatorIncompTwophase flexible w.r.t. transport solver.
...
It can now use the reordering or the full Newton-Raphson solvers.
2013-03-15 14:16:59 +01:00
Atgeirr Flø Rasmussen
b8ed52d89e
Removed unused rock compressibilty objects from interface.
2013-03-15 11:45:53 +01:00
Atgeirr Flø Rasmussen
8a6e8fd8fa
Remove unused well objects from TransportSolverTwophaseImplicit.
2013-03-15 11:38:37 +01:00
Atgeirr Flø Rasmussen
6579abb853
Fixed implicit transport solver interface.
...
There were significant lifetime issues, now handled by moving
objects inside the class. Work in progress.
2013-03-15 11:15:17 +01:00
Atgeirr Flø Rasmussen
fb09c4b7a1
Modify solve() interface, fix source term bug in implicit solver.
2013-03-15 08:21:55 +01:00
Atgeirr Flø Rasmussen
3b1346173e
Minor adjustments.
2013-03-15 08:05:23 +01:00
Atgeirr Flø Rasmussen
1868285f23
Modified TransportSolverTwophaseInterface::solve(), general cleanup.
...
Move output arguments last in argument list.
2013-03-14 22:51:44 +01:00
Atgeirr Flø Rasmussen
2b4cb11ebc
Rename ImplicitTwoPhaseTransportSolver -> TransportSolverTwophaseImplicit.
2013-03-14 22:39:08 +01:00
Atgeirr Flø Rasmussen
d4f5338358
Rename TwoPhaseTransportSolver -> TransportSolverTwophaseInterface.
...
To be more consistent with naming practices elsewhere in opm-core.
2013-03-14 22:24:36 +01:00
Atgeirr Flø Rasmussen
1106538d85
Merge remote-tracking branch 'hnil/hnil_class' into combined.
...
Conflicts:
CMakeLists.txt
examples/sim_wateroil.cpp
opm/core/grid/cpgpreprocess/geometry.c
opm/core/transport/reorder/ReorderSolverInterface.hpp
opm/core/transport/reorder/TofDiscGalReorder.cpp
opm/core/transport/reorder/TofDiscGalReorder.hpp
opm/core/transport/reorder/TofReorder.cpp
opm/core/transport/reorder/TofReorder.hpp
opm/core/transport/reorder/TransportSolverCompressibleTwophaseReorder.cpp
opm/core/transport/reorder/TransportSolverTwophaseReorder.cpp
2013-03-14 16:18:39 +01:00
Atgeirr Flø Rasmussen
864cce5f5e
Adapt to moved opm-core headers.
2013-03-14 13:59:31 +01:00
Atgeirr Flø Rasmussen
6127afc1c6
Adapt include statements to moved headers.
2013-03-14 10:29:42 +01:00
Atgeirr Flø Rasmussen
e6de9b5352
Merge pull request #13 from atgeirr/make-io-subdir
...
Adapt to changed include paths for some opm-core headers.
2013-03-13 05:46:17 -07:00
Atgeirr Flø Rasmussen
23cef788fc
Adapt to changed include paths for some opm-core headers.
2013-03-12 11:08:33 +01:00
Atgeirr Flø Rasmussen
6c00d98a9e
Merge pull request #12 from rolk/012_cmakeupd
...
Update CMake scripts to commit f6d44238 from opm-core
2013-03-12 03:01:24 -07:00
Atgeirr Flø Rasmussen
2d871c1402
Moved writeECLData and writeVtkData to opm/core/io subdirs.
2013-03-08 08:06:18 +01:00
Atgeirr Flø Rasmussen
97857b6b2b
Merge pull request #11 from rolk/011_cmakeupd
...
Update CMake scripts to commit e75d69ef from opm-core
2013-03-06 02:22:32 -08:00
Roland Kaufmann
7e3a81f1a6
Remove make execution wrapper
2013-03-06 11:01:17 +01:00
Roland Kaufmann
f5e19e9b87
Remove remnants of the Autotools build system
2013-02-22 23:34:21 +01:00
Roland Kaufmann
4e34a967cb
Ignore output from CMake build
2013-02-22 23:34:21 +01:00
Roland Kaufmann
7925901380
Import cmake/ from commit 5f82198c in opm-core
2013-02-22 23:31:13 +01:00
Atgeirr Flø Rasmussen
661357d403
Merge pull request #6 from atgeirr/master
...
Improved output facilities
2013-01-17 05:50:36 -08:00
Atgeirr Flø Rasmussen
b4d5e03c61
Add eclipse output to simulator.
...
Note: so far only for incompressible fluid simulator.
2012-11-26 11:01:23 +01:00
Atgeirr Flø Rasmussen
b6b59918e1
Suppress output of multi-cell-block sizes and #iterations.
2012-11-26 11:00:20 +01:00
Atgeirr Flø Rasmussen
2f521169c5
Add ert-detecting macro for building with ert support.
...
This is primarily intended for enabling eclipse-format output from simulators.
Also add missing header to Makefile.am, to fix 'make distcheck'.
2012-11-26 10:58:18 +01:00
Halvor Møll Nilsen
772aae6a62
Corrected include statements after renaming files.
2012-11-16 16:24:54 +01:00
Halvor Møll Nilsen
523ca56ef1
Changes needed to for makeing a simulator using ImplicitTransport. Several changes in names to highlight what is reorder simulator classes
2012-11-16 13:38:03 +01:00
Halvor Møll Nilsen
c090eb618b
Added wrapper in code in separate file. Continued to change ../simulator/SimulatorIncompTwophase.cpp
2012-11-15 15:01:12 +01:00
Halvor Møll Nilsen
6c666f90a8
Changes to try to make naming and classes more consistent. This is a start to make devide models and tranport solvers so that VE models is more easely handled
2012-11-15 13:20:49 +01:00
Atgeirr Flø Rasmussen
bcfcfdc930
Use minimum 5 digits for step numbers in output file names.
...
Was 3 digits, created trouble for certain scripts reading
the files when more than 1000 steps were taken.
2012-11-05 15:37:14 +01:00
Atgeirr Flø Rasmussen
be617bbe7b
Merge pull request #5 from atgeirr/master
...
Add well management to polymer simulators.
2012-10-15 05:28:25 -07:00
Atgeirr Flø Rasmussen
2b292108ad
Added well management to SimulatorCompressiblePolymer.
...
Another polymer-specific overload of computeFractionalFlow()
has been added in support of this (this overload deals with
compressible properties.
Also added pressure normalization for situations with arbitrary
absolute pressure.
2012-10-15 14:23:13 +02:00
Bård Skaflestad
77fbdcf8d3
Merge branch 'ert'
2012-10-12 14:50:23 +02:00
Bård Skaflestad
0b86366e8e
Merge remote-tracking branch 'origin/ert' into ert
...
Conflicts:
Makefile.am
2012-10-12 11:04:20 +02:00