Commit Graph

4709 Commits

Author SHA1 Message Date
Arne Morten Kvarving
7cedf056d7 quell signed/unsigned comparison warnings 2018-06-20 13:38:52 +02:00
Arne Morten Kvarving
261f6ac270 fixed: pass by const ref 2018-06-20 12:56:10 +02:00
Arne Morten Kvarving
d1d9e214ce
Merge pull request #427 from akva2/add_mpich
add mpich packages to redhat
2018-06-20 12:41:41 +02:00
Arne Morten Kvarving
d2d9128e6a add mpich packages to redhat 2018-06-20 12:30:45 +02:00
Joakim Hove
b22e00b92d Rename WellSegment::numberSegment() WellSegment::size() 2018-06-20 11:48:02 +02:00
Joakim Hove
6c7f6d7afb Rename SegmentSet -> WellSegments 2018-06-20 11:36:50 +02:00
Joakim Hove
dc318f731f Rename ConnectionSet > WellConnections 2018-06-20 11:35:11 +02:00
Joakim Hove
d4d2b813dd
Merge pull request #425 from joakim-hove/completion-refactor
Completion refactor
2018-06-20 11:00:42 +02:00
Joakim Hove
501b1dc760 Remove stale test 2018-06-20 09:27:02 +02:00
Joakim Hove
bfbcd3e470 Minor refactor JFunc + TableManager 2018-06-20 09:26:50 +02:00
Joakim Hove
2574dc7542
Merge pull request #424 from totto82/addCompletionsToTestState
Add posibility to store closed completions in wellTestState
2018-06-19 20:54:13 +02:00
Tor Harald Sandve
fb0272f343 Add posibility to store closed completions in wellTestState 2018-06-19 10:37:44 +02:00
Arne Morten Kvarving
3085243117
Merge pull request #302 from blattms/allow-dune-to-find-dune.module
Allow DUNE modules to locate the dune.module files during CMake run.
2018-06-18 13:46:10 +02:00
Markus Blatt
c6536c0b2f Allow DUNE modules to locate the dune.module files during CMake run.
For this we need to set <dune-module>_PREFIX either to where the module
is installed to or the source directory for a build with uninstalled
modules.
2018-06-18 12:47:53 +02:00
Arne Morten Kvarving
5dba20496a changed: use a two-tiered process for code gen
to avoid some unwanted rebuilds
2018-06-18 10:07:52 +02:00
Joakim Hove
97bb1c3413
Merge pull request #422 from alfbr/master
The MESSAGES keyword needs a thirteenth item
2018-06-18 08:55:34 +02:00
Alf B. Rustad
0d0e123735 Fixed Json syntax 2018-06-18 08:47:02 +02:00
Alf B. Rustad
768326527a The MESSAGES keyword needs a thirteenth item 2018-06-15 13:05:04 +02:00
Atgeirr Flø Rasmussen
df289d455b
Merge pull request #418 from joakim-hove/grdecl-double
Use double overload for eclGrid
2018-06-15 12:32:16 +02:00
Joakim Hove
6b9e0c5ef8
Merge pull request #419 from joakim-hove/rename-completion
Rename Completion -> Connection
2018-06-12 13:22:48 +02:00
Joakim Hove
3975db2ff3 Rename CompletionSet -> ConnectionSet 2018-06-11 14:03:32 +02:00
Joakim Hove
d39db2f0db Rename Completion -> Connection 2018-06-11 10:40:59 +02:00
Joakim Hove
b3eb6b58eb Use double overload for eclGrid 2018-06-08 14:04:59 +02:00
Joakim Hove
088ba8a19a
Merge pull request #413 from joakim-hove/restart-icon-skip-inactive
Restart icon skip inactive
2018-06-08 12:49:37 +02:00
Joakim Hove
d168e9ff67
Merge pull request #414 from joakim-hove/welltest-state
Add WellTestState object to keep track of automatically closed wells
2018-06-07 12:41:05 +02:00
Joakim Hove
46ab6dd8e1
Merge pull request #416 from OPM/revert-415-welltest
Revert "Add method for getting all the wells in the WellTestConfig"
2018-06-07 12:40:54 +02:00
Joakim Hove
66de108c68
Revert "Add method for getting all the wells in the WellTestConfig" 2018-06-07 07:48:44 +02:00
Joakim Hove
58e4e5263e Add WellTestState object to keep track of automatically closed wells 2018-06-07 07:42:03 +02:00
Joakim Hove
8fda1e036a
Merge pull request #415 from totto82/welltest
Add method for getting all the wells in the WellTestConfig
2018-06-06 15:45:06 +02:00
Tor Harald Sandve
3327d17c3f Add method for getting all the wells in the WellTestConfig 2018-06-06 15:22:14 +02:00
Joakim Hove
d299e003b7
Merge pull request #411 from GitPaean/adding_vfp_numbers
VFP related needs to be processed even without THP target/limit
2018-06-05 17:34:29 +02:00
Joakim Hove
37da204eb6
Merge pull request #412 from atgeirr/fix-forgotten-include
Fix forgotten <string> include.
2018-06-05 13:20:03 +02:00
Joakim Hove
ccb7e5df3e Use active completions when writng restart files. 2018-06-05 12:31:00 +02:00
Joakim Hove
1ee597206c Add CompletionsSet constructor including only active connections. 2018-06-05 12:25:20 +02:00
Joakim Hove
163c3d435a Remove unused test file 2018-06-05 12:25:17 +02:00
Atgeirr Flø Rasmussen
3ad0b1c5ca Fix forgotten <string> include. 2018-06-04 15:05:09 +02:00
Joakim Hove
476bfa1046
Merge pull request #410 from joakim-hove/restart-THPRES
Ignore THPRES input for restart runs
2018-06-01 11:46:39 +02:00
Joakim Hove
24f28e8a5d Ignore THPRES input for restart runs 2018-05-31 17:15:34 +02:00
Kai Bao
59bb98d312 adding tests related to VFP table number 2018-05-30 15:15:02 +02:00
Kai Bao
f945032405 VFP table number related to history macthing mode
tests are failed.
2018-05-30 13:26:51 +02:00
Kai Bao
62c7706f30 VFP number is always read for WCONINJE
and a zero-value THP limit for WCONPROD will not be treated as a THP
limit.
2018-05-30 11:58:04 +02:00
Joakim Hove
a7ec8b1d53
Merge pull request #407 from joakim-hove/GNETINJE
Add keyword GNETINJE
2018-05-29 14:33:52 +02:00
Joakim Hove
d39ba17190 Add keyword GNETINJE 2018-05-29 11:00:21 +02:00
Arne Morten Kvarving
e654cba898
Merge pull request #409 from akva2/revert_pr_401
Revert #401
2018-05-29 09:33:09 +02:00
Arne Morten Kvarving
47d06c526f Revert "changed: manually merge pr's to work around slow updating merge refs on github"
This reverts commit b338e56730.

Causes too much problems to be worth the gains
2018-05-29 09:23:11 +02:00
Arne Morten Kvarving
61b7977406
Merge pull request #406 from akva2/revert_set_e
revert 'set -e' addition in jenkins script
2018-05-25 15:39:03 +02:00
Joakim Hove
0b4f830d28
Merge pull request #377 from nairr/aquctconversions
Handle conversion of constants in parser
2018-05-24 16:34:02 +02:00
Arne Morten Kvarving
f6c795bed0 revert 'set -e' addition in jenkins script
had some more consequences than expected, not all of them desired
2018-05-24 10:36:38 +02:00
Joakim Hove
ab365481a7
Merge pull request #403 from joakim-hove/summary_state
Add SummaryState class to hold on to summary state.
2018-05-23 19:32:55 +02:00
Joakim Hove
6883c8ae21
Merge pull request #401 from akva2/slow_updates
changed: manually merge pr's to work around slow updating merge refs
2018-05-23 09:11:42 +02:00