Skip to content

feat: Add JSON I/O functionality for surface points #1018

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

Closed
wants to merge 34 commits into from
Closed

feat: Add JSON I/O functionality for surface points #1018

Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
cec6e0f
feat: Add JSON I/O functionality for surface points
flohorovicic Mar 19, 2025
1e86bcd
feat: Add orientation data loading functionality
flohorovicic Mar 19, 2025
8d031e6
feat: Add horizontal stratigraphic model tutorial
flohorovicic Mar 19, 2025
7790956
fix: Update JSON loading to use surface names from series data - Add …
flohorovicic Mar 19, 2025
74ef1d3
fix: Update horizontal stratigraphic tutorial with correct data and m…
flohorovicic Mar 19, 2025
8e580d8
fix: correct IDs and positions for fault and rock1 in multiple series…
flohorovicic Mar 19, 2025
3eb7dc0
Added .json input file
flohorovicic Mar 19, 2025
5c2b339
Updated .json input file
flohorovicic Mar 19, 2025
430a5ac
Adjustments in stack-mapping for more flexible handling of faults
flohorovicic Mar 19, 2025
2f5a6b5
Added modules __init__ and minor changes in json module
flohorovicic Mar 19, 2025
04e87a1
fix: Fix metadata handling in JSON I/O for proper preservation when l…
flohorovicic Mar 22, 2025
1df8dac
Updated .gitignore (only to ignore files generated by new tutorial)
flohorovicic Mar 22, 2025
1c60ddd
Extended functionality to save .json and adjusted tests. Simple model…
flohorovicic Mar 23, 2025
427092e
Added structural relations to .json and fixed error in second example
flohorovicic Mar 23, 2025
3fd2106
Fixed problem with loading of surface layer stack
flohorovicic Mar 23, 2025
9caa992
Fixed stratigraphic pile handling in JSON I/O by reverting to working…
flohorovicic Mar 23, 2025
c5ddb5a
Included name-id mapping in .json
flohorovicic Mar 24, 2025
e6d8c23
Fix JSON serialization for NumPy types and update example data
flohorovicic Mar 24, 2025
f80c4b0
Adjusted date format
flohorovicic Mar 24, 2025
c06aa90
Simplified required json input further and added "minimal working exa…
flohorovicic Mar 25, 2025
2a2c46b
Simplified minimal input even further: now only points and orientatio…
flohorovicic Mar 25, 2025
c4f60aa
Updated minimal json examples and comparison to minimal GemPy model
flohorovicic Mar 25, 2025
e6f9794
Additional fixes to get defaults right
flohorovicic Mar 25, 2025
558a185
Added default nugget value to minimize input even further
flohorovicic Mar 25, 2025
f9862ed
Updated tests and fixed code to pass tests.
flohorovicic Mar 28, 2025
bf069e9
fix: Update fault model example with correct series mapping and visua…
flohorovicic Apr 5, 2025
77a9625
Improve scalar field visualization in fault model example - Add prope…
flohorovicic Apr 6, 2025
5948e42
Example model for a combination of series and faults from json
flohorovicic Apr 6, 2025
a615e8d
Add combination model JSON files to gitignore
flohorovicic Apr 6, 2025
56ac045
fix: preserve colors when loading models from JSON - Added color pres…
flohorovicic Apr 6, 2025
e35ec32
test: update JSON I/O tests to verify color preservation - Added colo…
flohorovicic Apr 6, 2025
986d6c8
Added TODOs for PR.
javoha Apr 11, 2025
27b2292
Added TODOs for PR.
javoha Apr 11, 2025
bb3dc7a
fix: ensure NotRequired import works for both Python 3.11+ and earlie…
flohorovicic Apr 27, 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
Prev Previous commit
Next Next commit
Added .json input file
  • Loading branch information
@flohorovicic @Leguark
flohorovicic authored and Leguark committed May 1, 2025
commit 3eb7dc0a7a57fade30842fd0a1f8b3cf277442a7
288 changes: 288 additions & 0 deletions examples/tutorials/z_other_tutorials/json_io/multiple_series_faults.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,288 @@
{
"metadata": {
"name": "multiple_series_faults",
"creation_date": "2024-03-19",
"last_modification_date": "2024-03-19",
"owner": "tutorial"
},
"surface_points": [
{
"x": 0.0,
"y": 200.0,
"z": 600.0,
"id": 2,
"nugget": 2e-05
},
{
"x": 0.0,
"y": 500.0,
"z": 600.0,
"id": 2,
"nugget": 2e-05
},
{
"x": 0.0,
"y": 800.0,
"z": 600.0,
"id": 2,
"nugget": 2e-05
},
{
"x": 200.0,
"y": 200.0,
"z": 600.0,
"id": 2,
"nugget": 2e-05
},
{
"x": 200.0,
"y": 500.0,
"z": 600.0,
"id": 2,
"nugget": 2e-05
},
{
"x": 200.0,
"y": 800.0,
"z": 600.0,
"id": 2,
"nugget": 2e-05
},
{
"x": 800.0,
"y": 200.0,
"z": 200.0,
"id": 2,
"nugget": 2e-05
},
{
"x": 800.0,
"y": 500.0,
"z": 200.0,
"id": 2,
"nugget": 2e-05
},
{
"x": 800.0,
"y": 800.0,
"z": 200.0,
"id": 2,
"nugget": 2e-05
},
{
"x": 1000.0,
"y": 200.0,
"z": 200.0,
"id": 2,
"nugget": 2e-05
},
{
"x": 1000.0,
"y": 500.0,
"z": 200.0,
"id": 2,
"nugget": 2e-05
},
{
"x": 1000.0,
"y": 800.0,
"z": 200.0,
"id": 2,
"nugget": 2e-05
},
{
"x": 0.0,
"y": 200.0,
"z": 800.0,
"id": 1,
"nugget": 2e-05
},
{
"x": 0.0,
"y": 800.0,
"z": 800.0,
"id": 1,
"nugget": 2e-05
},
{
"x": 200.0,
"y": 200.0,
"z": 800.0,
"id": 1,
"nugget": 2e-05
},
{
"x": 200.0,
"y": 800.0,
"z": 800.0,
"id": 1,
"nugget": 2e-05
},
{
"x": 800.0,
"y": 200.0,
"z": 400.0,
"id": 1,
"nugget": 2e-05
},
{
"x": 800.0,
"y": 800.0,
"z": 400.0,
"id": 1,
"nugget": 2e-05
},
{
"x": 1000.0,
"y": 200.0,
"z": 400.0,
"id": 1,
"nugget": 2e-05
},
{
"x": 1000.0,
"y": 800.0,
"z": 400.0,
"id": 1,
"nugget": 2e-05
},
{
"x": 500.0,
"y": 500.0,
"z": 500.0,
"id": 0,
"nugget": 2e-05
},
{
"x": 450.0,
"y": 500.0,
"z": 600.0,
"id": 0,
"nugget": 2e-05
},
{
"x": 500.0,
"y": 200.0,
"z": 500.0,
"id": 0,
"nugget": 2e-05
},
{
"x": 450.0,
"y": 200.0,
"z": 600.0,
"id": 0,
"nugget": 2e-05
},
{
"x": 500.0,
"y": 800.0,
"z": 500.0,
"id": 0,
"nugget": 2e-05
},
{
"x": 450.0,
"y": 800.0,
"z": 600.0,
"id": 0,
"nugget": 2e-05
}
],
"orientations": [
{
"x": 100.0,
"y": 500.0,
"z": 800.0,
"G_x": 0.0,
"G_y": 0.0,
"G_z": 1.0,
"id": 1,
"nugget": 0.01,
"polarity": 1
},
{
"x": 100.0,
"y": 500.0,
"z": 600.0,
"G_x": 0.0,
"G_y": 0.0,
"G_z": 1.0,
"id": 2,
"nugget": 0.01,
"polarity": 1
},
{
"x": 500.0,
"y": 500.0,
"z": 500.0,
"G_x": 0.8,
"G_y": 0.0,
"G_z": 0.6,
"id": 0,
"nugget": 0.01,
"polarity": 1
},
{
"x": 900.0,
"y": 500.0,
"z": 400.0,
"G_x": 0.0,
"G_y": 0.0,
"G_z": 1.0,
"id": 1,
"nugget": 0.01,
"polarity": 1
},
{
"x": 900.0,
"y": 500.0,
"z": 200.0,
"G_x": 0.0,
"G_y": 0.0,
"G_z": 1.0,
"id": 2,
"nugget": 0.01,
"polarity": 1
}
],
"series": [
{
"name": "Fault_Series",
"surfaces": [
"fault"
],
"structural_relation": "FAULT",
"color": "#015482"
},
{
"name": "Strat_Series",
"surfaces": [
"rock2",
"rock1"
],
"structural_relation": "ERODE",
"colors": [
"#ffbe00",
"#9f0052"
]
}
],
"grid_settings": {
"regular_grid_resolution": [
90,
30,
30
],
"regular_grid_extent": [
0,
1000,
0,
1000,
0,
1000
],
"octree_levels": null
},
"interpolation_options": {}
}