OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,095 Commits 18 Branches 75 Tags
20e253a27a88a78a86aa440198bd675e54e3e744
Commit Graph

5187 Commits

Author SHA1 Message Date
Joakim Hove
20e253a27a Merge pull request #1997 from joakim-hove/group-constructor 
Add Group constructor based on RstGroup
 2020-10-06 14:52:31 +02:00
Joakim Hove
1ec834dd71 Add Group constructor based on RstGroup 2020-10-06 13:16:33 +02:00
Bård Skaflestad
4956e880a4 Summary/Restart: Get CTF From Simulator 
This commit switches to getting the output files' connection
transmissibility factor from Opm::data::Connection instead of
Opm::Connection.  This is in preparation for implementing the WELPI
feature, in which the CTFs are occasionally adjusted based on the
dynamic simulation state.
 2020-10-05 23:34:01 +02:00
Bård Skaflestad
33d09936c3 Merge pull request #1719 from GitPaean/aquifer_keywords 
adding aquifer summary keywords
 2020-10-05 22:49:32 +02:00
Joakim Hove
be898b5534 Merge pull request #1989 from wito/tablemanager-exceptions 
Implements OpmInputError in TableManager
 2020-10-05 17:02:42 +02:00
Bård Skaflestad
fcdc57d92b Merge pull request #1994 from joakim-hove/rst-alq 
Small Changes in restart <-> Schedule interaction
 2020-10-05 13:07:15 +02:00
Williham Williham Totland
d0c5fa042c Adjusts the defaultMessage format string. 2020-10-05 09:26:25 +02:00
Williham Williham Totland
7a8347f1ab Unifies interface of OpmInputError::OpmInputError() 2020-10-05 08:26:51 +02:00
Williham Williham Totland
3af6fac35d Adds a standard-format exception message to OpmInputError. 2020-10-05 07:28:07 +02:00
Williham Williham Totland
65f45b60a8 Extends OpmInputError to support multiple KeywordLocations. 2020-10-05 07:28:07 +02:00
Kai Bao
995316e97c handling unknown aquifer in SUMMARY section 2020-10-05 00:27:28 +02:00
Joakim Hove
aa54bc67de Load group->parent_group when loading from restart file 2020-10-04 16:00:50 +02:00
Joakim Hove
5b3a76172b Store parent_group index when loading restart group 2020-10-04 16:00:15 +02:00
Joakim Hove
c2522fd5ce Create symbol for IGRP parent group index 2020-10-04 15:59:53 +02:00
Joakim Hove
007ef0e94f Load well alq value when loading from restart file 2020-10-04 15:33:20 +02:00
Kai Bao
e86e8796ec adding a small test for aquifer keywords 2020-10-02 22:32:23 +02:00
Joakim Hove
26bc6cb2ea Merge pull request #1980 from joakim-hove/time-keyword-info-logging 
Time keyword info logging
 2020-10-02 18:20:12 +02:00
Tor Harald Sandve
8210bcde34 Merge pull request #1968 from hakonhagland/wglir 
Add support for WGLIR.
 2020-10-02 14:48:18 +02:00
Kai Bao
fd773423b0 adding the following aquifer summary keywords 
AAQR, AAQT, AAQP
 2020-10-02 13:18:51 +02:00
Joakim Hove
1206570da5 Edit msg 2020-10-02 10:30:37 +02:00
Williham Williham Totland
4c016660d8 Logs simulation time advance information (level: info). 2020-10-02 10:30:37 +02:00
Joakim Hove
c0336d5eb7 Remove leftover template<...> 2020-10-01 16:59:50 +02:00
Joakim Hove
96ce078dfd Merge pull request #1983 from joakim-hove/private-fmt 
Mkae sure fmtlib is not a dependency in the public api
 2020-10-01 15:24:15 +02:00
Joakim Hove
fbf88e8ce1 Merge pull request #1984 from joakim-hove/remove-value 
Remove homemade optional - use std::optional
 2020-10-01 15:23:55 +02:00
Joakim Hove
6dc84b67df Remove homemade optional - use std::optional 2020-10-01 13:53:58 +02:00
Joakim Hove
0475ccdb77 Merge pull request #1978 from joakim-hove/schedule-skriprest-refactor 
Changes in schedule iterate section for restarts
 2020-10-01 07:47:50 +02:00
Joakim Hove
5f45f20be6 Merge pull request #1982 from blattms/fix-some-valgrind-warnings 
Fix some warnings when running with valgrinds MPI wrapper.
 2020-09-30 19:43:30 +02:00
Markus Blatt
d99aa0d497 Fix some warnings when running with valgrinds MPI wrapper. 
It warns whenever uninitialized data is sent.
 2020-09-30 18:26:48 +02:00
Joakim Hove
8c351440e8 Mkae sure fmtlib is not a dependency in the public api 2020-09-30 18:17:57 +02:00
Joakim Hove
42f1278db3 Changes in restart TimeMap and Schedule::iterateSection 
This commit changes two aspects of restarts where well and group information is
assembled from the restart file:

 o We require the restart date to be present in the Schedule file as a DATES
   keyword.

 o SKIPREST behavior is implemented unconditionally for restarts with restart
   files, even if the SKIPREST keyword is not present.
 2020-09-29 23:00:16 +02:00
Joakim Hove
0512ab88b4 ParseContext will throw OpmInputError 2020-09-29 15:37:14 +02:00
Håkon Hægland
ce4f2a157b Fixed typo in operator==() 2020-09-29 15:33:59 +02:00
Håkon Hægland
56ab32035a Added support for ALQ in the serialization. 
Added support for ALQ in operator==() and Rates::read().
 2020-09-29 15:33:59 +02:00
Håkon Hægland
10a9a5707c Add support for WGLIR. 
Add support for summary output of WGLIR (lift gas injection rate).
 2020-09-29 15:33:59 +02:00
Joakim Hove
e01400fa18 Add KeywordLocation argument to ParseContext::handleError() 2020-09-29 09:56:07 +02:00
Joakim Hove
94b4c509b1 Add KeywordLocation argument to UDQ parser 2020-09-29 09:56:07 +02:00
Joakim Hove
e8423d3b25 Merge pull request #1969 from wito/keyword-handler-try-catch 
Exception Catch and Release
 2020-09-29 09:54:41 +02:00
Joakim Hove
751e25ff97 Merge pull request #1963 from joakim-hove/tran-calc-condense 
Tran calc condense
 2020-09-29 09:34:28 +02:00
Bård Skaflestad
d55d05e552 Merge pull request #1884 from goncalvesmachadoc/outputProdEnergy 
Add WEPT and WEPR to Summary
 2020-09-28 21:52:53 +02:00
Joakim Hove
8848fde48e Collapse multi record operations on TRAN in one operation 
The main content of this commit is that for keywords with multiple TRAN
modifications like

  MULTIPLY
     TRANX 1.50 1 10 1 10 1 1 /
     TRANX 2.50 1 10 1 10 2 2 /
  /

The different operations are collapes to one entry in tran calculator.

This commit also explicitly throws a std::logic_error() exception if TRAN
manipulations are attempted with the OPERATE keyword or one of the region
keywords ADDREG, MULTIREG, EQUALREG or OPERATER.
 2020-09-28 21:44:21 +02:00
Joakim Hove
f331add35b Merge pull request #1966 from joakim-hove/tran-calc-init 
Tran calc init
 2020-09-28 16:55:07 +02:00
Williham Williham Totland
f5a3ab2cee Removes (stated) support for named arguments in OpmInputError::format due to UTR test failure. 2020-09-28 16:04:35 +02:00
Cintia Goncalves Machado
dd4de4130a addEnergyRatetoUnitSystem 2020-09-28 13:21:19 +02:00
Williham Williham Totland
805300dd49 Adds some documentation to OpmInputError.hpp. 2020-09-28 13:16:45 +02:00
Williham Williham Totland
9a66acbb5d Extends OpmInputError to be initialisable from an existing exception. 2020-09-28 13:16:45 +02:00
Williham Williham Totland
742c90cabc Extends Opm::OpmInputError::OpmInputError() to accept additional format arguments. 2020-09-28 13:16:45 +02:00
Williham Williham Totland
7cb15bd64d Adds missing test_OpmInputError_format.cpp 2020-09-28 13:16:44 +02:00
Williham Williham Totland
2900da4489 Allow Opm::OpmInputError::format() to accept additional arguments. 
This removes the need to call `fmt::format()` multiple times on a string, thus eliminating error-prone multi-level escapes when formatting strings.
 2020-09-28 13:16:44 +02:00
Williham Williham Totland
05c3d997ac Catches and logs exceptions in Opm::Schedule::handleNormalKeyword() 2020-09-28 13:16:44 +02:00
Joakim Hove
c1ea966548 Add static function OpmInputError::format() 2020-09-27 22:14:53 +02:00