Merge remote-tracking branch 'origin/main' into feat/SOF-7173

Exabyte-io · Jan 3, 2024 · 51f8e64 · 51f8e64
2 parents 4e7d07c + ddcd767
commit 51f8e64
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 8 deletions.
diff --git a/src/classmap.js b/src/classmap.js
@@ -8,6 +8,8 @@ import { ChargeDensityProfileProperty } from "./include/non-scalar/charge_densit
 import { DensityOfStatesProperty } from "./include/non-scalar/density_of_states";
 import { DielectricTensorProperty } from "./include/non-scalar/dielectric_tensor";
 import { HubbardUProperty } from "./include/non-scalar/hubbard_u";
+import { HubbardVProperty } from "./include/non-scalar/hubbard_v";
+import { HubbardVNNProperty } from "./include/non-scalar/hubbard_v_nn";
 import { PhononDispersionsProperty } from "./include/non-scalar/phonon_dispersions";
 import { PhononDOSProperty } from "./include/non-scalar/phonon_dos";
 import { PotentialProfileProperty } from "./include/non-scalar/potential_profile";
@@ -57,7 +59,9 @@ export const PROPERTY_CLASS_MAP = {
     [PROPERTIES.pseudopotential]: Pseudopotential,
     [PROPERTIES.boundary_conditions]: null,
     [PROPERTIES.dielectric_tensor]: DielectricTensorProperty,
-    [PROPERTIES.hubbard_u]: HubbardUProperty
+    [PROPERTIES.hubbard_u]: HubbardUProperty,
+    [PROPERTIES.hubbard_v_nn]: HubbardVNNProperty,
+    [PROPERTIES.hubbard_v]: HubbardVProperty,
 };
 
 export const PROPERTY_BRANCH_MAP = {

diff --git a/src/include/non-scalar/hubbard_u.js b/src/include/non-scalar/hubbard_u.js
@@ -1,7 +1 @@
-import { Property } from "../../property";
-
-export class HubbardUProperty extends Property {
-    get values() {
-        return this.prop("values");
-    }
-}
+export { PropertyWithValues as HubbardUProperty } from "../../propery_with_values";
diff --git a/src/include/non-scalar/hubbard_v.js b/src/include/non-scalar/hubbard_v.js
@@ -0,0 +1 @@
+export { PropertyWithValues as HubbardVProperty } from "../../propery_with_values";
diff --git a/src/include/non-scalar/hubbard_v_nn.js b/src/include/non-scalar/hubbard_v_nn.js
@@ -0,0 +1 @@
+export { PropertyWithValues as HubbardVNNProperty } from "../../propery_with_values";
diff --git a/src/propery_with_values.js b/src/propery_with_values.js
@@ -0,0 +1,7 @@
+import { Property } from "./property";
+
+export class PropertyWithValues extends Property {
+    get values() {
+        return this.prop("values");
+    }
+}
diff --git a/src/settings.js b/src/settings.js
@@ -54,4 +54,6 @@ export const PROPERTIES = {
     boundary_conditions: "boundary_conditions",
     dielectric_tensor: "dielectric_tensor",
     hubbard_u: "hubbard_u",
+    hubbard_v_nn: "hubbard_v_nn",
+    hubbard_v: "hubbard_v",
 };
diff --git a/src/tree.js b/src/tree.js
@@ -138,4 +138,10 @@ export default {
     [PROPERTIES.hubbard_u]: {
         type: PROPERTY_TYPES.non_scalar,
     },
+    [PROPERTIES.hubbard_v_nn]: {
+        type: PROPERTY_TYPES.non_scalar,
+    },
+    [PROPERTIES.hubbard_v]: {
+        type: PROPERTY_TYPES.non_scalar,
+    },
 };