Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backend support for delta surfaces #760

Draft
wants to merge 12 commits into
base: main
Choose a base branch
from
Draft

Backend support for delta surfaces #760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3ec78d3
Try and use latest and greatest sumo-wrapper-python (from github) + m…
sigurdp Aug 30, 2024
cd664ea
Install git in docker image so that we can fetch dependencies from Gi…
sigurdp Aug 30, 2024
554bee0
Brute force experiment with delta, also sharing SumoClient
sigurdp Aug 30, 2024
9a017b0
Added guarding against null address
sigurdp Sep 2, 2024
425b1d7
Added a few more timings
sigurdp Sep 2, 2024
870c002
Merge branch 'main' into delta-surfaces
sigurdp Oct 16, 2024
5d64dbd
Comment
sigurdp Oct 16, 2024
a2508df
Pin new versions of fmu-sumo and sumo-wrapper-python
sigurdp Oct 16, 2024
e72dbfb
Workaround for viewing surfaces with min==max value
sigurdp Oct 16, 2024
46ddc50
Working on delta surfs
sigurdp Oct 16, 2024
ef3983f
Removed installation of git in docker image
sigurdp Oct 16, 2024
27eb0fd
Linting and formatting
sigurdp Oct 16, 2024
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
44 changes: 23 additions & 21 deletions backend_py/primary/poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions backend_py/primary/primary/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
logging.getLogger("primary.services.sumo_access").setLevel(logging.DEBUG)
logging.getLogger("primary.services.user_session_manager").setLevel(logging.DEBUG)
logging.getLogger("primary.services.user_grid3d_service").setLevel(logging.DEBUG)
logging.getLogger("primary.routers.surface").setLevel(logging.DEBUG)
logging.getLogger("primary.routers.grid3d").setLevel(logging.DEBUG)
logging.getLogger("primary.routers.dev").setLevel(logging.DEBUG)

Expand Down
43 changes: 23 additions & 20 deletions backend_py/primary/primary/routers/surface/converters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,24 @@
from . import schemas


def resample_to_surface_def(
def extract_surface_def_from_surface(xtgeo_surf: xtgeo.RegularSurface) -> schemas.SurfaceDef:
"""
Extract properties from xtgeo regular surface and populate new surface definition
"""
surface_def = schemas.SurfaceDef(
npoints_x=xtgeo_surf.ncol,
npoints_y=xtgeo_surf.nrow,
inc_x=xtgeo_surf.xinc,
inc_y=xtgeo_surf.yinc,
origin_utm_x=xtgeo_surf.xori,
origin_utm_y=xtgeo_surf.yori,
rot_deg=xtgeo_surf.rotation,
)

return surface_def


def resampled_to_surface_def_if_needed(
source_surface: xtgeo.RegularSurface, target_surface_def: schemas.SurfaceDef
) -> xtgeo.RegularSurface:
"""
Expand All @@ -32,7 +49,9 @@ def resample_to_surface_def(
rotation=target_surface_def.rot_deg,
)

if target_surface.compare_topology(source_surface):
# Ignore mask and compare only the grid definitions since target_surface will never have a mask set
if target_surface.compare_topology(source_surface, strict=False):
# Grid definitions are equal so no need to resample
return source_surface

target_surface.resample(source_surface)
Expand All @@ -47,15 +66,7 @@ def to_api_surface_data_float(xtgeo_surf: xtgeo.RegularSurface) -> schemas.Surfa
float32_np_arr: NDArray[np.float32] = surface_to_float32_numpy_array(xtgeo_surf)
values_b64arr = b64_encode_float_array_as_float32(float32_np_arr)

surface_def = schemas.SurfaceDef(
npoints_x=xtgeo_surf.ncol,
npoints_y=xtgeo_surf.nrow,
inc_x=xtgeo_surf.xinc,
inc_y=xtgeo_surf.yinc,
origin_utm_x=xtgeo_surf.xori,
origin_utm_y=xtgeo_surf.yori,
rot_deg=xtgeo_surf.rotation,
)
surface_def = extract_surface_def_from_surface(xtgeo_surf)

trans_bb_utm = schemas.BoundingBox2d(
min_x=xtgeo_surf.xmin, min_y=xtgeo_surf.ymin, max_x=xtgeo_surf.xmax, max_y=xtgeo_surf.ymax
Expand All @@ -79,15 +90,7 @@ def to_api_surface_data_png(xtgeo_surf: xtgeo.RegularSurface) -> schemas.Surface
png_bytes: bytes = surface_to_png_bytes_optimized(xtgeo_surf)
png_bytes_base64 = base64.b64encode(png_bytes).decode("ascii")

surface_def = schemas.SurfaceDef(
npoints_x=xtgeo_surf.ncol,
npoints_y=xtgeo_surf.nrow,
inc_x=xtgeo_surf.xinc,
inc_y=xtgeo_surf.yinc,
origin_utm_x=xtgeo_surf.xori,
origin_utm_y=xtgeo_surf.yori,
rot_deg=xtgeo_surf.rotation,
)
surface_def = extract_surface_def_from_surface(xtgeo_surf)

trans_bb_utm = schemas.BoundingBox2d(
min_x=xtgeo_surf.xmin, min_y=xtgeo_surf.ymin, max_x=xtgeo_surf.xmax, max_y=xtgeo_surf.ymax
Expand Down
Loading
Loading