Skip to content

Commit e40fe11

Browse files
committed
SOF-7123: set default Hubbard V second site to second element if present
1 parent 0cb9fe0 commit e40fe11

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

src/context/providers/HubbardVContextProvider.js

+14-5
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,20 @@ export class HubbardVContextProvider extends HubbardUContextProvider {
1515
return [
1616
{
1717
...defaultHubbardConfig,
18-
atomicSpecies: this.uniqueElements?.length > 0 ? this.uniqueElements[0] : "",
19-
atomicSpecies2: this.uniqueElements?.length > 0 ? this.uniqueElements[0] : "",
18+
atomicSpecies: this.firstSpecies,
19+
atomicSpecies2: this.secondSpecies,
2020
},
2121
];
2222
}
2323

24+
get firstSpecies() {
25+
return this.uniqueElements?.length > 0 ? this.uniqueElements[0] : "";
26+
}
27+
28+
get secondSpecies() {
29+
return this.uniqueElements?.length > 1 ? this.uniqueElements[1] : this.firstSpecies;
30+
}
31+
2432
get uiSchemaStyled() {
2533
return {
2634
"ui:options": {
@@ -56,7 +64,7 @@ export class HubbardVContextProvider extends HubbardUContextProvider {
5664
type: "string",
5765
title: "Species 1",
5866
enum: this.uniqueElements,
59-
default: this.uniqueElements?.length > 0 ? this.uniqueElements[0] : "",
67+
default: this.firstSpecies,
6068
},
6169
atomicOrbital: {
6270
type: "string",
@@ -87,7 +95,7 @@ export class HubbardVContextProvider extends HubbardUContextProvider {
8795
type: "string",
8896
title: "Species 2",
8997
enum: this.uniqueElements,
90-
default: this.uniqueElements?.length > 0 ? this.uniqueElements[0] : "",
98+
default: this.secondSpecies,
9199
},
92100
atomicOrbital2: {
93101
type: "string",
@@ -122,7 +130,8 @@ export class HubbardVContextProvider extends HubbardUContextProvider {
122130
siteIndex2: {
123131
type: "integer",
124132
title: "Site no 2",
125-
default: defaultHubbardConfig.siteIndex,
133+
default:
134+
this.uniqueElements?.length > 1 ? 2 : defaultHubbardConfig.siteIndex2,
126135
},
127136
hubbardVValue: {
128137
type: "number",

0 commit comments

Comments
 (0)