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.

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

Add seismic intersection module - seismic fence #449

Merged
merged 43 commits into from
Dec 1, 2023
Merged
Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
a61dd52
Vds Access
HansKallekleiv Sep 18, 2023
8ba2d27
Add env variable for vds service
HansKallekleiv Sep 18, 2023
0ac4585
Doc. split bytes=>numpy into separate function
HansKallekleiv Sep 18, 2023
ae8421f
Comment on fill value
HansKallekleiv Sep 18, 2023
4c28062
use add endpoints. use async
HansKallekleiv Sep 30, 2023
8a2df18
docs
HansKallekleiv Oct 1, 2023
d15fa83
lint
HansKallekleiv Oct 1, 2023
b02bdf1
lint
HansKallekleiv Oct 1, 2023
db9b4e8
Add requests-toolbelt
HansKallekleiv Oct 1, 2023
9b5ae81
Update api
HansKallekleiv Oct 1, 2023
be86a69
use base64
HansKallekleiv Oct 3, 2023
ec48760
update api. lint
HansKallekleiv Oct 3, 2023
650751c
Merge remote-tracking branch 'HansKallekleiv/vdsaccess' into seismic-…
jorgenherje Oct 11, 2023
a4a98e0
Adjust poetry.lock file
jorgenherje Oct 11, 2023
ecf2f5a
Backup
jorgenherje Oct 17, 2023
5de3a32
Backup and with jupyter notebook testing of API
jorgenherje Oct 18, 2023
e284cba
Merge branch 'main' into seismic-intersection
jorgenherje Oct 18, 2023
814205a
Adjustments after merge
jorgenherje Oct 19, 2023
99f7ec0
Backup
jorgenherje Oct 20, 2023
353cfd0
Next iteration of front-end code
jorgenherje Oct 26, 2023
0d15df6
Next iteration/adjustments
jorgenherje Oct 27, 2023
0ec7f7b
Merge remote-tracking branch 'equinor/main' into seismic-intersection
jorgenherje Oct 27, 2023
2946b3c
Adjust poetry after merge
jorgenherje Oct 27, 2023
8233b45
Fix lint/code style errors/warnings
jorgenherje Oct 31, 2023
9312ff2
Next iteration
jorgenherje Oct 31, 2023
213e84f
Change name from Intersection to SeismicIntersection
jorgenherje Oct 31, 2023
e7c99fa
Revert unused sumo access code
jorgenherje Oct 31, 2023
96d0bde
Merge branch 'main' into seismic-intersection
jorgenherje Oct 31, 2023
4486711
Adjust bitmap and status usage
jorgenherje Oct 31, 2023
65b1625
Merge remote-tracking branch 'equinor/main' into seismic-intersection
jorgenherje Nov 2, 2023
d2c5187
Adjust data conversion methods arguments and remove unused function
jorgenherje Nov 2, 2023
b0f5332
Adjustments
jorgenherje Nov 2, 2023
18446b0
Add dummy vds host address for CI
jorgenherje Nov 2, 2023
9e27bbe
Adjust documentation
jorgenherje Nov 2, 2023
92786f1
Adjustments after review
jorgenherje Nov 9, 2023
d0a2cd0
Merge branch 'main' into seismic-intersection
jorgenherje Nov 10, 2023
18e41b9
Adjust query cacheTime -> gcTime for useQuery
jorgenherje Nov 10, 2023
21ca079
Refactor async image generation into hook
jorgenherje Nov 10, 2023
b7591d0
Fixes based on review
jorgenherje Nov 30, 2023
1dba1d5
Merge branch 'main' into seismic-intersection
jorgenherje Nov 30, 2023
7fb9d98
Corrections after merge
jorgenherje Nov 30, 2023
292dfff
Fix comment
jorgenherje Dec 1, 2023
b6dae34
Merge branch 'main' into seismic-intersection
jorgenherje Dec 1, 2023
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
Prev Previous commit
Next Next commit
Adjust documentation
jorgenherje committed Nov 2, 2023
commit 9e27bbe878f901c205646c82d63acba8c43d0c34
2 changes: 1 addition & 1 deletion backend/src/backend/primary/routers/seismic/router.py
Original file line number Diff line number Diff line change
@@ -50,7 +50,7 @@ async def get_seismic_fence(
"""Get a fence of seismic data from a polyline defined by a set of (x, y) coordinates in domain coordinate system.

The fence data contains a set of traces perpendicular to the polyline, with one trace per (x, y)-point in polyline.
Each trace has number of samples equal length, and is a set of values along the height/depth axis of the fence.
Each trace has equal number of samples, and is a set of sample values along the depth direction of the seismic cube.

The returned data
* fence_traces_b64arr: The fence trace array is base64 encoded 1D float array - where data is stored trace by trace. Decoding info: [num_traces, num_trace_samples]
2 changes: 1 addition & 1 deletion backend/src/backend/primary/routers/seismic/schemas.py
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@ class SeismicFenceData(BaseModel):
Definition of a fence of seismic data from a set of (x, y) coordinates in domain coordinate system.
Each (x, y) point provides a trace perpendicular to the x-y plane, with number of samples equal to the depth of the seismic cube.

The trace is along the along length direction of the fence.
Each trace is defined to be a set of depth value samples along the length direction of the fence.

`Properties:`
- `fence_traces_b64arr`: The fence trace array is base64 encoded 1D float array - where data is stored trace by trace.
2 changes: 1 addition & 1 deletion frontend/src/api/models/SeismicFenceData.ts
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ import type { B64FloatArray } from './B64FloatArray';
* Definition of a fence of seismic data from a set of (x, y) coordinates in domain coordinate system.
* Each (x, y) point provides a trace perpendicular to the x-y plane, with number of samples equal to the depth of the seismic cube.
*
* The trace is along the along length direction of the fence.
* Each trace is defined to be a set of depth value samples along the length direction of the fence.
*
* `Properties:`
* - `fence_traces_b64arr`: The fence trace array is base64 encoded 1D float array - where data is stored trace by trace.
2 changes: 1 addition & 1 deletion frontend/src/api/services/SeismicService.ts
Original file line number Diff line number Diff line change
@@ -42,7 +42,7 @@ export class SeismicService {
* Get a fence of seismic data from a polyline defined by a set of (x, y) coordinates in domain coordinate system.
*
* The fence data contains a set of traces perpendicular to the polyline, with one trace per (x, y)-point in polyline.
* Each trace has number of samples equal length, and is a set of values along the height/depth axis of the fence.
* Each trace has equal number of samples, and is a set of sample values along the depth direction of the seismic cube.
*
* The returned data
* * fence_traces_b64arr: The fence trace array is base64 encoded 1D float array - where data is stored trace by trace. Decoding info: [num_traces, num_trace_samples]