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

Add seismic intersection module - seismic fence #449

Merged
merged 43 commits into from
Dec 1, 2023
Merged

Add seismic intersection module - seismic fence #449

merged 43 commits into from
Dec 1, 2023

Conversation

jorgenherje
Copy link
Collaborator

@jorgenherje jorgenherje commented Oct 27, 2023 •
edited
Loading

Add first version of intersection module with seismic fence and wellbore path

Based on: Work by @HansKallekleiv in:

TODO:

  • Remove backend/seismic_vds_slice.ipynb
  • Remove unused new code in backend/src/services/sumo_access/_helpers.py and backend/src/services/sumo_access/queries/case.py
  • Cleanup code in frontend/src/modules/Intersection/utils/esvIntersectionControllerUtils.ts
  • Cleanup code in frontend/src/modules/Intersection/utils/esvIntersectionDataConversion.ts

Created new issues:

HansKallekleiv and others added 23 commits October 2, 2023 20:32
@HansKallekleiv
Vds Access
a61dd52
@HansKallekleiv
Add env variable for vds service
8ba2d27
@HansKallekleiv
Doc. split bytes=>numpy into separate function
0ac4585
@HansKallekleiv
Comment on fill value
ae8421f
@HansKallekleiv
use add endpoints. use async
4c28062
@HansKallekleiv
docs
8a2df18
@HansKallekleiv
lint
d15fa83
@HansKallekleiv
lint
b02bdf1
@HansKallekleiv
Add requests-toolbelt
db9b4e8
@HansKallekleiv
Update api
9b5ae81
@HansKallekleiv
use base64
be86a69
@HansKallekleiv
update api. lint
ec48760
@jorgenherje
Merge remote-tracking branch 'HansKallekleiv/vdsaccess' into seismic-…
650751c 
…intersection
@jorgenherje
Adjust poetry.lock file
a4a98e0
@jorgenherje
Backup
ecf2f5a
@jorgenherje
Backup and with jupyter notebook testing of API
5de3a32
@jorgenherje
Merge branch 'main' into seismic-intersection
e284cba
@jorgenherje
Adjustments after merge
814205a
@jorgenherje
Backup
99f7ec0
@jorgenherje
Next iteration of front-end code
353cfd0
@jorgenherje
Next iteration/adjustments
0d15df6 
- Improve code in view
- Rename module
- Create vds host address in env
- Fix naming back-end
@jorgenherje
Merge remote-tracking branch 'equinor/main' into seismic-intersection
0ec7f7b
@jorgenherje
Adjust poetry after merge
2946b3c
@jorgenherje jorgenherje self-assigned this Oct 27, 2023
@jorgenherje jorgenherje added the enhancement New feature or request label Oct 27, 2023
@jorgenherje jorgenherje changed the title Add intersection module - seismic fence Add seismic intersection module - seismic fence Nov 2, 2023
@jorgenherje jorgenherje marked this pull request as ready for review November 2, 2023 13:53
HansKallekleiv
HansKallekleiv requested changes Nov 3, 2023
View reviewed changes
Copy link
Collaborator

@HansKallekleiv HansKallekleiv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

Some minor issues that should be fixed:

  • Atleast for vertical wells the image is displaced related to the trajectory.
    image

  • Color palette change does not trigger rerender

  • Wrong fill value for traces outside the cube. See inline comment.

backend/src/services/vds_access/vds_access.py Outdated Show resolved Hide resolved
@jorgenherje
Adjustments after review
92786f1 
- Handle fillValue better
- Correct bug for xAxisOffset, as it was extending curtain too much.
- Ensure update of color palette triggers re-render of image
@jorgenherje
Merge branch 'main' into seismic-intersection
d0a2cd0
@jorgenherje
Adjust query cacheTime -> gcTime for useQuery
18e41b9
@jorgenherje
Refactor async image generation into hook
21ca079
HansKallekleiv
HansKallekleiv requested changes Nov 12, 2023
View reviewed changes
Copy link
Collaborator

@HansKallekleiv HansKallekleiv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor issue. Otherwise good!

frontend/src/modules/SeismicIntersection/settings.tsx Outdated Show resolved Hide resolved
rubenthoms
rubenthoms requested changes Nov 28, 2023
View reviewed changes
Copy link
Collaborator

@rubenthoms rubenthoms left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍 Nice code separation and concise code, good to read and understand. A couple of comments/suggestions.

frontend/src/modules/SeismicIntersection/loadModule.tsx Outdated Show resolved Hide resolved
frontend/src/modules/SeismicIntersection/settings.tsx Outdated Show resolved Hide resolved
frontend/src/modules/SeismicIntersection/settings.tsx Outdated Show resolved Hide resolved
frontend/src/modules/SeismicIntersection/settings.tsx Outdated Show resolved Hide resolved
frontend/src/modules/SeismicIntersection/utils/esvIntersectionControllerUtils.ts Outdated Show resolved Hide resolved
frontend/src/modules/SubsurfaceMap/view.tsx Outdated Show resolved Hide resolved
frontend/src/modules/SeismicIntersection/view.tsx Outdated Show resolved Hide resolved
frontend/src/modules/SeismicIntersection/view.tsx Outdated Show resolved Hide resolved
frontend/src/modules/SeismicIntersection/view.tsx Outdated Show resolved Hide resolved
frontend/src/modules/SeismicIntersection/view.tsx Show resolved Hide resolved
@jorgenherje
Fixes based on review
b7591d0 
Back-end:
- Rename @router.post method to `post_get`
- Add async to function names
- Renamed "seismicDirectory" to "seismicCubeMetaList".
- Update attribute names for clarification
- Update doc for clarification

Front-end:
- Adjust iso date/interval strings conversion
- Adjust "seismic directory" -> "seismic cube meta list" naming.
- Improve naming and typing for readability
@jorgenherje
Merge branch 'main' into seismic-intersection
1dba1d5
@jorgenherje
Corrections after merge
7fb9d98
@jorgenherje jorgenherje mentioned this pull request Nov 30, 2023
Open
@jorgenherje jorgenherje mentioned this pull request Dec 1, 2023
Closed
rubenthoms
rubenthoms approved these changes Dec 1, 2023
View reviewed changes
Copy link
Collaborator

@rubenthoms rubenthoms left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, ready to be merged 👍

@jorgenherje jorgenherje merged commit 69f3a6c into equinor:main Dec 1, 2023
3 checks passed
@jorgenherje jorgenherje mentioned this pull request Dec 6, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rubenthoms rubenthoms rubenthoms approved these changes

@HansKallekleiv HansKallekleiv HansKallekleiv approved these changes

@sigurdp sigurdp Awaiting requested review from sigurdp

Assignees

@jorgenherje jorgenherje

Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jorgenherje @HansKallekleiv @rubenthoms