OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2024-12-29 10:21:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into dev

Browse Source
This commit is contained in:
Magne Sjaastad 2024-06-05 14:44:35 +02:00
commit 51ff9579aa
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
GrpcInterface/Python/rips/instance.py
View File

@ -12,6 +12,8 @@ import logging
import time import time
import tempfile import tempfile
import signal import signal
import sys
import json
import grpc import grpc
@ -30,6 +32,7 @@ from .generated.generated_classes import CommandRouter
from typing import List, Optional, Tuple from typing import List, Optional, Tuple
from typing_extensions import Self from typing_extensions import Self
from pathlib import Path
class Instance: class Instance:
@ -121,6 +124,18 @@ class Instance:
if launch_port != -1: if launch_port != -1:
requested_port = launch_port requested_port = launch_port
if not resinsight_executable:
filename = Path(sys.prefix) / "share" / "rips" / "rips_config.json"
if filename.is_file():
f = open(filename)
data = json.load(f)
resinsight_executable = data["resinsight_executable"]
if resinsight_executable:
print(
"In './share/rips/rips_config.json', found resinsight_executable:",
resinsight_executable,
)
if not resinsight_executable: if not resinsight_executable:
resinsight_executable_from_env = os.environ.get("RESINSIGHT_EXECUTABLE") resinsight_executable_from_env = os.environ.get("RESINSIGHT_EXECUTABLE")
if not resinsight_executable_from_env: if not resinsight_executable_from_env: