Proper dataset definitions

Author: franzpoeschel

share/openPMD/json_schema/dataset_defs.toml

@@ -0,0 +1,67 @@
+["$defs"]
+
+######################################
+# n-dimensional datasets of any type #
+######################################
+
+[["$defs".any_type_recursive_array.anyOf]]
+type = "array"
+items.type = "number"
+
+[["$defs".any_type_recursive_array.anyOf]]
+type = "array"
+items."$ref" = "#/$defs/any_type_recursive_array"
+
+["$defs".any_type_dataset.properties]
+
+datatype.enum = [
+    "CHAR",
+    "UCHAR",
+    "SCHAR",
+    "SHORT",
+    "INT",
+    "LONG",
+    "LONGLONG",
+    "USHORT",
+    "UINT",
+    "ULONG",
+    "ULONGLONG",
+    "FLOAT",
+    "DOUBLE",
+    "LONG_DOUBLE",
+    "CFLOAT",
+    "CDOUBLE",
+    "CLONG_DOUBLE",
+    "BOOL",
+]
+data."$ref" = "#/$defs/any_type_recursive_array"
+
+######################################
+# n-dimensional datasets of int type #
+######################################
+
+[["$defs".int_type_recursive_array.intOf]]
+type = "array"
+items.type = "integer"
+
+[["$defs".int_type_recursive_array.intOf]]
+type = "array"
+items."$ref" = "#/$defs/int_type_recursive_array"
+
+["$defs".int_type_dataset.properties]
+
+datatype.enum = [
+    "CHAR",
+    "UCHAR",
+    "SCHAR",
+    "SHORT",
+    "INT",
+    "LONG",
+    "LONGLONG",
+    "USHORT",
+    "UINT",
+    "ULONG",
+    "ULONGLONG",
+    "BOOL",
+]
+data."$ref" = "#/$defs/int_type_recursive_array"

share/openPMD/json_schema/particle_patches.toml

@@ -19,17 +19,19 @@ description = "Custom attributes allowed, no required attributes defined."
 [properties.numParticles]
 title = "numParticles"
 description = "number of particles in this patch"
-
-# todo: INT type dataset
-"$ref" = "record_component.json"
+allOf = [
+    { "$ref" = "record_component.json" },
+    { "$ref" = "dataset_defs.json#/$defs/int_type_dataset" },
+]
 
 
 [properties.numParticlesOffset]
 title = "numParticles"
 description = "offset within the one-dimensional records of the particle species where the first particle in this patch is stored"
-
-# todo: INT type dataset
-"$ref" = "record_component.json"
+allOf = [
+    { "$ref" = "record_component.json" },
+    { "$ref" = "dataset_defs.json#/$defs/int_type_dataset" },
+]
 
 
 [properties.offset]

share/openPMD/json_schema/record_component.toml

@@ -47,30 +47,7 @@ required = ["data", "datatype"]
 description = "An n-dimensional dataset containing the payload."
 title = "Array dataset"
 
-[allOf.oneOf.properties]
-
-datatype.enum = [
-    "CHAR",
-    "UCHAR",
-    "SCHAR",
-    "SHORT",
-    "INT",
-    "LONG",
-    "LONGLONG",
-    "USHORT",
-    "UINT",
-    "ULONG",
-    "ULONGLONG",
-    "FLOAT",
-    "DOUBLE",
-    "LONG_DOUBLE",
-    "CFLOAT",
-    "CDOUBLE",
-    "CLONG_DOUBLE",
-    "BOOL",
-]
-# TODO: properly define this
-data.type = "array"
+"$ref" = "dataset_defs.json#/$defs/any_type_dataset"
 
 ########################
 # Option 2.2: Constant #