Merge branch 'dev' into feat/SOF-6892

Exabyte-io · Dec 8, 2023 · d837293 · d837293
2 parents 1f8d90f + 7a255b5
commit d837293
Show file tree

Hide file tree

Showing 7 changed files with 65 additions and 33 deletions.
diff --git a/schema/core/primitive/array_of_3_numbers.json b/schema/core/primitive/array_of_3_numbers.json
@@ -2,12 +2,10 @@
     "$id": "core/primitive/array-of-3-numbers",
     "$schema": "http://json-schema.org/draft-04/schema#",
     "title": "array of 3 number elements schema",
-    "allOf": [
-        {
-            "$ref": "array_of_numbers.json"
-        }
-    ],
     "type": "array",
+    "items": {
+        "type": "number"
+    },
     "minItems": 3,
     "maxItems": 3
 }
diff --git a/schema/core/primitive/array_of_numbers.json b/schema/core/primitive/array_of_numbers.json
diff --git a/schema/methods_directory/physical/psp/file_data_item.json b/schema/methods_directory/physical/psp/file_data_item.json
@@ -54,7 +54,10 @@
         },
         "apps": {
             "type": "array",
-            "description": "simulation engines that can use this pseudopotential"
+            "description": "The names of the simulation engines that can use this pseudopotential, e.g. espresso",
+            "items": {
+                "type": "string"
+            }
         },
         "filename": {
             "type": "string",

diff --git a/schema/properties_directory/structural/lattice/lattice_bravais.json b/schema/properties_directory/structural/lattice/lattice_bravais.json
@@ -10,23 +10,7 @@
     "properties": {
         "type": {
             "description": "Bravais lattice type in short notation",
-            "type": "string",
-            "enum": [
-                "CUB",
-                "BCC",
-                "FCC",
-                "TET",
-                "MCL",
-                "ORC",
-                "ORCC",
-                "ORCF",
-                "ORCI",
-                "HEX",
-                "BCT",
-                "TRI",
-                "MCLC",
-                "RHL"
-            ]
+            "$ref": "type_enum.json"
         },
         "units": {
             "type": "object",

diff --git a/schema/properties_directory/structural/lattice/type_enum.json b/schema/properties_directory/structural/lattice/type_enum.json
@@ -0,0 +1,23 @@
+{
+    "$id": "properties-directory/structural/lattice/type-enum",
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "title": "lattice type schema",
+
+    "type": "string",
+    "enum": [
+        "CUB",
+        "BCC",
+        "FCC",
+        "TET",
+        "MCL",
+        "ORC",
+        "ORCC",
+        "ORCF",
+        "ORCI",
+        "HEX",
+        "BCT",
+        "TRI",
+        "MCLC",
+        "RHL"
+    ]
+}
diff --git a/schema/properties_directory/structural/lattice/type_extended_enum.json b/schema/properties_directory/structural/lattice/type_extended_enum.json
@@ -0,0 +1,32 @@
+{
+    "$id": "properties-directory/structural/lattice/type-extended-enum",
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "title": "lattice type extended schema",
+    "type": "string",
+    "enum": [
+        "BCC",
+        "BCT-1",
+        "BCT-2",
+        "CUB",
+        "FCC",
+        "HEX",
+        "MCL",
+        "MCLC-1",
+        "MCLC-2",
+        "MCLC-3",
+        "MCLC-4",
+        "MCLC-5",
+        "ORC",
+        "ORCC",
+        "ORCF-1",
+        "ORCF-2",
+        "ORCF-3",
+        "ORCI",
+        "RHL-1",
+        "RHL-2",
+        "TET",
+        "TRI_1a",
+        "TRI_2a",
+        "TRI_1b"
+    ]
+}
diff --git a/schema/system/consistency_check.json b/schema/system/consistency_check.json
@@ -12,7 +12,8 @@
         "name": {
             "enum": [
                 "default",
-                "atomsTooClose"
+                "atomsTooClose",
+                "atomsOverlap"
             ],
             "description": "Name of the consistency check that is performed, which is listed in an enum."
         },