Commit Graph

5854 Commits

Author SHA1 Message Date
Arne Morten Kvarving
faff634bab use initializer list 2019-06-19 08:19:56 +02:00
Arne Morten Kvarving
b259c807fd remove unused variable 2019-06-19 08:19:56 +02:00
Joakim Hove
d2f692ebae Merge pull request #818 from joakim-hove/udq-eval-scalar-wells
UDQSet::eval - make sure to return well node
2019-06-17 18:56:35 +02:00
Joakim Hove
e6d299c726 Merge pull request #821 from akva2/janitoring
remove unused variables
2019-06-17 18:55:12 +02:00
Joakim Hove
a2817325fd Merge pull request #820 from joakim-hove/well2-injector-type
Add Well2::injectorType() accessor
2019-06-17 18:50:18 +02:00
Arne Morten Kvarving
2c82787ee9 remove unused variables
quell warnings
2019-06-17 09:08:47 +02:00
Joakim Hove
1bc47ca8a2 Add Well2 accesor functions which bypass SummaryState 2019-06-17 07:39:23 +02:00
Joakim Hove
c09bc36c03 UDQSet::eval - make sure to return well node 2019-06-16 08:42:54 +02:00
Joakim Hove
87d13c24f1 Merge pull request #817 from akva2/janitoring
Some janitoring
2019-06-15 07:49:39 +02:00
Joakim Hove
f01ed130af Merge pull request #813 from joakim-hove/udq-eval-set
Udq eval set
2019-06-14 16:55:51 +02:00
Arne Morten Kvarving
cc5b74fa94 fix parameter and member name being the same
this might have worked as-is, but it is very very confusing.
change parameter name to make code clearer.
2019-06-14 16:18:47 +02:00
Arne Morten Kvarving
53c1e07edf initialize variables
strictly speaking we throw whenever these are used uninitialized,
but the compiler does not realize -> initialize to quell warnings.
2019-06-14 16:17:41 +02:00
Arne Morten Kvarving
542353b118 remove unused lambda capture
consequently the variable is unused. remove it
2019-06-14 16:17:14 +02:00
Arne Morten Kvarving
2c5d0af37a remove unused lambda capture 2019-06-14 16:16:53 +02:00
Joakim Hove
51a779df67 Merge pull request #816 from joakim-hove/remove-summary-args
Remove unused arguments from EclipseIO::writeTimestep()
2019-06-14 16:05:50 +02:00
Arne Morten Kvarving
7a1ed147f4 fixed: forward struct as struct 2019-06-14 16:05:21 +02:00
Joakim Hove
5748d06914 Remove unused arguments from EclipseIO::writeTimestep() 2019-06-14 14:38:25 +02:00
Joakim Hove
772bd3cee5 UDQ: Ensure that scalar right hand side is accepted into sets 2019-06-14 11:54:12 +02:00
Joakim Hove
83cb209ad8 DeckItem: call set_dim for UDAValue objects 2019-06-14 11:47:59 +02:00
Joakim Hove
49ac8e85d6 DeckItem: improve error message for value type mismatch 2019-06-14 11:47:59 +02:00
Joakim Hove
a19d253aa7 UDQParser: verify the UDQVarType of the expression 2019-06-14 11:47:59 +02:00
Joakim Hove
eb05c5b6aa Add SummaryState argument to Summary fn_args context 2019-06-14 11:47:59 +02:00
Joakim Hove
9087323265 UDQ: add function for string name of UDQ variable types 2019-06-14 11:47:59 +02:00
Joakim Hove
fac74432d4 msim updates:
- add boolean flag report_only to simulation run.
 - add SummaryState argument to well rate callbacks
2019-06-14 11:47:59 +02:00
Joakim Hove
6376e4dcc6 Merge pull request #810 from bska/drop-libeclrestart
Drop "libeclrestart"
2019-06-14 11:17:26 +02:00
Bård Skaflestad
b630ecfb5b RestartIO: Drop LibECLRestart Component
It is no longer needed since both save() and load() now use ERst and
EclOutput.
2019-06-13 16:06:48 +02:00
Bård Skaflestad
8cdc72549d RestartIO: Prune Unused Headers in Public Interface 2019-06-13 16:06:48 +02:00
Bård Skaflestad
6aea354ff4 Merge pull request #811 from tskille/master
Use tolerances from command line for restart array SWEL
2019-06-13 15:32:09 +02:00
Torbjørn Skille
66e8068494 Use tolerances from command line for restart array SWEL 2019-06-12 19:06:52 +02:00
Joakim Hove
193eeca5ff Merge pull request #797 from bska/load-using-ERst
Reimplement RestartIO::load() in Terms of Class ERst
2019-06-12 13:50:22 +02:00
Bård Skaflestad
d1ec2e151c RestartIO::load: Prune 'sim_step' Where Possible 2019-06-12 12:03:55 +02:00
Bård Skaflestad
3d6ace0f97 RestartIO: Reimplement load() in Terms of ERst
This commit reimplements the private RestartFileView class in terms
of the ERst class.  The latter supports all operations we currently
need, although we can no longer use a 'const' object since loading
arrays mutates the ERst instance.

Most changes here are fairly mechanic and most of the new complexity
concerns how to identify a vector (keyword) of a particular element
type.  We make special concessions for INTEHEAD, since this vector
plays a central role in accessing the other data vectors.  The
mutability of RestartFileView is underscored by using shared_ptr<>
in the various helper facilities.
2019-06-12 12:03:55 +02:00
Bård Skaflestad
71c046bef4 Merge pull request #808 from joakim-hove/injection-unitsystem
Add UnitSystem member to Well2 class
2019-06-12 11:46:45 +02:00
Bård Skaflestad
0a3d26e9be Merge pull request #806 from joakim-hove/UDAValue-reset
Uda value reset
2019-06-12 11:02:48 +02:00
Joakim Hove
edbc9d2af7 UDAValue: add reset() methods 2019-06-12 10:13:01 +02:00
Joakim Hove
44e21101bc UDAValue: the get<double>() method will return SI values 2019-06-12 10:13:01 +02:00
Joakim Hove
f3abbf4981 UDAValue: add method assert_numeric() 2019-06-12 10:13:01 +02:00
Bård Skaflestad
ba2a12e876 Merge pull request #795 from joakim-hove/use-eval-timestep
Use eval timestep
2019-06-11 20:34:31 +02:00
Atgeirr Flø Rasmussen
1c14c0d921 Merge pull request #807 from GitPaean/tesing_master
some white space cleaning up
2019-06-11 15:50:28 +02:00
Joakim Hove
3961f724db Add UnitSsystem member to Well2 class 2019-06-08 12:39:22 +02:00
Kai Bao
0c43f49f13 some white space cleaning up 2019-06-07 14:57:54 +02:00
Joakim Hove
08305b6e30 Extract Summary::eval() out from Summary::add_timestep() 2019-06-07 14:45:18 +02:00
Joakim Hove
51bd7a197d Merge pull request #805 from OPM/joakim-hove-patch-1
Update url to equinor repo in submodule
2019-06-07 09:06:52 +02:00
Joakim Hove
498a1bb677 Update url to equinor repo in submodule 2019-06-07 08:43:28 +02:00
Joakim Hove
bab231287e Merge pull request #804 from markusdregi/submodule_fix
Move .gitmodules to root
2019-06-07 08:27:09 +02:00
Markus Fanebust Dregi
ebcac44715 Move .gitmodules to root 2019-06-07 08:26:15 +02:00
Joakim Hove
edfacf2af8 Merge pull request #801 from joakim-hove/uda-operator<<
Add operator<< support to UDAValue
2019-06-06 17:14:08 +02:00
Joakim Hove
40b556112f Add operator<< support to UDAValue 2019-06-06 15:58:36 +02:00
Bård Skaflestad
7413ce5a40 Merge pull request #800 from joakim-hove/add-report-step-accessor
Add public access to report_step in RestartView()
2019-06-06 13:35:13 +02:00
Joakim Hove
66fee23319 Add public access to report_step in RestartView() 2019-06-06 12:19:10 +02:00