Skip to content

Commit 97ae6d5

Browse files
committed
SOF-7123: include orbital list as a data member and inherit elsewhere
1 parent c96004e commit 97ae6d5

File tree

3 files changed

+24
-80
lines changed

3 files changed

+24
-80
lines changed

src/context/providers/HubbardJContextProvider.js

+1-20
Original file line numberDiff line numberDiff line change
@@ -60,26 +60,7 @@ export class HubbardJContextProvider extends HubbardUContextProvider {
6060
atomicOrbital: {
6161
type: "string",
6262
title: "Orbital",
63-
enum: [
64-
"2p",
65-
"3s",
66-
"3p",
67-
"3d",
68-
"4s",
69-
"4p",
70-
"4d",
71-
"4f",
72-
"5s",
73-
"5p",
74-
"5d",
75-
"5f",
76-
"6s",
77-
"6p",
78-
"6d",
79-
"7s",
80-
"7p",
81-
"7d",
82-
],
63+
enum: this.orbitalList,
8364
default: defaultHubbardConfig.atomicOrbital,
8465
},
8566
value: {

src/context/providers/HubbardUContextProvider.js

+21-20
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,26 @@ export class HubbardUContextProvider extends mix(JSONSchemaFormDataProvider).wit
1616
constructor(config) {
1717
super(config);
1818
this.uniqueElements = this.material?.Basis?.uniqueElements || [];
19+
this.orbitalList = [
20+
"2p",
21+
"3s",
22+
"3p",
23+
"3d",
24+
"4s",
25+
"4p",
26+
"4d",
27+
"4f",
28+
"5s",
29+
"5p",
30+
"5d",
31+
"5f",
32+
"6s",
33+
"6p",
34+
"6d",
35+
"7s",
36+
"7p",
37+
"7d",
38+
];
1939
}
2040

2141
get defaultData() {
@@ -63,26 +83,7 @@ export class HubbardUContextProvider extends mix(JSONSchemaFormDataProvider).wit
6383
atomicOrbital: {
6484
type: "string",
6585
title: "Atomic orbital",
66-
enum: [
67-
"2p",
68-
"3s",
69-
"3p",
70-
"3d",
71-
"4s",
72-
"4p",
73-
"4d",
74-
"4f",
75-
"5s",
76-
"5p",
77-
"5d",
78-
"5f",
79-
"6s",
80-
"6p",
81-
"6d",
82-
"7s",
83-
"7p",
84-
"7d",
85-
],
86+
enum: this.orbitalList,
8687
default: defaultHubbardConfig.atomicOrbital,
8788
},
8889
hubbardUValue: {

src/context/providers/HubbardVContextProvider.js

+2-40
Original file line numberDiff line numberDiff line change
@@ -75,26 +75,7 @@ export class HubbardVContextProvider extends HubbardUContextProvider {
7575
atomicOrbital: {
7676
type: "string",
7777
title: "Orbital 1",
78-
enum: [
79-
"2p",
80-
"3s",
81-
"3p",
82-
"3d",
83-
"4s",
84-
"4p",
85-
"4d",
86-
"4f",
87-
"5s",
88-
"5p",
89-
"5d",
90-
"5f",
91-
"6s",
92-
"6p",
93-
"6d",
94-
"7s",
95-
"7p",
96-
"7d",
97-
],
78+
enum: this.orbitalList,
9879
default: defaultHubbardConfig.atomicOrbital,
9980
},
10081
atomicSpecies2: {
@@ -112,26 +93,7 @@ export class HubbardVContextProvider extends HubbardUContextProvider {
11293
atomicOrbital2: {
11394
type: "string",
11495
title: "Orbital 2",
115-
enum: [
116-
"2p",
117-
"3s",
118-
"3p",
119-
"3d",
120-
"4s",
121-
"4p",
122-
"4d",
123-
"4f",
124-
"5s",
125-
"5p",
126-
"5d",
127-
"5f",
128-
"6s",
129-
"6p",
130-
"6d",
131-
"7s",
132-
"7p",
133-
"7d",
134-
],
96+
enum: this.orbitalList,
13597
default: defaultHubbardConfig.atomicOrbital,
13698
},
13799
hubbardVValue: {

0 commit comments

Comments
 (0)