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

Further build fixes related to RiaLogging

Browse Source
This commit is contained in:
Gaute Lindkvist 2019-05-24 08:58:04 +02:00
parent e8a54d8aa8
commit c2996bf638
4 changed files with 105 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationCode/CommandFileInterface/RicfExportSnapshots.h
View File

@ -33,6 +33,7 @@ class RicfExportSnapshots : public RicfCommandObject
CAF_PDM_HEADER_INIT;
public:
// Values are exposed in gRPC .proto. Do not change without also changing .proto
enum SnapshotsType
{
VIEWS,

1
ApplicationCode/CommandFileInterface/RicfSetStartDir.cpp
View File

@ -19,6 +19,7 @@
#include "RicfSetStartDir.h"
#include "RiaApplication.h"
#include "RiaLogging.h"
#include <QDir>

1
ApplicationCode/Commands/ExportCommands/RicSaveEclipseInputPropertyFeature.cpp
View File

@ -20,6 +20,7 @@
#include "RicSaveEclipseInputPropertyFeature.h"
#include "RiaApplication.h"
#include "RiaLogging.h"
#include "RicExportFeatureImpl.h"
#include "RicEclipseCellResultToFileImpl.h"

123
ApplicationCode/GrpcInterface/GrpcProtos/Commands.proto
View File

@ -10,18 +10,6 @@ service Commands
rpc Execute(CommandParams) returns(CommandReply) {}
}
message SetTimeStepParams
{
int32 caseId = 1;
int32 timeStep = 2;
}
message SetMainWindowSizeParams
{
int32 height = 1;
int32 width = 2;
}
message FilePathRequest
{
string path = 1;
@ -43,19 +31,112 @@ message ExportMultiCaseRequest
string gridListFile = 1;
}
enum SnapshotType
{
VIEWS = 0;
PLOTS = 1;
ALL = 2;
}
message ExportSnapshotsRequest
{
SnapshotType type = 1;
string prefix = 2;
}
message ExportPropertyRequest
{
int32 caseId = 1;
int32 timeStep = 2;
string property = 3;
string eclipseKeyword = 4;
double undefinedValue = 5;
string exportFile = 6;
}
message ExportPropertyInViewsRequest
{
int32 caseId = 1;
repeated string viewNames = 2;
double undefinedValue = 3;
}
enum CompdatExportSplit
{
UNIFIED_FILE = 0;
SPLIT_ON_WELL = 1;
SPLIT_ON_WELL_AND_COMPLETION_TYPE = 2;
}
enum CompdatExportType
{
TRANSMISSIBILITIES = 0;
WPIMULT_AND_DEFAULT_CONNECTION_FACTORS = 1;
NO_COMPLETIONS = 2;
}
enum CompdatCombinationMode
{
INDIVIDUALLY = 0;
COMBINED = 1;
}
message ExportWellPathCompRequest
{
int32 caseId = 1;
int32 timeStep = 2;
repeated string wellPathNames = 3;
CompdatExportSplit fileSplit = 4;
CompdatExportType compdatExport = 5;
bool includePerforations = 6;
bool includeFishbones = 7;
bool excludeMainBoreForFishbones = 8;
CompdatCombinationMode combinationMode = 9;
}
message SetTimeStepParams
{
int32 caseId = 1;
int32 timeStep = 2;
}
message SetMainWindowSizeParams
{
int32 height = 1;
int32 width = 2;
}
message CommandParams
{
oneof params
{
SetTimeStepParams setTimeStep = 1;
SetMainWindowSizeParams setMainWindowSize = 2;
FilePathRequest openProject = 3;
Empty closeProject = 4;
FilePathRequest setStartDir = 5;
FilePathRequest loadCase = 6;
ReplaceCaseRequest replaceCase = 7;
ReplaceSourceCasesRequest replaceSourceCases = 8;
ExportMultiCaseRequest exportMultiCaseSnapshots = 9;
FilePathRequest openProject = 1;
Empty closeProject = 2;
FilePathRequest setStartDir = 3;
FilePathRequest loadCase = 4;
ReplaceCaseRequest replaceCase = 5;
ReplaceSourceCasesRequest replaceSourceCases = 6;
ExportMultiCaseRequest exportMultiCaseSnapshots = 7;
ExportSnapshotsRequest exportSnapshots = 8;
ExportPropertyRequest exportProperty = 9;
ExportPropertyInViewsRequest exportPropertyInViews = 10;
ExportWellPathCompRequest exportWellPathCompletions = 11;
//ExportSimWellPathFracRequest exportSimWellFractureCompletions = 12;
//ExportMswRequest exportMsw = 13;
//ExportWellPathRequest exportWellPaths = 14;
//ExportVisibleCellsRequest exportVisibleCells = 15;
//SetExportFolderRequest setExportFolder = 16;
//RunOctaveScriptRequest runOctaveScript = 17;
SetMainWindowSizeParams setMainWindowSize = 18;
//ComputeCaseGroupStatRequest computeCaseGroupStatistics = 19;
SetTimeStepParams setTimeStep = 20;
//ScaleFractureTemplateRequest scaleFractureTemplate = 21;
//SetFracContainmentRequest setFractureContainment = 22;
//CreateMultipleFracRequest createMultipleFractures = 23;
//CreateLgrForCompRequest createLgrForCompletions = 24;
//CreateSatPressPlotRequest createSaturationPressurePlots = 25;
}
}