Commit Graph

182 Commits

Author SHA1 Message Date
Magne Sjaastad
2d01824ab3 #2560 Unit conversion : Add conversion based on parsing unit text string 2018-03-02 17:03:01 +01:00
Magne Sjaastad
25a1823f35 Merge branch 'dev' into cmake-improvements 2018-02-28 08:47:01 +01:00
Magne Sjaastad
89c090ba24 #2536 Build System : Remove obsolete code for cmake older than "2.8.2" 2018-02-28 08:05:00 +01:00
Magne Sjaastad
f4bae6f796 #2529 Fracture : Remove RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES from CMake files 2018-02-26 21:11:14 +01:00
Magne Sjaastad
72b5f540e5 #2529 Fracture : Remove all #ifdef USE_PROTOTYPE_FEATURE_FRACTURES 2018-02-26 20:54:45 +01:00
Magne Sjaastad
1ae30ef11a (clang-tidy) : modernize-use-nullptr 2018-02-18 18:56:43 +01:00
Jacob Støren
e76f8cfbcc #2337 Add an improved tick mark generator 2018-02-09 14:08:55 +01:00
Jacob Støren
bb53b926bf #2345 Add + and * operators to the tensor class, to make averaging possible. 2018-02-07 13:10:36 +01:00
Bjørn Erik Jensen
0b0e60135c Merge branch '2018.01.01-patch' into dev. #2434 2018-02-05 14:15:50 +01:00
Magne Sjaastad
082b82214d #2444 Batch : Fix support for multiple replaceCase in command file 2018-02-05 11:22:31 +01:00
Magne Sjaastad
24cd47abfc Merge fix for failing test into dev 2018-02-05 08:45:20 +01:00
Magne Sjaastad
5a7133f6e2 Fix disabled test 2018-02-03 09:15:04 +01:00
Magne Sjaastad
c8e002d532 #2374 Fracture : Incomplete results when computing intersected StimPlan cells 2018-02-01 12:58:48 +01:00
Magne Sjaastad
20652a0597 #2423 Export Completions : Move folder one level up 2018-01-31 10:20:47 +01:00
Magne Sjaastad
e989b3afc9 #2423 Export Completions : Move Rig*-files to completion export folder 2018-01-31 10:20:47 +01:00
Rebecca Cox
56188c8f3f #2380 AppFwk: Move fieldsByType to RimProject 2018-01-19 12:52:50 +01:00
Rebecca Cox
ed930da11d #2380 AppFwk: Take vector<T*>* as argument, not vector<PdmField<T*>>* 2018-01-19 08:02:09 +01:00
Rebecca Cox
548c065290 Fix cotire build 2018-01-16 16:24:29 +01:00
Rebecca Cox
4adec8d2bf #2380 AppFwk: Make template function to find all PdmFields of a type 2018-01-16 16:01:42 +01:00
Magne Sjaastad
2457f968cf #2374 Fracture : Incomplete results when computing intersected StimPlan cells 2018-01-16 08:04:49 +01:00
Magne Sjaastad
b70d39cc6c System : Postfix with u to indicate unsigned value (avoid warning on linux) 2018-01-11 14:04:25 +01:00
Bjørn Erik Jensen
effe1f291a RifElementPropertyTableReader-Test. Fix names 2018-01-09 15:44:54 +01:00
Bjørn Erik Jensen
3e11f9fbd6 RifElementPropertyTableReader unit tests 2018-01-09 15:39:17 +01:00
Bjørn Erik Jensen
f632b36993 Implement support for reading test files from unit tests 2018-01-09 15:13:44 +01:00
Magne Sjaastad
96a900fe0f #2310 Add isProjectFileVersionEqualOrOlderThan to RimProject and use from summary plot 2018-01-04 13:12:07 +01:00
Magne Sjaastad
dbc1061a59 #2310 Version compare : Improve interface and add unit test 2018-01-04 12:38:12 +01:00
Magne Sjaastad
e7c8667b24 #2310 Add helper files and unit test for project file version queries 2018-01-03 13:17:29 +01:00
Magne Sjaastad
7992682fcb AppFwk : Add date and version info to field/object keyword extraction 2017-12-18 07:10:05 +01:00
Magne Sjaastad
d15808efe6 AppFwk : Add support for output of object and field keywords 2017-12-15 17:01:33 +01:00
Bjørn Erik Jensen
f11df61ff2 Fix Linux build error 2017-12-12 15:17:04 +01:00
Bjørn Erik Jensen
6d4820a691 CSV import. Replaced old ASCII parser by the new RifCsvUserDataParser 2017-11-28 11:02:46 +01:00
Bjørn Erik Jensen
1acd39898e UserDataParser. Fix unit test 2017-11-23 09:48:36 +01:00
Bjørn Erik Jensen
f87234ad39 Fix unit test compiler errors 2017-11-23 09:28:32 +01:00
Magne Sjaastad
a07205c047 #2165 Fault Import : Update unit tests 2017-11-22 07:33:58 +01:00
Magne Sjaastad
4d6d48dc18 #2153 Curve Creator : Clear results before trying to assign values from curve merging 2017-11-21 09:19:39 +01:00
Magne Sjaastad
686a47587b #2125 Curve Calculations : Add TimeHistoryCurveMerger 2017-11-21 08:10:28 +01:00
Magne Sjaastad
8ee0ddb317 #2125 Curve Calculations : Add tools used to interpolate two curves 2017-11-17 14:29:19 +01:00
Magne Sjaastad
5cbaf3c1eb #2125 Refactor : Return by value instead of incoming parameter 2017-11-17 13:50:25 +01:00
Magne Sjaastad
59c51d7e5e Remove test accessing local file path 2017-11-10 16:14:39 +01:00
Magne Sjaastad
5db08c7b76 #2097 Reservoir Phase Detection : Find available phases from result files 2017-11-10 09:43:51 +01:00
Magne Sjaastad
e9a938ce78 #2003 Observed Data : Compare first time step when merging 2017-11-07 12:33:22 +01:00
Magne Sjaastad
179c15ef5c #2003 Observed Data : Adjust minimum required headers based on presence of units and scaling 2017-11-07 11:16:33 +01:00
Magne Sjaastad
d45ca19af4 #2003 Observed Data : Use epoch as start date when no date is present 2017-11-07 11:16:33 +01:00
Magne Sjaastad
222bf38d58 #2066 Observed Data : Detect scaling 2017-11-07 11:16:33 +01:00
Magne Sjaastad
5ab56bb2fb #2066 Observed Data : Improve detection of required header lines 2017-11-07 11:16:33 +01:00
Magne Sjaastad
f53acbdce2 #2003 Observed Data : Handle STEPTYPE with potentially missing text for first row 2017-11-06 10:53:46 +01:00
Magne Sjaastad
296bacf7f6 #2003 Observed Data : Merge tables if DATE is present and size is equal 2017-11-03 17:44:48 +01:00
Magne Sjaastad
7d3a547ad6 #2003 Observed Data : If YEARX is present, use this as basis for the time step 2017-11-03 17:42:16 +01:00
Magne Sjaastad
f50760bb35 #2003 Observed Data : Add basic support for fixed width in parser 2017-11-03 17:42:16 +01:00
Magne Sjaastad
265c0ebb70 #2003 Observed Data : Add file parsing of fixed column width 2017-11-03 17:42:16 +01:00