OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-26 00:06:49 -06:00
Code Issues Packages Projects Releases Wiki Activity
1,998 Commits 31 Branches 61 Tags 287 MiB
5eb673410e
Commit Graph

1998 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jacob Støren
1522fe2514 Start on getting the Metadata into the GUI 2015-04-30 17:06:01 +02:00
Jacob Støren
4e9f91274c Fixing assert due to m_odb not set 
There still are troubles closing two instances accessing same file.
 2015-04-30 16:35:21 +02:00
Jacob Støren
791a25e6e9 Preparing for result visualization 
Calculated mapping vx to node nad elmnode reults
 2015-04-30 14:28:13 +02:00
Jacob Støren
1f51eb92b3 Add elmNodeResultIndex access 
Renamed somewhat to make things clearer in FemTypes/part
 2015-04-30 14:28:05 +02:00
Jacob Støren
f13f05709f Update legend and 3D info on display model gen 2015-04-30 14:27:57 +02:00
Stein Dale
be2f261f9d Made some functions private. 
Made static member functions initializeOdbAPI() and finalizeOdbAPI()
private. Consider removing finalizeOdbAPI() since we don't use it.
 2015-04-30 14:22:20 +02:00
Stein Dale
5a9f22bfd2 Renaming of geo mech interface, separated results reporting for different result positions 
Reporting nodal, element nodal, and integration point result names
separately. Some functions in the geo mech interface were renamed.
Renamed "result" to "field" in function and parameter names in the
interface. TODO: Consider if we should report integration point results
as element node results too, and extrapolate when requested, if needed.
Fixed map handling in RifOdbReader::componentIndex().
 2015-04-30 14:22:18 +02:00
Stein Dale
ebfad85b5b Basic ODB reading, including results 
Now reading nodal results and displacements. Reporting results meta data
(names with components).
 2015-04-30 10:36:17 +02:00
Jacob Støren
3dac8807c7 Refactoring more general stuff into RimView 
updateViewerWidget
scheduleUpdateDisplayModelAndRedraw
 2015-04-30 10:34:15 +02:00
Jacob Støren
4b7d593b3c Refactored general view stuff into RimView 
Removing it from RimReservoirView and RimGeoMechView
 2015-04-29 22:19:49 +02:00
Jacob Støren
4a21bb4a30 Added RimView, and sorted the libs in folders 2015-04-29 10:50:25 +02:00
Jacob Støren
a7e38bcda1 Now handling compilation both with and without ODB api 2015-04-29 09:26:29 +02:00
Jacob Støren
936d6553cf Improved CMakeSetup for OdbTest app 
Cleaned away the hardcoded paths. Made options instead.
 2015-04-28 10:45:00 +02:00
Jacob Støren
1e88b38e69 Moved the testfile path to the CMake setup 
Edit from the Cmake GUI
 2015-04-28 09:22:31 +02:00
Jacob Støren
0560457cd2 Added C3D8 elements. Removed unused close() 
Close (or something similar) will be added when needed.
 2015-04-28 09:21:27 +02:00
Jacob Støren
8be93ae448 Moved the element type functions into a static class 2015-04-27 15:04:05 +02:00
Jacob Støren
c0217a68a4 First odb file read and displayed 2015-04-27 14:06:42 +02:00
Jacob Støren
0f3d9ffa60 Now reading Odb-file and creating display model 
Nothing shows up yet, but we're getting there
 2015-04-27 13:51:22 +02:00
Jacob Støren
ea3d2dc40d Fixed missing conversion to node indices from node ids 2015-04-27 13:47:41 +02:00
Jacob Støren
f9ca3d5e54 Renamed to RivFemPartPartMgr 2015-04-27 10:52:48 +02:00
Jacob Støren
2b967d9ca1 Created FemPartCollection 
Used that instead against reader to make a "results free" interface
regarding reading the element models.
 2015-04-27 10:25:04 +02:00
Jacob Støren
b94ba6ca0b Added nodal results reading to Femreader interface 
Adjusted interface
Started to add control code to fire reader and visualization generation
 2015-04-25 08:57:34 +02:00
Jacob Støren
c3ec79d6e1 Working ResInsight with Odb linked, hacklish 2015-04-25 08:54:08 +02:00
Jacob Støren
a538be1775 GeoMech with OdbReader Included in ResInsight Build 
Preliminary, first shot.
Added first iteration on basic visualization code.
 2015-04-24 16:04:12 +02:00
Jacob Støren
6dad519f30 Got elements and nodes from odb in the unit test 2015-04-23 15:43:11 +02:00
Jacob Støren
4737807b7b GeoMech data model and reader unit test framework. 2015-04-23 13:24:15 +02:00
Jacob Støren
1f2bea106f Small guard RiuViewer 2015-04-21 08:37:32 +02:00
Jacob Støren
27c2c040fe Added the 3D view to the geomech stuff 2015-04-20 16:56:26 +02:00
Jacob Støren
27f6bd9eb5 Start of geomech support 
Possible GUI-tree layout
 2015-04-20 09:02:33 +02:00
Jacob Støren
a5fba8f3f4 Fixes to match new Ert 2015-04-14 15:47:51 +02:00
Jacob Støren
09744af4b8 Upgraded ERT from github master commit d9955e849 
Startup on new project
 2015-04-14 15:47:22 +02:00
Jacob Støren
02e47c6679 Guard against reading nnc data if none are available 
See Issue #278. (Not fixing the issue, just improving code)
 2015-02-24 14:57:23 +01:00
Jacob Støren
27ce1852ca Fix of #281: Crash while importing - cvfPlane.cpp Aborted 2015-02-24 13:34:03 +01:00
Magne Sjaastad
3b914c7ac0 Fixed missing dash in Linux startup script 
https://github.com/OPM/ResInsight/issues/271
 2015-01-25 22:14:20 +01:00
Fredrik Gundersen
eea5ac6d1d Enable usage of external ERT source 
This change in cmakelist enables the usage of an external ERT source. You can now point to a later version of ERT and use this in sted of the one bundled in the ResInsight source.
 2015-01-09 08:52:42 +01:00
Magne Sjaastad
8de0f468ac Fixed invalid foreach syntax 2015-01-09 08:37:22 +01:00
Magne Sjaastad
9ded05212f Merge branch 'pr/268' into dev 2015-01-09 08:05:23 +01:00
Magne Sjaastad
053a9c4d78 Improved parsing of fault face text strings 
See https://github.com/OPM/ResInsight/issues/263
 2015-01-09 07:42:49 +01:00
Roland Kaufmann
6d38344261 Don't validate shader programs on MacOS X 
If the paint event is called before the view is visible, validation
of the shader program will cause an error on MacOS X 10.8 and forward,
stating that the operation was ignored.
 2015-01-01 19:46:25 +01:00
Roland Kaufmann
4378f4886a Add application icon into the executable bundle 2015-01-01 19:46:25 +01:00
Roland Kaufmann
9fb9f84a7a Build resulting executable as a bundle on MacOS X 
This will allow us to launch it from the Finder and add it to the dock
 2015-01-01 19:46:25 +01:00
Roland Kaufmann
eac27f149a Enable in-package substitute of tr1/tuple 
In clang 6.0 the tr1/tuple header is not present, and this cause a
compilation error inside of the gtest framework. However, if we set a
define, it will use its own substitute of tr1/tuple, which is sufficient
for the unit tests.
 2015-01-01 19:46:25 +01:00
Roland Kaufmann
b019ad260d Duplicate MacOS X framework voodoo for mkoctfile 
When CMake encounter a framework in the list passed to
include_directories, it will change this into an -F option. We have to
do the same when we want to pass this list to the mkoctfile custom
command.
 2015-01-01 19:46:25 +01:00
Roland Kaufmann
e0da9a611f Remove copy ctor of atomic counter on OS X 
This is not present on any of the other platforms so it is not needed,
but it uses a removed method (to receive the value) so it won't compile.
 2015-01-01 19:46:24 +01:00
Roland Kaufmann
b25290bebd Complete instantiated types 
RivReservoirPartMgr uses a Collection of RivGridPartMgr. The Collection
indirectly causes the release() method of the Object base class of
RivGridPartMgr to be called as part of its destructor, but this is not
allowed for incomplete types and RivGridPartMgr is only forward-declared
at the time of the instantiation (in RivReservoirPartMgr).

A similar problem occurs in the use of RigStatisticsDataCache in the
type RigCaseCellResultsData.
 2015-01-01 19:46:24 +01:00
Roland Kaufmann
90249e1158 Use pthreads on MacOS X too 
MacOS X is POSIXy enough for this to be a suitable choice
 2015-01-01 19:46:24 +01:00
Magne Sjaastad
fe84daefc5 Updated to 1.3.2-dev after release of 1.3.1 2014-11-07 18:34:12 +01:00
Magne Sjaastad
0f88443f2f Updated to 1.3.1 2014-11-07 17:55:13 +01:00
Magne Sjaastad
0dcba178fd Do not show NNC text at all in progress bar when NNC import is disabled 2014-11-06 09:35:39 +01:00
Magne Sjaastad
f2c75c7f59 Updated ERT to bbab02e02630924471760a7e9357825ad414e2e9 
Integrated fix for MSW reading of large wells
 2014-11-05 17:23:07 +01:00