Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions dist/js/subworkflows/convergence/enums.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
"use strict";

Object.defineProperty(exports, "__esModule", {
value: true
});
exports.ConvergenceParameterName = void 0;
var _schemas = _interopRequireDefault(require("@mat3ra/esse/dist/js/schemas.json"));
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
const convergenceEnumOptionsSchema = _schemas.default.find(schema => schema.$id === "workflow/subworkflow/convergence/enum-options");
const values = convergenceEnumOptionsSchema?.definitions?.ConvergenceParameterNameEnum?.enum || [];
const ConvergenceParameterName = exports.ConvergenceParameterName = Object.freeze({
N_k: values[0] || "N_k",
N_k_nonuniform: values[1] || "N_k_nonuniform",
N_k_nonuniform_2D: values[2] || "N_k_nonuniform_2D"
});
5 changes: 3 additions & 2 deletions dist/js/subworkflows/convergence/factory.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
value: true
});
exports.createConvergenceParameter = createConvergenceParameter;
var _enums = require("./enums");
var _non_uniform_kgrid = require("./non_uniform_kgrid");
var _parameter = require("./parameter");
var _uniform_kgrid = require("./uniform_kgrid");
Expand All @@ -13,13 +14,13 @@ function createConvergenceParameter({
increment
}) {
switch (name) {
case "N_k":
case _enums.ConvergenceParameterName.N_k:
return new _uniform_kgrid.UniformKGridConvergence({
name,
initialValue,
increment
});
case "N_k_nonuniform":
case _enums.ConvergenceParameterName.N_k_nonuniform:
return new _non_uniform_kgrid.NonUniformKGridConvergence({
name,
initialValue,
Expand Down
3 changes: 2 additions & 1 deletion dist/js/subworkflows/subworkflow.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ var _enums = require("../enums");
var _units = require("../units");
var _utils2 = require("../utils");
var _convergence = require("./convergence");
var _enums2 = require("./convergence/enums");
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
Expand Down Expand Up @@ -231,7 +232,7 @@ class Subworkflow extends BaseSubworkflow {

// eslint-disable-next-line class-methods-use-this
get scopeVariables() {
return ["N_k", "N_k_nonuniform"];
return [_enums2.ConvergenceParameterName.N_k, _enums2.ConvergenceParameterName.N_k_nonuniform];
}

// eslint-disable-next-line class-methods-use-this
Expand Down
744 changes: 380 additions & 364 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"@mat3ra/mode": "2026.3.4-0",
"@mat3ra/utils": "2025.9.20-0",
"@mat3ra/code": "2025.10.24-0",
"@mat3ra/esse": "2025.11.26-0",
"@mat3ra/esse": "2026.4.4-0",
"@mat3ra/made": "2025.7.15-0",
"@mat3ra/standata": "2026.1.12-0",
"chai": "^4.3.4",
Expand Down
12 changes: 12 additions & 0 deletions src/js/subworkflows/convergence/enums.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import schemas from "@mat3ra/esse/dist/js/schemas.json";

const convergenceEnumOptionsSchema = schemas.find(
(schema) => schema.$id === "workflow/subworkflow/convergence/enum-options",
);
const values = convergenceEnumOptionsSchema?.definitions?.ConvergenceParameterNameEnum?.enum || [];

export const ConvergenceParameterName = Object.freeze({
N_k: values[0] || "N_k",
N_k_nonuniform: values[1] || "N_k_nonuniform",
N_k_nonuniform_2D: values[2] || "N_k_nonuniform_2D",
});
5 changes: 3 additions & 2 deletions src/js/subworkflows/convergence/factory.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import { ConvergenceParameterName } from "./enums";
import { NonUniformKGridConvergence } from "./non_uniform_kgrid";
import { ConvergenceParameter } from "./parameter";
import { UniformKGridConvergence } from "./uniform_kgrid";

export function createConvergenceParameter({ name, initialValue, increment }) {
switch (name) {
case "N_k":
case ConvergenceParameterName.N_k:
return new UniformKGridConvergence({ name, initialValue, increment });
case "N_k_nonuniform":
case ConvergenceParameterName.N_k_nonuniform:
return new NonUniformKGridConvergence({ name, initialValue, increment });
default:
return new ConvergenceParameter({ name, initialValue, increment });
Expand Down
3 changes: 2 additions & 1 deletion src/js/subworkflows/subworkflow.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { UNIT_TYPES } from "../enums";
import { UnitFactory } from "../units";
import { setNextLinks, setUnitsHead } from "../utils";
import { ConvergenceMixin } from "./convergence";
import { ConvergenceParameterName } from "./convergence/enums";

/* eslint max-classes-per-file:0 */
class BaseSubworkflow extends mix(NamedDefaultableRepetitionImportantSettingsInMemoryEntity).with(
Expand Down Expand Up @@ -285,7 +286,7 @@ export class Subworkflow extends BaseSubworkflow {

// eslint-disable-next-line class-methods-use-this
get scopeVariables() {
return ["N_k", "N_k_nonuniform"];
return [ConvergenceParameterName.N_k, ConvergenceParameterName.N_k_nonuniform];
}

// eslint-disable-next-line class-methods-use-this
Expand Down
Loading