OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into pre-proto

Browse Source
This commit is contained in:
Magne Sjaastad
2017-08-21 10:42:11 +02:00
parent 4eed4b4261 23ecdffe01
commit 51c30448e9
668 changed files with 11424 additions and 3918 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ApplicationCode/Application/RiaDefines.h
View File

@@ -28,6 +28,7 @@ namespace RiaDefines
{
DYNAMIC_NATIVE,
STATIC_NATIVE,
SOURSIMRL,
GENERATED,
INPUT_PROPERTY,
FORMATION_NAMES,
@@ -48,6 +49,10 @@ namespace RiaDefines
QString undefinedGridFaultName();
QString undefinedGridFaultWithInactiveName();
QString combinedTransmissibilityResultName();
QString combinedWaterFluxResultName();
QString combinedOilFluxResultName();
QString combinedGasFluxResultName();
QString ternarySaturationResultName();
QString combinedMultResultName();