SOF-7136: reuse hubbard_v as hubbard_v_nn

keep the datastructures same, remove properties in difference set from being required
Exabyte-io · Dec 23, 2023 · 5503b9b · 5503b9b
1 parent 0baa0e8
commit 5503b9b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 30 deletions.
diff --git a/schema/properties_directory/non-scalar/hubbard_v.json b/schema/properties_directory/non-scalar/hubbard_v.json
@@ -5,7 +5,7 @@
     "description": "Hubbard V values corresponding to atomic pairs",
     "properties": {
         "name": {
-            "enum": ["hubbard_v"]
+            "enum": ["hubbard_v", "hubbard_v_nn"]
         },
         "units": {
             "enum": ["eV"]
@@ -24,7 +24,6 @@
                     "id2",
                     "atomicSpecies",
                     "atomicSpecies2",
-                    "distance",
                     "value"
                 ]
             }

diff --git a/schema/properties_directory/non-scalar/hubbard_v_nn.json b/schema/properties_directory/non-scalar/hubbard_v_nn.json
@@ -3,33 +3,9 @@
     "$schema": "http://json-schema.org/draft-04/schema#",
     "title": "Hubbard V parameters for nearest neighbors",
     "description": "Hubbard V value in eV for nearest neighbors used in hp.x output parsing",
-    "properties": {
-        "name": {
-            "enum": ["hubbard_v_nn"]
-        },
-        "units": {
-            "enum": ["eV"]
-        },
-        "values": {
-            "type": "array",
-            "items": {
-                "type": "object",
-                "allOf": [
-                    {
-                        "$ref": "../../core/reusable/atomic_data_per_orbital_pair_numeric.json"
-                    }
-                ],
-                "required": [
-                    "id",
-                    "id2",
-                    "atomicSpecies",
-                    "atomicSpecies2",
-                    "orbitalName",
-                    "orbitalName2",
-                    "value"
-                ]
-            }
+    "allOf": [
+        {
+            "$ref": "hubbard_v.json"
         }
-    },
-    "required": ["name"]
+    ]
 }