Skip to content

Commit 73d14fb

Browse files
Merge pull request #44 from Exabyte-io/fix/SOF-7001
fix: use math.floor explicitly
2 parents 604618d + c59f1a2 commit 73d14fb

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

src/subworkflows/convergence.js

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import merge from "lodash/merge";
2+
13
import { UNIT_TAGS, UNIT_TYPES } from "../enums";
24
import { createConvergenceParameter } from "./convergence/factory";
35

@@ -65,7 +67,15 @@ export const ConvergenceMixin = (superclass) =>
6567

6668
// Replace kgrid to be ready for convergence
6769
// TODO: kgrid should be abstracted and selected by user
68-
unitForConvergence.updateContext(param.unitContext);
70+
const providers = unitForConvergence.importantSettingsProviders;
71+
const gridProvider = providers.find((p) => p.name === "kgrid" || p.name === "qgrid");
72+
let mergedContext = param.unitContext;
73+
if (gridProvider) {
74+
mergedContext = merge(gridProvider.yieldData(), param.unitContext);
75+
gridProvider.setData(mergedContext);
76+
gridProvider.setIsEdited(true);
77+
}
78+
unitForConvergence.updateContext(mergedContext);
6979

7080
const prevResult = "prev_result";
7181
const iteration = "iteration";

src/subworkflows/convergence/non_uniform_kgrid.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { ConvergenceParameter } from "./parameter";
22

33
export class NonUniformKGridConvergence extends ConvergenceParameter {
44
get increment() {
5-
return `[${this.initialValue}[i] + floor(iteration * ${this._increment} * float(context['kgrid']['reciprocalVectorRatios'][i])) for i in range(3)]`;
5+
return `[${this.initialValue}[i] + math.floor(iteration * ${this._increment} * float(context['kgrid']['reciprocalVectorRatios'][i])) for i in range(3)]`;
66
}
77

88
get unitContext() {

0 commit comments

Comments
 (0)