Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
3c26199
starting import launcher handling
jafranc Oct 30, 2025
abfd58f
starting import launcher handling
jafranc Oct 30, 2025
99a2176
Merge remote-tracking branch 'origin/main' into jafranc/feat/trame-HP…
jafranc Nov 14, 2025
2d1c395
some more imports
jafranc Nov 17, 2025
46899b4
wip
jafranc Nov 18, 2025
e9dd40d
wip
jafranc Nov 19, 2025
218c735
wip
jafranc Nov 19, 2025
8a361d2
wip
jafranc Nov 19, 2025
cad9c39
wip
jafranc Nov 20, 2025
84f4452
start login backend
jafranc Nov 20, 2025
ce820e7
ssh login
jafranc Nov 21, 2025
727c927
Unlock runner
jafranc Nov 21, 2025
3dc8a83
wip
jafranc Nov 21, 2025
077e6fa
full PoC
jafranc Nov 21, 2025
19c04e3
wip
jafranc Nov 22, 2025
3eaabe9
authorship
jafranc Nov 25, 2025
d54f8b3
change host
jafranc Nov 27, 2025
c1a8395
wip
jafranc Nov 28, 2025
8596472
update versions f/ VFileUpload
jafranc Nov 28, 2025
db83e7a
another view
jafranc Dec 1, 2025
21b4492
new list update
jafranc Dec 1, 2025
6c50a55
loading files complete
jafranc Dec 2, 2025
4535890
first working v
jafranc Dec 2, 2025
46a328d
Merge branch 'jafranc/feat/trame-HPC-launcher' of https://github.com/…
jafranc Dec 2, 2025
0c437b0
start status
jafranc Dec 2, 2025
81c1fc5
nicer
jafranc Dec 2, 2025
6405533
job status track
jafranc Dec 2, 2025
c0a5364
kill jobs enable
jafranc Dec 3, 2025
4195ef8
working w/o copyback
jafranc Dec 3, 2025
8c04e46
regexp working
jafranc Dec 3, 2025
485446c
less cumbersome
jafranc Dec 3, 2025
51f112f
first attempt at copy back
jafranc Dec 3, 2025
7c43b0e
last details
jafranc Dec 3, 2025
1b01967
update regex
jafranc Dec 4, 2025
e2dca24
fixed comment section
jafranc Dec 4, 2025
6e3dfc4
start simulation progress
jafranc Dec 4, 2025
f3acd23
notes and cleanup
jafranc Dec 8, 2025
6510a41
alternate strat copy back
jafranc Dec 8, 2025
06c5fe9
yapf
jafranc Dec 10, 2025
66368fc
discard sim_status_view
jafranc Dec 10, 2025
30f67fb
import error
jafranc Dec 11, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions geos-trame/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ version = "1.0.0"
description = "Geos Simulation Modeler"
authors = [{name = "GEOS Contributors" }]
maintainers = [{name = "Alexandre Benedicto", email = "[email protected]" },
{name = "Paloma Martinez", email = "[email protected]" }]
{name = "Paloma Martinez", email = "[email protected]" },
{name = "Jacques Franc", email = "[email protected]" },]
license = {text = "Apache-2.0"}
classifiers = [
"Development Status :: 4 - Beta",
Expand All @@ -31,12 +32,12 @@ keywords = [
dependencies = [
"typing-extensions==4.12.2",
"trame==3.6.5",
"trame-vuetify==2.7.1",
"trame-vuetify==3.1.0",
"trame-code==1.0.1",
"trame-server==3.2.3",
"trame-client==3.5.0",
"trame-client==3.11.2",
"trame-simput==2.4.3",
"trame-vtk>=2.8.14",
"trame-vtk==2.10.0",
"matplotlib==3.9.4",
"trame-matplotlib==2.0.3",
"trame-components==2.4.2",
Expand Down
40 changes: 22 additions & 18 deletions geos-trame/src/geos/trame/app/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
from geos.trame.app.ui.viewer.viewer import DeckViewer
from geos.trame.app.components.alertHandler import AlertHandler

from geos.trame.app.io.simulation import Simulation, SimRunner
from geos.trame.app.ui.simulation_view import define_simulation_view

import sys


Expand All @@ -38,10 +41,12 @@ def __init__( self, server: Server, file_name: str ) -> None:
self.deckEditor: DeckEditor | None = None
self.timelineEditor: TimelineEditor | None = None
self.deckInspector: DeckInspector | None = None
self.simulationLauncher: Simulation | None = None
self.server = server
server.enable_module( module )

self.state.input_file = file_name
self.state.user_id = None

# TODO handle hot_reload

Expand All @@ -67,6 +72,10 @@ def __init__( self, server: Server, file_name: str ) -> None:
self.region_viewer = RegionViewer()
self.well_viewer = WellViewer( 5, 5 )

######## Simulation runner
self.sim_runner: SimRunner = SimRunner( self.state.user_id )
self.simulation = Simulation( self.sim_runner, server=server )

# Data loader
self.data_loader = DataLoader( self.tree, self.region_viewer, self.well_viewer, trame_server=server )

Expand Down Expand Up @@ -177,24 +186,6 @@ def build_ui( self ) -> None:
):
vuetify.VIcon( "mdi-content-save-outline" )

with html.Div(
style=
"height: 100%; width: 300px; display: flex; align-items: center; justify-content: space-between;",
v_if=( "tab_idx == 1", ),
):
vuetify.VBtn(
"Run",
style="z-index: 1;",
)
vuetify.VBtn(
"Kill",
style="z-index: 1;",
)
vuetify.VBtn(
"Clear",
style="z-index: 1;",
)

# input file editor
with vuetify.VCol( v_show=( "tab_idx == 0", ), classes="flex-grow-1 pa-0 ma-0" ):
if self.tree.input_file is not None:
Expand All @@ -208,3 +199,16 @@ def build_ui( self ) -> None:
"The file " + self.state.input_file + " cannot be parsed.",
file=sys.stderr,
)

with vuetify.VCol( v_show=( "tab_idx == 1" ), classes="flex-grow-1 pa-0 ma-0" ):
if self.simulation is not None:
define_simulation_view( self.server )
else:
self.ctrl.on_add_error(
"Error",
"The execution context " + self.state.exec_context + " is not consistent.",
)
print(
"The execution context " + self.state.exec_context + " is not consistent.",
file=sys.stderr,
)
Loading
Loading