From 0f5a6f897274b5bfdcea380394feaf22f55af433 Mon Sep 17 00:00:00 2001 From: Per Olav Eide Svendsen Date: Fri, 26 Apr 2024 14:34:55 +0200 Subject: [PATCH] CLN: Remove unused volumetrics and inplace_volumes contents. --- .../0.8.0/examples/table_inplace.yml | 2 +- schema/definitions/0.8.0/schema/fmu_meta.json | 1992 ++++++----------- src/fmu/dataio/_definitions.py | 2 +- src/fmu/dataio/datastructure/meta/content.py | 10 - src/fmu/dataio/datastructure/meta/enums.py | 2 - 5 files changed, 710 insertions(+), 1298 deletions(-) diff --git a/schema/definitions/0.8.0/examples/table_inplace.yml b/schema/definitions/0.8.0/examples/table_inplace.yml index bab1784ee..1fecb57db 100644 --- a/schema/definitions/0.8.0/examples/table_inplace.yml +++ b/schema/definitions/0.8.0/examples/table_inplace.yml @@ -69,7 +69,7 @@ file: data: # The data block describes the actual data (e.g. surface). Only present in data objects - content: inplace_volumes # white-listed and standardized + content: volumes # white-listed and standardized # if stratigraphic, name must match the strat column. This is the official name of this surface. name: inplace_mygrid diff --git a/schema/definitions/0.8.0/schema/fmu_meta.json b/schema/definitions/0.8.0/schema/fmu_meta.json index 9c26418fe..97af12b1f 100644 --- a/schema/definitions/0.8.0/schema/fmu_meta.json +++ b/schema/definitions/0.8.0/schema/fmu_meta.json @@ -152,9 +152,6 @@ { "$ref": "#/$defs/FluidContactContent" }, - { - "$ref": "#/$defs/InplaceVolumesContent" - }, { "$ref": "#/$defs/KPProductContent" }, @@ -206,9 +203,6 @@ { "$ref": "#/$defs/VolumesContent" }, - { - "$ref": "#/$defs/VolumetricsContent" - }, { "$ref": "#/$defs/WellPicksContent" } @@ -3221,7 +3215,63 @@ "title": "GridModel", "type": "object" }, - "InplaceVolumesContent": { + "Iteration": { + "properties": { + "id": { + "anyOf": [ + { + "type": "integer" + }, + { + "type": "null" + } + ], + "default": null, + "description": "The internal identification of this iteration, e.g. the iteration number", + "title": "Id" + }, + "name": { + "description": "The convential name of this iteration, e.g. iter-0 or pred", + "examples": [ + "iter-0" + ], + "title": "Name", + "type": "string" + }, + "restart_from": { + "anyOf": [ + { + "format": "uuid", + "type": "string" + }, + { + "type": "null" + } + ], + "default": null, + "description": "A uuid reference to another iteration that this iteration was restarted from", + "examples": [ + "15ce3b84-766f-4c93-9050-b154861f9100" + ], + "title": "Restart From" + }, + "uuid": { + "examples": [ + "15ce3b84-766f-4c93-9050-b154861f9100" + ], + "format": "uuid", + "title": "Uuid", + "type": "string" + } + }, + "required": [ + "name", + "uuid" + ], + "title": "Iteration", + "type": "object" + }, + "KPProductContent": { "properties": { "alias": { "anyOf": [ @@ -3265,7 +3315,7 @@ "title": "Bbox" }, "content": { - "const": "inplace_volumes", + "const": "khproduct", "title": "Content" }, "description": { @@ -3503,66 +3553,38 @@ "name", "stratigraphic" ], - "title": "InplaceVolumesContent", + "title": "KPProductContent", "type": "object" }, - "Iteration": { + "Layer": { "properties": { - "id": { - "anyOf": [ - { - "type": "integer" - }, - { - "type": "null" - } - ], - "default": null, - "description": "The internal identification of this iteration, e.g. the iteration number", - "title": "Id" - }, "name": { - "description": "The convential name of this iteration, e.g. iter-0 or pred", + "description": "Name of the data object. If stratigraphic, match the entry in the stratigraphic column", "examples": [ - "iter-0" + "VIKING GP. Top" ], "title": "Name", "type": "string" }, - "restart_from": { - "anyOf": [ - { - "format": "uuid", - "type": "string" - }, - { - "type": "null" - } - ], - "default": null, - "description": "A uuid reference to another iteration that this iteration was restarted from", - "examples": [ - "15ce3b84-766f-4c93-9050-b154861f9100" - ], - "title": "Restart From" + "offset": { + "default": 0, + "title": "Offset", + "type": "number" }, - "uuid": { - "examples": [ - "15ce3b84-766f-4c93-9050-b154861f9100" - ], - "format": "uuid", - "title": "Uuid", - "type": "string" + "stratigraphic": { + "default": false, + "description": "True if data object represents an entity in the stratigraphic colum", + "title": "Stratigraphic", + "type": "boolean" } }, "required": [ - "name", - "uuid" + "name" ], - "title": "Iteration", + "title": "Layer", "type": "object" }, - "KPProductContent": { + "LiftCurvesContent": { "properties": { "alias": { "anyOf": [ @@ -3606,7 +3628,7 @@ "title": "Bbox" }, "content": { - "const": "khproduct", + "const": "lift_curves", "title": "Content" }, "description": { @@ -3844,38 +3866,22 @@ "name", "stratigraphic" ], - "title": "KPProductContent", + "title": "LiftCurvesContent", "type": "object" }, - "Layer": { + "Masterdata": { "properties": { - "name": { - "description": "Name of the data object. If stratigraphic, match the entry in the stratigraphic column", - "examples": [ - "VIKING GP. Top" - ], - "title": "Name", - "type": "string" - }, - "offset": { - "default": 0, - "title": "Offset", - "type": "number" - }, - "stratigraphic": { - "default": false, - "description": "True if data object represents an entity in the stratigraphic colum", - "title": "Stratigraphic", - "type": "boolean" + "smda": { + "$ref": "#/$defs/Smda" } }, "required": [ - "name" + "smda" ], - "title": "Layer", + "title": "Masterdata", "type": "object" }, - "LiftCurvesContent": { + "PVTContent": { "properties": { "alias": { "anyOf": [ @@ -3919,7 +3925,7 @@ "title": "Bbox" }, "content": { - "const": "lift_curves", + "const": "pvt", "title": "Content" }, "description": { @@ -4157,22 +4163,30 @@ "name", "stratigraphic" ], - "title": "LiftCurvesContent", + "title": "PVTContent", "type": "object" }, - "Masterdata": { - "properties": { - "smda": { - "$ref": "#/$defs/Smda" - } + "Parameters": { + "additionalProperties": { + "anyOf": [ + { + "$ref": "#/$defs/Parameters" + }, + { + "type": "integer" + }, + { + "type": "number" + }, + { + "type": "string" + } + ] }, - "required": [ - "smda" - ], - "title": "Masterdata", + "title": "Parameters", "type": "object" }, - "PVTContent": { + "ParametersContent": { "properties": { "alias": { "anyOf": [ @@ -4216,7 +4230,7 @@ "title": "Bbox" }, "content": { - "const": "pvt", + "const": "parameters", "title": "Content" }, "description": { @@ -4454,30 +4468,10 @@ "name", "stratigraphic" ], - "title": "PVTContent", - "type": "object" - }, - "Parameters": { - "additionalProperties": { - "anyOf": [ - { - "$ref": "#/$defs/Parameters" - }, - { - "type": "integer" - }, - { - "type": "number" - }, - { - "type": "string" - } - ] - }, - "title": "Parameters", + "title": "ParametersContent", "type": "object" }, - "ParametersContent": { + "PinchoutContent": { "properties": { "alias": { "anyOf": [ @@ -4521,7 +4515,7 @@ "title": "Bbox" }, "content": { - "const": "parameters", + "const": "pinchout", "title": "Content" }, "description": { @@ -4759,12 +4753,12 @@ "name", "stratigraphic" ], - "title": "ParametersContent", + "title": "PinchoutContent", "type": "object" }, - "PinchoutContent": { + "PointSpecification": { "properties": { - "alias": { + "attributes": { "anyOf": [ { "items": { @@ -4776,38 +4770,86 @@ "type": "null" } ], - "default": null, - "title": "Alias" - }, - "base": { - "anyOf": [ - { - "$ref": "#/$defs/Layer" - }, - { - "type": "null" - } - ], - "default": null + "description": "List of columns present in a table.", + "title": "Attributes" }, - "bbox": { - "anyOf": [ - { - "$ref": "#/$defs/BoundingBox2D" - }, - { - "$ref": "#/$defs/BoundingBox3D" - }, - { - "type": "null" - } + "size": { + "description": "Size of data object.", + "examples": [ + 1, + 9999 ], - "default": null, - "title": "Bbox" - }, - "content": { - "const": "pinchout", - "title": "Content" + "title": "Size", + "type": "integer" + } + }, + "required": [ + "attributes", + "size" + ], + "title": "PointSpecification", + "type": "object" + }, + "PolygonsSpecification": { + "properties": { + "npolys": { + "description": "The number of individual polygons in the data object", + "title": "Npolys", + "type": "integer" + } + }, + "required": [ + "npolys" + ], + "title": "PolygonsSpecification", + "type": "object" + }, + "PropertyContent": { + "properties": { + "alias": { + "anyOf": [ + { + "items": { + "type": "string" + }, + "type": "array" + }, + { + "type": "null" + } + ], + "default": null, + "title": "Alias" + }, + "base": { + "anyOf": [ + { + "$ref": "#/$defs/Layer" + }, + { + "type": "null" + } + ], + "default": null + }, + "bbox": { + "anyOf": [ + { + "$ref": "#/$defs/BoundingBox2D" + }, + { + "$ref": "#/$defs/BoundingBox3D" + }, + { + "type": "null" + } + ], + "default": null, + "title": "Bbox" + }, + "content": { + "const": "property", + "title": "Content" }, "description": { "anyOf": [ @@ -5044,58 +5086,10 @@ "name", "stratigraphic" ], - "title": "PinchoutContent", - "type": "object" - }, - "PointSpecification": { - "properties": { - "attributes": { - "anyOf": [ - { - "items": { - "type": "string" - }, - "type": "array" - }, - { - "type": "null" - } - ], - "description": "List of columns present in a table.", - "title": "Attributes" - }, - "size": { - "description": "Size of data object.", - "examples": [ - 1, - 9999 - ], - "title": "Size", - "type": "integer" - } - }, - "required": [ - "attributes", - "size" - ], - "title": "PointSpecification", - "type": "object" - }, - "PolygonsSpecification": { - "properties": { - "npolys": { - "description": "The number of individual polygons in the data object", - "title": "Npolys", - "type": "integer" - } - }, - "required": [ - "npolys" - ], - "title": "PolygonsSpecification", + "title": "PropertyContent", "type": "object" }, - "PropertyContent": { + "RFTContent": { "properties": { "alias": { "anyOf": [ @@ -5139,7 +5133,7 @@ "title": "Bbox" }, "content": { - "const": "property", + "const": "rft", "title": "Content" }, "description": { @@ -5377,10 +5371,65 @@ "name", "stratigraphic" ], - "title": "PropertyContent", + "title": "RFTContent", "type": "object" }, - "RFTContent": { + "Realization": { + "properties": { + "id": { + "description": "The unique number of this realization as used in FMU", + "title": "Id", + "type": "integer" + }, + "jobs": { + "anyOf": [ + {}, + { + "type": "null" + } + ], + "default": null, + "description": "Content directly taken from the ERT jobs.json file for this realization", + "title": "Jobs" + }, + "name": { + "description": "The convential name of this iteration, e.g. iter-0 or pred", + "examples": [ + "iter-0" + ], + "title": "Name", + "type": "string" + }, + "parameters": { + "anyOf": [ + { + "$ref": "#/$defs/Parameters" + }, + { + "type": "null" + } + ], + "default": null, + "description": "Parameters for this realization" + }, + "uuid": { + "examples": [ + "15ce3b84-766f-4c93-9050-b154861f9100" + ], + "format": "uuid", + "title": "Uuid", + "type": "string" + } + }, + "required": [ + "id", + "name", + "uuid" + ], + "title": "Realization", + "type": "object" + }, + "RegionsContent": { "properties": { "alias": { "anyOf": [ @@ -5424,7 +5473,7 @@ "title": "Bbox" }, "content": { - "const": "rft", + "const": "regions", "title": "Content" }, "description": { @@ -5662,65 +5711,10 @@ "name", "stratigraphic" ], - "title": "RFTContent", - "type": "object" - }, - "Realization": { - "properties": { - "id": { - "description": "The unique number of this realization as used in FMU", - "title": "Id", - "type": "integer" - }, - "jobs": { - "anyOf": [ - {}, - { - "type": "null" - } - ], - "default": null, - "description": "Content directly taken from the ERT jobs.json file for this realization", - "title": "Jobs" - }, - "name": { - "description": "The convential name of this iteration, e.g. iter-0 or pred", - "examples": [ - "iter-0" - ], - "title": "Name", - "type": "string" - }, - "parameters": { - "anyOf": [ - { - "$ref": "#/$defs/Parameters" - }, - { - "type": "null" - } - ], - "default": null, - "description": "Parameters for this realization" - }, - "uuid": { - "examples": [ - "15ce3b84-766f-4c93-9050-b154861f9100" - ], - "format": "uuid", - "title": "Uuid", - "type": "string" - } - }, - "required": [ - "id", - "name", - "uuid" - ], - "title": "Realization", + "title": "RegionsContent", "type": "object" }, - "RegionsContent": { + "RelpermContent": { "properties": { "alias": { "anyOf": [ @@ -5764,7 +5758,7 @@ "title": "Bbox" }, "content": { - "const": "regions", + "const": "relperm", "title": "Content" }, "description": { @@ -6002,16 +5996,104 @@ "name", "stratigraphic" ], - "title": "RegionsContent", + "title": "RelpermContent", "type": "object" }, - "RelpermContent": { + "Seismic": { + "description": "Conditional field", "properties": { - "alias": { + "attribute": { "anyOf": [ { - "items": { - "type": "string" + "type": "string" + }, + { + "type": "null" + } + ], + "default": null, + "examples": [ + "amplitude_timeshifted" + ], + "title": "Attribute" + }, + "calculation": { + "anyOf": [ + { + "type": "string" + }, + { + "type": "null" + } + ], + "default": null, + "examples": [ + "mean" + ], + "title": "Calculation" + }, + "filter_size": { + "anyOf": [ + { + "type": "number" + }, + { + "type": "null" + } + ], + "default": null, + "title": "Filter Size" + }, + "scaling_factor": { + "anyOf": [ + { + "type": "number" + }, + { + "type": "null" + } + ], + "default": null, + "title": "Scaling Factor" + }, + "stacking_offset": { + "anyOf": [ + { + "type": "string" + }, + { + "type": "null" + } + ], + "default": null, + "examples": [ + "0-15" + ], + "title": "Stacking Offset" + }, + "zrange": { + "anyOf": [ + { + "type": "number" + }, + { + "type": "null" + } + ], + "default": null, + "title": "Zrange" + } + }, + "title": "Seismic", + "type": "object" + }, + "SeismicContent": { + "properties": { + "alias": { + "anyOf": [ + { + "items": { + "type": "string" }, "type": "array" }, @@ -6049,7 +6131,7 @@ "title": "Bbox" }, "content": { - "const": "relperm", + "const": "seismic", "title": "Content" }, "description": { @@ -6121,6 +6203,9 @@ "title": "Offset", "type": "number" }, + "seismic": { + "$ref": "#/$defs/Seismic" + }, "spec": { "anyOf": [ { @@ -6285,169 +6370,192 @@ "is_observation", "is_prediction", "name", - "stratigraphic" + "stratigraphic", + "seismic" ], - "title": "RelpermContent", + "title": "SeismicContent", "type": "object" }, - "Seismic": { - "description": "Conditional field", + "Smda": { "properties": { - "attribute": { + "coordinate_system": { + "$ref": "#/$defs/CoordinateSystem" + }, + "country": { + "items": { + "$ref": "#/$defs/CountryItem" + }, + "title": "Country", + "type": "array" + }, + "discovery": { + "items": { + "$ref": "#/$defs/DiscoveryItem" + }, + "title": "Discovery", + "type": "array" + }, + "field": { + "items": { + "$ref": "#/$defs/FieldItem" + }, + "title": "Field", + "type": "array" + }, + "stratigraphic_column": { + "$ref": "#/$defs/StratigraphicColumn" + } + }, + "required": [ + "coordinate_system", + "country", + "discovery", + "field", + "stratigraphic_column" + ], + "title": "Smda", + "type": "object" + }, + "Ssdl": { + "description": "Sub-Surface Data Lake", + "properties": { + "access_level": { + "$ref": "#/$defs/AccessLevel" + }, + "rep_include": { + "title": "Rep Include", + "type": "boolean" + } + }, + "required": [ + "access_level", + "rep_include" + ], + "title": "Ssdl", + "type": "object" + }, + "SsdlAccess": { + "properties": { + "asset": { + "$ref": "#/$defs/Asset" + }, + "classification": { "anyOf": [ { - "type": "string" + "$ref": "#/$defs/AccessLevel" }, { "type": "null" } ], - "default": null, + "default": null + }, + "ssdl": { + "$ref": "#/$defs/Ssdl" + } + }, + "required": [ + "asset", + "ssdl" + ], + "title": "SsdlAccess", + "type": "object" + }, + "StratigraphicColumn": { + "properties": { + "identifier": { "examples": [ - "amplitude_timeshifted" + "DROGON_2020" ], - "title": "Attribute" + "title": "Identifier", + "type": "string" }, - "calculation": { + "uuid": { + "examples": [ + "15ce3b84-766f-4c93-9050-b154861f9100" + ], + "format": "uuid", + "title": "Uuid", + "type": "string" + } + }, + "required": [ + "identifier", + "uuid" + ], + "title": "StratigraphicColumn", + "type": "object" + }, + "SubcropContent": { + "properties": { + "alias": { "anyOf": [ { - "type": "string" + "items": { + "type": "string" + }, + "type": "array" }, { "type": "null" } ], "default": null, - "examples": [ - "mean" - ], - "title": "Calculation" + "title": "Alias" }, - "filter_size": { + "base": { "anyOf": [ { - "type": "number" + "$ref": "#/$defs/Layer" }, { "type": "null" } ], - "default": null, - "title": "Filter Size" + "default": null }, - "scaling_factor": { + "bbox": { "anyOf": [ { - "type": "number" + "$ref": "#/$defs/BoundingBox2D" + }, + { + "$ref": "#/$defs/BoundingBox3D" }, { "type": "null" } ], "default": null, - "title": "Scaling Factor" + "title": "Bbox" }, - "stacking_offset": { + "content": { + "const": "subcrop", + "title": "Content" + }, + "description": { "anyOf": [ { - "type": "string" + "items": { + "type": "string" + }, + "type": "array" }, { "type": "null" } ], "default": null, + "title": "Description" + }, + "format": { "examples": [ - "0-15" + "irap_binary" ], - "title": "Stacking Offset" + "title": "Format", + "type": "string" }, - "zrange": { - "anyOf": [ - { - "type": "number" - }, - { - "type": "null" - } - ], - "default": null, - "title": "Zrange" - } - }, - "title": "Seismic", - "type": "object" - }, - "SeismicContent": { - "properties": { - "alias": { - "anyOf": [ - { - "items": { - "type": "string" - }, - "type": "array" - }, - { - "type": "null" - } - ], - "default": null, - "title": "Alias" - }, - "base": { - "anyOf": [ - { - "$ref": "#/$defs/Layer" - }, - { - "type": "null" - } - ], - "default": null - }, - "bbox": { - "anyOf": [ - { - "$ref": "#/$defs/BoundingBox2D" - }, - { - "$ref": "#/$defs/BoundingBox3D" - }, - { - "type": "null" - } - ], - "default": null, - "title": "Bbox" - }, - "content": { - "const": "seismic", - "title": "Content" - }, - "description": { - "anyOf": [ - { - "items": { - "type": "string" - }, - "type": "array" - }, - { - "type": "null" - } - ], - "default": null, - "title": "Description" - }, - "format": { - "examples": [ - "irap_binary" - ], - "title": "Format", - "type": "string" - }, - "grid_model": { + "grid_model": { "anyOf": [ { "$ref": "#/$defs/GridModel" @@ -6494,9 +6602,6 @@ "title": "Offset", "type": "number" }, - "seismic": { - "$ref": "#/$defs/Seismic" - }, "spec": { "anyOf": [ { @@ -6661,912 +6766,203 @@ "is_observation", "is_prediction", "name", - "stratigraphic", - "seismic" + "stratigraphic" ], - "title": "SeismicContent", + "title": "SubcropContent", "type": "object" }, - "Smda": { + "SurfaceSpecification": { "properties": { - "coordinate_system": { - "$ref": "#/$defs/CoordinateSystem" + "ncol": { + "description": "The number of columns", + "title": "Ncol", + "type": "integer" }, - "country": { - "items": { - "$ref": "#/$defs/CountryItem" - }, - "title": "Country", - "type": "array" + "nrow": { + "description": "The number of rows", + "title": "Nrow", + "type": "integer" }, - "discovery": { - "items": { - "$ref": "#/$defs/DiscoveryItem" - }, - "title": "Discovery", - "type": "array" + "rotation": { + "description": "Rotation angle", + "title": "Rotation", + "type": "number" }, - "field": { - "items": { - "$ref": "#/$defs/FieldItem" - }, - "title": "Field", - "type": "array" + "undef": { + "description": "Value representing undefined data", + "title": "Undef", + "type": "number" }, - "stratigraphic_column": { - "$ref": "#/$defs/StratigraphicColumn" - } - }, - "required": [ - "coordinate_system", - "country", - "discovery", - "field", - "stratigraphic_column" - ], - "title": "Smda", - "type": "object" - }, - "Ssdl": { - "description": "Sub-Surface Data Lake", - "properties": { - "access_level": { - "$ref": "#/$defs/AccessLevel" + "xinc": { + "description": "Increment along the x-axis", + "title": "Xinc", + "type": "number" }, - "rep_include": { - "title": "Rep Include", - "type": "boolean" - } - }, - "required": [ - "access_level", - "rep_include" - ], - "title": "Ssdl", - "type": "object" - }, - "SsdlAccess": { - "properties": { - "asset": { - "$ref": "#/$defs/Asset" + "xori": { + "description": "Origin along the x-axis", + "title": "Xori", + "type": "number" }, - "classification": { - "anyOf": [ - { - "$ref": "#/$defs/AccessLevel" - }, + "yflip": { + "allOf": [ { - "type": "null" + "$ref": "#/$defs/AxisOrientation" } ], - "default": null + "description": "Flip along the y-axis, -1 or 1" }, - "ssdl": { - "$ref": "#/$defs/Ssdl" - } - }, - "required": [ - "asset", - "ssdl" - ], - "title": "SsdlAccess", - "type": "object" - }, - "StratigraphicColumn": { - "properties": { - "identifier": { - "examples": [ - "DROGON_2020" - ], - "title": "Identifier", - "type": "string" + "yinc": { + "description": "Increment along the y-axis", + "title": "Yinc", + "type": "number" }, - "uuid": { - "examples": [ - "15ce3b84-766f-4c93-9050-b154861f9100" - ], - "format": "uuid", - "title": "Uuid", - "type": "string" + "yori": { + "description": "Origin along the y-axis", + "title": "Yori", + "type": "number" } }, "required": [ - "identifier", - "uuid" + "nrow", + "ncol", + "rotation", + "undef", + "xinc", + "yinc", + "xori", + "yflip", + "yori" ], - "title": "StratigraphicColumn", + "title": "SurfaceSpecification", "type": "object" }, - "SubcropContent": { + "SystemInformation": { "properties": { - "alias": { + "fmu-dataio": { "anyOf": [ { - "items": { - "type": "string" - }, - "type": "array" + "$ref": "#/$defs/VersionInformation" }, { "type": "null" } ], "default": null, - "title": "Alias" + "examples": [ + "1.2.3" + ] }, - "base": { + "komodo": { "anyOf": [ { - "$ref": "#/$defs/Layer" + "$ref": "#/$defs/VersionInformation" }, { "type": "null" } ], - "default": null + "default": null, + "examples": [ + "2023.12.05-py38" + ] }, - "bbox": { + "operating_system": { "anyOf": [ { - "$ref": "#/$defs/BoundingBox2D" - }, - { - "$ref": "#/$defs/BoundingBox3D" - }, - { - "type": "null" - } - ], - "default": null, - "title": "Bbox" - }, - "content": { - "const": "subcrop", - "title": "Content" - }, - "description": { - "anyOf": [ - { - "items": { - "type": "string" - }, - "type": "array" - }, - { - "type": "null" - } - ], - "default": null, - "title": "Description" - }, - "format": { - "examples": [ - "irap_binary" - ], - "title": "Format", - "type": "string" - }, - "grid_model": { - "anyOf": [ - { - "$ref": "#/$defs/GridModel" - }, - { - "type": "null" - } - ], - "default": null - }, - "is_observation": { - "title": "Is observation flag", - "type": "boolean" - }, - "is_prediction": { - "title": "Is prediction flag", - "type": "boolean" - }, - "layout": { - "anyOf": [ - { - "type": "string" - }, - { - "type": "null" - } - ], - "default": null, - "examples": [ - "regular" - ], - "title": "Layout" - }, - "name": { - "description": "Name of the data object. If stratigraphic, match the entry in the stratigraphic column", - "examples": [ - "VIKING GP. Top" - ], - "title": "Name", - "type": "string" - }, - "offset": { - "default": 0.0, - "title": "Offset", - "type": "number" - }, - "spec": { - "anyOf": [ - { - "$ref": "#/$defs/CPGridPropertySpecification" - }, - { - "$ref": "#/$defs/CPGridSpecification" - }, - { - "$ref": "#/$defs/FaultRoomSurfaceSpecification" - }, - { - "$ref": "#/$defs/PointSpecification" - }, - { - "$ref": "#/$defs/CubeSpecification" - }, - { - "$ref": "#/$defs/PolygonsSpecification" - }, - { - "$ref": "#/$defs/SurfaceSpecification" - }, - { - "$ref": "#/$defs/TableSpecification" - }, - { - "$ref": "#/$defs/WellPointsDictionaryCaseSpecification" - }, - { - "type": "null" - } - ], - "default": null, - "title": "Spec" - }, - "stratigraphic": { - "description": "True if data object represents an entity in the stratigraphic column", - "title": "Stratigraphic", - "type": "boolean" - }, - "stratigraphic_alias": { - "anyOf": [ - { - "items": { - "type": "string" - }, - "type": "array" - }, - { - "type": "null" - } - ], - "default": null, - "title": "Stratigraphic Alias" - }, - "table_index": { - "anyOf": [ - { - "items": { - "type": "string" - }, - "type": "array" - }, - { - "type": "null" - } - ], - "default": null, - "description": "Column names in the table which can be used for indexing", - "examples": [ - [ - "ZONE", - "REGION" - ] - ], - "title": "Table Index" - }, - "tagname": { - "anyOf": [ - { - "type": "string" - }, - { - "type": "null" - } - ], - "default": null, - "description": "A semi-human readable tag for internal usage and uniqueness", - "examples": [ - "ds_extract_geogrid", - "ds_post_strucmod" - ], - "title": "Tagname" - }, - "time": { - "anyOf": [ - { - "$ref": "#/$defs/Time" - }, - { - "type": "null" - } - ], - "default": null - }, - "top": { - "anyOf": [ - { - "$ref": "#/$defs/Layer" - }, - { - "type": "null" - } - ], - "default": null - }, - "undef_is_zero": { - "anyOf": [ - { - "type": "boolean" - }, - { - "type": "null" - } - ], - "default": null, - "description": "Flag if undefined values are to be interpreted as zero", - "title": "Undef Is Zero" - }, - "unit": { - "default": "", - "examples": [ - "m" - ], - "title": "Unit", - "type": "string" - }, - "vertical_domain": { - "anyOf": [ - { - "enum": [ - "depth", - "time" - ], - "type": "string" - }, - { - "type": "null" - } - ], - "default": null, - "examples": [ - "depth" - ], - "title": "Vertical Domain" - } - }, - "required": [ - "content", - "format", - "is_observation", - "is_prediction", - "name", - "stratigraphic" - ], - "title": "SubcropContent", - "type": "object" - }, - "SurfaceSpecification": { - "properties": { - "ncol": { - "description": "The number of columns", - "title": "Ncol", - "type": "integer" - }, - "nrow": { - "description": "The number of rows", - "title": "Nrow", - "type": "integer" - }, - "rotation": { - "description": "Rotation angle", - "title": "Rotation", - "type": "number" - }, - "undef": { - "description": "Value representing undefined data", - "title": "Undef", - "type": "number" - }, - "xinc": { - "description": "Increment along the x-axis", - "title": "Xinc", - "type": "number" - }, - "xori": { - "description": "Origin along the x-axis", - "title": "Xori", - "type": "number" - }, - "yflip": { - "allOf": [ - { - "$ref": "#/$defs/AxisOrientation" - } - ], - "description": "Flip along the y-axis, -1 or 1" - }, - "yinc": { - "description": "Increment along the y-axis", - "title": "Yinc", - "type": "number" - }, - "yori": { - "description": "Origin along the y-axis", - "title": "Yori", - "type": "number" - } - }, - "required": [ - "nrow", - "ncol", - "rotation", - "undef", - "xinc", - "yinc", - "xori", - "yflip", - "yori" - ], - "title": "SurfaceSpecification", - "type": "object" - }, - "SystemInformation": { - "properties": { - "fmu-dataio": { - "anyOf": [ - { - "$ref": "#/$defs/VersionInformation" - }, - { - "type": "null" - } - ], - "default": null, - "examples": [ - "1.2.3" - ] - }, - "komodo": { - "anyOf": [ - { - "$ref": "#/$defs/VersionInformation" - }, - { - "type": "null" - } - ], - "default": null, - "examples": [ - "2023.12.05-py38" - ] - }, - "operating_system": { - "anyOf": [ - { - "$ref": "#/$defs/SystemInformationOperatingSystem" - }, - { - "type": "null" - } - ], - "default": null - } - }, - "title": "SystemInformation", - "type": "object" - }, - "SystemInformationOperatingSystem": { - "description": "This model encapsulates various pieces of\nsystem-related information using Python's platform module. It provides a\nstructured way to access details about the system's hardware, operating\nsystem, and interpreter version information.", - "properties": { - "hostname": { - "description": "The network name of the computer, possibly not fully qualified.", - "examples": [ - "Johns-MacBook-Pro.local" - ], - "title": "Hostname", - "type": "string" - }, - "operating_system": { - "description": "A detailed string identifying the underlying platform with as much useful information as possible.", - "examples": [ - "Darwin-18.7.0-x86_64-i386-64bit" - ], - "title": "Platform", - "type": "string" - }, - "release": { - "description": "The system's release version, such as a version number or a name.", - "examples": [ - "18.7.0" - ], - "title": "Release", - "type": "string" - }, - "system": { - "description": "The name of the operating system.", - "examples": [ - "Darwin" - ], - "title": "System", - "type": "string" - }, - "version": { - "description": "The specific release version of the system.", - "examples": [ - "#1 SMP Tue Aug 27 21:37:59 PDT 2019" - ], - "title": "Version", - "type": "string" - } - }, - "required": [ - "hostname", - "operating_system", - "release", - "system", - "version" - ], - "title": "SystemInformationOperatingSystem", - "type": "object" - }, - "TableSpecification": { - "properties": { - "columns": { - "description": "List of columns present in a table.", - "items": { - "type": "string" - }, - "title": "Columns", - "type": "array" - }, - "size": { - "description": "Size of data object.", - "examples": [ - 1, - 9999 - ], - "title": "Size", - "type": "integer" - } - }, - "required": [ - "columns", - "size" - ], - "title": "TableSpecification", - "type": "object" - }, - "ThicknessContent": { - "properties": { - "alias": { - "anyOf": [ - { - "items": { - "type": "string" - }, - "type": "array" - }, - { - "type": "null" - } - ], - "default": null, - "title": "Alias" - }, - "base": { - "anyOf": [ - { - "$ref": "#/$defs/Layer" + "$ref": "#/$defs/SystemInformationOperatingSystem" }, { "type": "null" } ], "default": null - }, - "bbox": { - "anyOf": [ - { - "$ref": "#/$defs/BoundingBox2D" - }, - { - "$ref": "#/$defs/BoundingBox3D" - }, - { - "type": "null" - } - ], - "default": null, - "title": "Bbox" - }, - "content": { - "const": "thickness", - "title": "Content" - }, - "description": { - "anyOf": [ - { - "items": { - "type": "string" - }, - "type": "array" - }, - { - "type": "null" - } - ], - "default": null, - "title": "Description" - }, - "format": { + } + }, + "title": "SystemInformation", + "type": "object" + }, + "SystemInformationOperatingSystem": { + "description": "This model encapsulates various pieces of\nsystem-related information using Python's platform module. It provides a\nstructured way to access details about the system's hardware, operating\nsystem, and interpreter version information.", + "properties": { + "hostname": { + "description": "The network name of the computer, possibly not fully qualified.", "examples": [ - "irap_binary" + "Johns-MacBook-Pro.local" ], - "title": "Format", + "title": "Hostname", "type": "string" }, - "grid_model": { - "anyOf": [ - { - "$ref": "#/$defs/GridModel" - }, - { - "type": "null" - } - ], - "default": null - }, - "is_observation": { - "title": "Is observation flag", - "type": "boolean" - }, - "is_prediction": { - "title": "Is prediction flag", - "type": "boolean" - }, - "layout": { - "anyOf": [ - { - "type": "string" - }, - { - "type": "null" - } - ], - "default": null, - "examples": [ - "regular" - ], - "title": "Layout" - }, - "name": { - "description": "Name of the data object. If stratigraphic, match the entry in the stratigraphic column", + "operating_system": { + "description": "A detailed string identifying the underlying platform with as much useful information as possible.", "examples": [ - "VIKING GP. Top" + "Darwin-18.7.0-x86_64-i386-64bit" ], - "title": "Name", + "title": "Platform", "type": "string" }, - "offset": { - "default": 0.0, - "title": "Offset", - "type": "number" - }, - "spec": { - "anyOf": [ - { - "$ref": "#/$defs/CPGridPropertySpecification" - }, - { - "$ref": "#/$defs/CPGridSpecification" - }, - { - "$ref": "#/$defs/FaultRoomSurfaceSpecification" - }, - { - "$ref": "#/$defs/PointSpecification" - }, - { - "$ref": "#/$defs/CubeSpecification" - }, - { - "$ref": "#/$defs/PolygonsSpecification" - }, - { - "$ref": "#/$defs/SurfaceSpecification" - }, - { - "$ref": "#/$defs/TableSpecification" - }, - { - "$ref": "#/$defs/WellPointsDictionaryCaseSpecification" - }, - { - "type": "null" - } - ], - "default": null, - "title": "Spec" - }, - "stratigraphic": { - "description": "True if data object represents an entity in the stratigraphic column", - "title": "Stratigraphic", - "type": "boolean" - }, - "stratigraphic_alias": { - "anyOf": [ - { - "items": { - "type": "string" - }, - "type": "array" - }, - { - "type": "null" - } - ], - "default": null, - "title": "Stratigraphic Alias" - }, - "table_index": { - "anyOf": [ - { - "items": { - "type": "string" - }, - "type": "array" - }, - { - "type": "null" - } - ], - "default": null, - "description": "Column names in the table which can be used for indexing", - "examples": [ - [ - "ZONE", - "REGION" - ] - ], - "title": "Table Index" - }, - "tagname": { - "anyOf": [ - { - "type": "string" - }, - { - "type": "null" - } - ], - "default": null, - "description": "A semi-human readable tag for internal usage and uniqueness", + "release": { + "description": "The system's release version, such as a version number or a name.", "examples": [ - "ds_extract_geogrid", - "ds_post_strucmod" - ], - "title": "Tagname" - }, - "time": { - "anyOf": [ - { - "$ref": "#/$defs/Time" - }, - { - "type": "null" - } - ], - "default": null - }, - "top": { - "anyOf": [ - { - "$ref": "#/$defs/Layer" - }, - { - "type": "null" - } - ], - "default": null - }, - "undef_is_zero": { - "anyOf": [ - { - "type": "boolean" - }, - { - "type": "null" - } + "18.7.0" ], - "default": null, - "description": "Flag if undefined values are to be interpreted as zero", - "title": "Undef Is Zero" + "title": "Release", + "type": "string" }, - "unit": { - "default": "", + "system": { + "description": "The name of the operating system.", "examples": [ - "m" + "Darwin" ], - "title": "Unit", + "title": "System", "type": "string" }, - "vertical_domain": { - "anyOf": [ - { - "enum": [ - "depth", - "time" - ], - "type": "string" - }, - { - "type": "null" - } - ], - "default": null, + "version": { + "description": "The specific release version of the system.", "examples": [ - "depth" + "#1 SMP Tue Aug 27 21:37:59 PDT 2019" ], - "title": "Vertical Domain" + "title": "Version", + "type": "string" } }, "required": [ - "content", - "format", - "is_observation", - "is_prediction", - "name", - "stratigraphic" + "hostname", + "operating_system", + "release", + "system", + "version" ], - "title": "ThicknessContent", + "title": "SystemInformationOperatingSystem", "type": "object" }, - "Time": { + "TableSpecification": { "properties": { - "t0": { - "anyOf": [ - { - "$ref": "#/$defs/FMUTimeObject" - }, - { - "type": "null" - } - ], - "default": null + "columns": { + "description": "List of columns present in a table.", + "items": { + "type": "string" + }, + "title": "Columns", + "type": "array" }, - "t1": { - "anyOf": [ - { - "$ref": "#/$defs/FMUTimeObject" - }, - { - "type": "null" - } + "size": { + "description": "Size of data object.", + "examples": [ + 1, + 9999 ], - "default": null + "title": "Size", + "type": "integer" } }, - "title": "Time", + "required": [ + "columns", + "size" + ], + "title": "TableSpecification", "type": "object" }, - "TimeContent": { + "ThicknessContent": { "properties": { "alias": { "anyOf": [ @@ -7610,7 +7006,7 @@ "title": "Bbox" }, "content": { - "const": "time", + "const": "thickness", "title": "Content" }, "description": { @@ -7848,10 +7244,38 @@ "name", "stratigraphic" ], - "title": "TimeContent", + "title": "ThicknessContent", "type": "object" }, - "TimeSeriesContent": { + "Time": { + "properties": { + "t0": { + "anyOf": [ + { + "$ref": "#/$defs/FMUTimeObject" + }, + { + "type": "null" + } + ], + "default": null + }, + "t1": { + "anyOf": [ + { + "$ref": "#/$defs/FMUTimeObject" + }, + { + "type": "null" + } + ], + "default": null + } + }, + "title": "Time", + "type": "object" + }, + "TimeContent": { "properties": { "alias": { "anyOf": [ @@ -7895,7 +7319,7 @@ "title": "Bbox" }, "content": { - "const": "timeseries", + "const": "time", "title": "Content" }, "description": { @@ -8133,68 +7557,10 @@ "name", "stratigraphic" ], - "title": "TimeSeriesContent", - "type": "object" - }, - "TracklogEvent": { - "properties": { - "datetime": { - "examples": [ - "2020-10-28T14:28:02" - ], - "format": "date-time", - "title": "Datetime", - "type": "string" - }, - "event": { - "examples": [ - "created", - "updated", - "merged" - ], - "title": "Event", - "type": "string" - }, - "sysinfo": { - "anyOf": [ - { - "$ref": "#/$defs/SystemInformation" - }, - { - "type": "null" - } - ] - }, - "user": { - "$ref": "#/$defs/User" - } - }, - "required": [ - "datetime", - "event", - "user" - ], - "title": "TracklogEvent", - "type": "object" - }, - "User": { - "properties": { - "id": { - "examples": [ - "peesv", - "jlov" - ], - "title": "User ID", - "type": "string" - } - }, - "required": [ - "id" - ], - "title": "User", + "title": "TimeContent", "type": "object" }, - "VelocityContent": { + "TimeSeriesContent": { "properties": { "alias": { "anyOf": [ @@ -8238,7 +7604,7 @@ "title": "Bbox" }, "content": { - "const": "velocity", + "const": "timeseries", "title": "Content" }, "description": { @@ -8476,23 +7842,68 @@ "name", "stratigraphic" ], - "title": "VelocityContent", + "title": "TimeSeriesContent", "type": "object" }, - "VersionInformation": { + "TracklogEvent": { "properties": { - "version": { - "title": "Version", + "datetime": { + "examples": [ + "2020-10-28T14:28:02" + ], + "format": "date-time", + "title": "Datetime", + "type": "string" + }, + "event": { + "examples": [ + "created", + "updated", + "merged" + ], + "title": "Event", "type": "string" + }, + "sysinfo": { + "anyOf": [ + { + "$ref": "#/$defs/SystemInformation" + }, + { + "type": "null" + } + ] + }, + "user": { + "$ref": "#/$defs/User" } }, "required": [ - "version" + "datetime", + "event", + "user" ], - "title": "VersionInformation", + "title": "TracklogEvent", "type": "object" }, - "VolumesContent": { + "User": { + "properties": { + "id": { + "examples": [ + "peesv", + "jlov" + ], + "title": "User ID", + "type": "string" + } + }, + "required": [ + "id" + ], + "title": "User", + "type": "object" + }, + "VelocityContent": { "properties": { "alias": { "anyOf": [ @@ -8536,7 +7947,7 @@ "title": "Bbox" }, "content": { - "const": "volumes", + "const": "velocity", "title": "Content" }, "description": { @@ -8774,10 +8185,23 @@ "name", "stratigraphic" ], - "title": "VolumesContent", + "title": "VelocityContent", "type": "object" }, - "VolumetricsContent": { + "VersionInformation": { + "properties": { + "version": { + "title": "Version", + "type": "string" + } + }, + "required": [ + "version" + ], + "title": "VersionInformation", + "type": "object" + }, + "VolumesContent": { "properties": { "alias": { "anyOf": [ @@ -8821,7 +8245,7 @@ "title": "Bbox" }, "content": { - "const": "volumetrics", + "const": "volumes", "title": "Content" }, "description": { @@ -9059,7 +8483,7 @@ "name", "stratigraphic" ], - "title": "VolumetricsContent", + "title": "VolumesContent", "type": "object" }, "WellPicksContent": { diff --git a/src/fmu/dataio/_definitions.py b/src/fmu/dataio/_definitions.py index 3fb35695d..2e9daa47a 100644 --- a/src/fmu/dataio/_definitions.py +++ b/src/fmu/dataio/_definitions.py @@ -70,7 +70,7 @@ class ValidFormats: STANDARD_TABLE_INDEX_COLUMNS: Final[dict[str, list[str]]] = { - "inplace_volumes": ["ZONE", "REGION", "FACIES", "LICENCE"], + "volumes": ["ZONE", "REGION", "FACIES", "LICENCE"], "rft": ["measured_depth", "well", "time"], "timeseries": ["DATE"], # summary "wellpicks": ["WELL", "HORIZON"], diff --git a/src/fmu/dataio/datastructure/meta/content.py b/src/fmu/dataio/datastructure/meta/content.py index 673e2150f..88ce2cbde 100644 --- a/src/fmu/dataio/datastructure/meta/content.py +++ b/src/fmu/dataio/datastructure/meta/content.py @@ -264,10 +264,6 @@ class FluidContactContent(Content): ) -class InplaceVolumesContent(Content): - content: Literal[enums.ContentEnum.inplace_volumes] - - class KPProductContent(Content): content: Literal[enums.ContentEnum.khproduct] @@ -339,10 +335,6 @@ class VolumesContent(Content): content: Literal[enums.ContentEnum.volumes] -class VolumetricsContent(Content): - content: Literal[enums.ContentEnum.volumetrics] - - class WellPicksContent(Content): content: Literal[enums.ContentEnum.wellpicks] @@ -356,7 +348,6 @@ class AnyContent(RootModel): FieldOutlineContent, FieldRegionContent, FluidContactContent, - InplaceVolumesContent, KPProductContent, LiftCurvesContent, ParametersContent, @@ -374,7 +365,6 @@ class AnyContent(RootModel): TimeSeriesContent, VelocityContent, VolumesContent, - VolumetricsContent, WellPicksContent, ], Field(discriminator="content"), diff --git a/src/fmu/dataio/datastructure/meta/enums.py b/src/fmu/dataio/datastructure/meta/enums.py index 522fcde9e..a32d96036 100644 --- a/src/fmu/dataio/datastructure/meta/enums.py +++ b/src/fmu/dataio/datastructure/meta/enums.py @@ -11,7 +11,6 @@ class ContentEnum(str, Enum): field_outline = "field_outline" field_region = "field_region" fluid_contact = "fluid_contact" - inplace_volumes = "inplace_volumes" khproduct = "khproduct" lift_curves = "lift_curves" parameters = "parameters" @@ -29,7 +28,6 @@ class ContentEnum(str, Enum): transmissibilities = "transmissibilities" velocity = "velocity" volumes = "volumes" - volumetrics = "volumetrics" wellpicks = "wellpicks"