- Calibration : pose une Probe (sonde) sur la
- ligne à mesurer, coche Fixed sur sa cible, puis décoche Fixed sur le facteur
- (Z_UA) ici. La valeur résolue s’affiche ci-dessous après simulation.
+ Modelica : Probe Fixed → équation (
+ Tsat = …). Facteur Free → inconnue (
+ parameter z_ua(fixed=false)). Le start est la valeur affichée.
- Tu n’as pas besoin du nœud « Regulation loop » pour ça.
+ Laisse UA override vide. n_eq doit égaler n_unk.
{solvedVars.length > 0 && (
-
+
)}
)}
diff --git a/apps/web/src/lib/componentMeta.ts b/apps/web/src/lib/componentMeta.ts
index abe05eb..fa61c28 100644
--- a/apps/web/src/lib/componentMeta.ts
+++ b/apps/web/src/lib/componentMeta.ts
@@ -28,24 +28,24 @@ export interface ParamMeta {
options?: Array<{ value: string | number; label: string }>;
advanced?: boolean;
/**
- * Dymola/EES-style Fixed checkbox.
- * Fixed ON = value imposed (parameter or measured target).
- * Fixed OFF = free for the solver (calibration tuner / free unknown).
+ * Modelica `fixed` attribute (Dymola-style checkbox).
+ * Fixed ON = `parameter` / binding equation (known).
+ * Fixed OFF = unknown — needs another equation to keep the model balanced.
*/
fixable?: boolean;
/** Default for the Fixed checkbox when `fixable` (true = Fixed). */
defaultFixed?: boolean;
/**
- * When Fixed ON: use this param value as a control setpoint for the named
- * measure output (e.g. `saturationTemperature`, `superheat`).
+ * When Fixed ON on a Probe: adds equation `output = value`
+ * (e.g. Tsat = 5 °C). Internal wire name for the solver output.
*/
measureOutput?: string;
/**
- * When Fixed OFF: free this actuator/calibration factor (e.g. `z_ua`).
- * Requires a Fixed measure on the same component to stay DoF-balanced.
+ * When Fixed OFF: this factor becomes a Newton unknown (Modelica
+ * `parameter ...(fixed=false)`). Pair with a Fixed Probe equation.
*/
actuatorFactor?: string;
- /** Bounds used when the factor is free (actuator min/max). */
+ /** Bounds / start guess when the factor is an unknown. */
freeMin?: number;
freeMax?: number;
/**
@@ -220,41 +220,20 @@ export const COMPONENTS: ComponentMeta[] = [
label: "Probe (sonde)",
category: "Instrumentation",
description:
- "Sonde de mesure posée sur une ligne. Lit P/T/SH/SC/SST/SDT/DGT/DSH/capacité/ṁ/h à cet endroit. Toute calibration impose sa cible sur un Probe.",
+ "Sonde sur une ligne : fige T, Tsat, P, X ou Tsh (= T−Tsat, SC négatif) pour calibrer.",
help:
"Sonde de calibration (Probe)\n" +
- "Toute calibration se fait via un Probe posé sur une ligne (règle dure).\n\n" +
- "1. Glisse le Probe sur un fil du schéma (comme pour insérer un Pipe).\n" +
- "2. Choisis la grandeur mesurée (SST, SDT, DGT, DSH, SH, SC, T, P, débit, capacité, enthalpie) et le fluide.\n" +
- "3. Coche Fixed sur « Cible » et tape la valeur mesurée.\n" +
- "4. Libère le Z-factor correspondant (Z_UA, Z_dP, Z_flow…) sur le composant à calibrer.\n" +
- "Le solveur appaire automatiquement le Probe (mesure) et le Z-factor libre (inconnue).",
+ "1. Glisse le Probe sur un fil.\n" +
+ "2. Coche Fixed sur les grandeurs physiques mesurées (T, Tsat, P, X, Tsh).\n" +
+ "3. Libère le facteur correspondant sur le composant :\n" +
+ " • Tsat / Tsh → z_ua (HX) ou opening (EXV)\n" +
+ " • T (DGT refoulement) → f_w (rétention énergie carter)\n" +
+ " • Capacity → z_flow (capacité machine)\n" +
+ " • P → z_dp\n" +
+ "Tsh = T − Tsat (surchauffe > 0, sous-refroidissement < 0).",
ports: ["inlet", "outlet"],
color: "#0ea5e9",
params: [
- {
- key: "measure",
- label: "Grandeur mesurée",
- kind: "string",
- default: "SH",
- required: true,
- section: "Mesure",
- description:
- "Grandeur physique mesurée à l'emplacement du Probe. SST/SDT = Tsat(P), SH/DSH = T−Tsat(P), SC = Tsat(P)−T.",
- options: [
- { value: "SST", label: "SST (Tsat aspiration)" },
- { value: "SDT", label: "SDT (Tsat refoulement)" },
- { value: "DGT", label: "DGT (T° gaz refoulement)" },
- { value: "DSH", label: "DSH (surch. refoulement)" },
- { value: "SH", label: "SH (surchauffe)" },
- { value: "SC", label: "SC (sous-refroid.)" },
- { value: "T", label: "T (température)" },
- { value: "P", label: "P (pression)" },
- { value: "MassFlow", label: "Débit massique" },
- { value: "Capacity", label: "Capacité (kW)" },
- { value: "Enthalpy", label: "Enthalpie" },
- ],
- },
{
key: "fluid",
label: "Fluide",
@@ -262,22 +241,81 @@ export const COMPONENTS: ComponentMeta[] = [
default: "R134a",
required: true,
section: "Mesure",
- description: "Fluide frigorigène pour le calcul de Tsat/SH/SC (via CoolProp).",
+ description: "Fluide pour Tsat / Tsh / X (CoolProp).",
},
{
- key: "target",
- label: "Cible (Fixed = impose)",
+ key: "t_c",
+ label: "T (température)",
kind: "number",
- section: "Calibration",
+ unit: "°C",
+ default: 50,
+ section: "Paramètres physiques",
fixable: true,
defaultFixed: false,
- // Auto: resolved from `measure` at config-build time
- // (SST/SDT → saturationTemperature, SH/DSH → superheat, SC → subcooling,
- // DGT/T → temperature, P → pressure, MassFlow → massFlowRate,
- // Capacity → capacity, Enthalpy → heatTransferRate as carrier).
- measureOutput: "auto",
+ measureOutput: "temperature",
+ description: "Température de ligne. Sur refoulement = DGT → pairer avec f_w.",
+ },
+ {
+ key: "tsat_c",
+ label: "Tsat",
+ kind: "number",
+ unit: "°C",
+ default: 5,
+ section: "Paramètres physiques",
+ fixable: true,
+ defaultFixed: false,
+ measureOutput: "saturationTemperature",
+ description: "Tsat(P) à la sonde. Aspiration = SST, liquide = SDT → z_ua.",
+ },
+ {
+ key: "p_bar",
+ label: "P",
+ kind: "number",
+ unit: "bar",
+ default: 5,
+ section: "Paramètres physiques",
+ fixable: true,
+ defaultFixed: false,
+ measureOutput: "pressure",
+ description: "Pression absolue → pairer avec z_dp.",
+ },
+ {
+ key: "x",
+ label: "X (titre)",
+ kind: "number",
+ default: 1,
+ min: 0,
+ max: 1,
+ section: "Paramètres physiques",
+ fixable: true,
+ defaultFixed: false,
+ measureOutput: "quality",
+ description: "Titre vapeur [0–1]. Usage avancé.",
+ },
+ {
+ key: "tsh_k",
+ label: "Tsh (= T − Tsat)",
+ kind: "number",
+ unit: "K",
+ default: 5,
+ section: "Paramètres physiques",
+ fixable: true,
+ defaultFixed: false,
+ measureOutput: "superheat",
description:
- "Coche Fixed et tape la valeur mesurée (K pour températures, K pour SH/SC, Pa pour P, kg/s pour débit, W pour capacité, J/kg pour h).",
+ "Écart à la saturation : >0 surchauffe, <0 sous-refroidissement. Remplace SH/SC sur l’échangeur.",
+ },
+ {
+ key: "capacity_w",
+ label: "Capacité",
+ kind: "number",
+ unit: "W",
+ default: 10000,
+ section: "Paramètres physiques",
+ fixable: true,
+ defaultFixed: false,
+ measureOutput: "capacity",
+ description: "Capacité (bilan secondaire). Pairer avec z_flow du compresseur.",
},
],
},
@@ -475,6 +513,36 @@ export const COMPONENTS: ComponentMeta[] = [
default: 5.0,
section: "Init / design",
},
+ {
+ key: "z_flow",
+ label: "z_flow (capacité)",
+ kind: "number",
+ default: 1.0,
+ section: "Calibration",
+ fixable: true,
+ defaultFixed: true,
+ actuatorFactor: "z_flow",
+ freeMin: 0.5,
+ freeMax: 2.0,
+ description:
+ "Multiplicateur de débit / capacité machine. Fixed OFF + Probe Capacity Fixed.",
+ },
+ {
+ key: "f_w",
+ label: "f_w (rétention énergie)",
+ kind: "number",
+ default: 1.0,
+ min: 0,
+ max: 1,
+ section: "Calibration",
+ fixable: true,
+ defaultFixed: true,
+ actuatorFactor: "f_w",
+ freeMin: 0.0,
+ freeMax: 1.0,
+ description:
+ "Fraction du travail conservée dans le fluide : 1 = adiabatique, 0.98 ≈ 2 % perdu, 0 = tout perdu. Fixed OFF + Probe T (DGT) sur refoulement.",
+ },
],
},
{
@@ -819,7 +887,7 @@ export const COMPONENTS: ComponentMeta[] = [
fixable: true,
defaultFixed: true,
actuatorFactor: "z_ua",
- freeMin: 0.2,
+ freeMin: 0.05,
freeMax: 3.0,
description: "Fixed = valeur figée. Décocher Fixed = libre (calibration).",
},
@@ -834,7 +902,7 @@ export const COMPONENTS: ComponentMeta[] = [
fixable: true,
defaultFixed: true,
actuatorFactor: "z_dp",
- freeMin: 0.2,
+ freeMin: 0.05,
freeMax: 3.0,
},
],
@@ -870,7 +938,7 @@ export const COMPONENTS: ComponentMeta[] = [
fixable: true,
defaultFixed: true,
actuatorFactor: "z_ua",
- freeMin: 0.2,
+ freeMin: 0.05,
freeMax: 3.0,
description: "Fixed = figé. Décocher Fixed = libre pour le solveur.",
},
@@ -885,7 +953,7 @@ export const COMPONENTS: ComponentMeta[] = [
fixable: true,
defaultFixed: true,
actuatorFactor: "z_dp",
- freeMin: 0.2,
+ freeMin: 0.05,
freeMax: 3.0,
},
{
@@ -1145,7 +1213,7 @@ export const COMPONENTS: ComponentMeta[] = [
fixable: true,
defaultFixed: true,
actuatorFactor: "z_ua",
- freeMin: 0.2,
+ freeMin: 0.05,
freeMax: 3.0,
},
{
@@ -1158,7 +1226,7 @@ export const COMPONENTS: ComponentMeta[] = [
fixable: true,
defaultFixed: true,
actuatorFactor: "z_dp",
- freeMin: 0.2,
+ freeMin: 0.05,
freeMax: 3.0,
},
],
@@ -1234,7 +1302,7 @@ export const COMPONENTS: ComponentMeta[] = [
fixable: true,
defaultFixed: true,
actuatorFactor: "z_ua",
- freeMin: 0.2,
+ freeMin: 0.05,
freeMax: 3.0,
},
{
@@ -1247,7 +1315,7 @@ export const COMPONENTS: ComponentMeta[] = [
fixable: true,
defaultFixed: true,
actuatorFactor: "z_dp",
- freeMin: 0.2,
+ freeMin: 0.05,
freeMax: 3.0,
},
],
@@ -1303,7 +1371,7 @@ export const COMPONENTS: ComponentMeta[] = [
fixable: true,
defaultFixed: true,
actuatorFactor: "z_ua",
- freeMin: 0.2,
+ freeMin: 0.05,
freeMax: 3.0,
description: "Fixed = figé. Décocher Fixed = le solveur ajuste Z_UA.",
},
@@ -1318,7 +1386,7 @@ export const COMPONENTS: ComponentMeta[] = [
fixable: true,
defaultFixed: true,
actuatorFactor: "z_dp",
- freeMin: 0.2,
+ freeMin: 0.05,
freeMax: 3.0,
},
{
diff --git a/apps/web/src/lib/configBuilder.test.ts b/apps/web/src/lib/configBuilder.test.ts
index 9d7c9b9..ee70b24 100644
--- a/apps/web/src/lib/configBuilder.test.ts
+++ b/apps/web/src/lib/configBuilder.test.ts
@@ -3,6 +3,7 @@ import type { Edge, Node } from "@xyflow/react";
import {
applyBoundaryFixSemantics,
buildScenarioConfig,
+ buildModelEmbeddings,
buildFixedFreeCalibrationControls,
resolveSecondaryStreams,
stripUiOnlyParams,
@@ -483,43 +484,45 @@ describe("caloporteur (secondary stream) resolution", () => {
});
});
-describe("Fixed / Free calibration (Probe-based pairing)", () => {
- it("pairs a Fixed Probe measure with a Free Z_UA on the HX", () => {
+describe("Modelica embeddings (Fixed / Free)", () => {
+ it("pairs Fixed Probe Tsat with Free Z_UA into embeddings[] (not controls[])", () => {
const nodes = [
node("e", "FloodedEvaporator", "evap", 0, {
ua: 9000,
z_ua: 1.0,
- // Fixed OFF for Z_UA → free actuator
[fixedFlagKey("z_ua")]: false,
}),
node("p1", "Probe", "sst_probe", 0, {
- measure: "SST",
fluid: "R134a",
- target: 278.15,
- // Fixed ON for the Probe target → impose the measure
- [fixedFlagKey("target")]: true,
+ tsat_c: 5.0,
+ [fixedFlagKey("tsat_c")]: true,
}),
];
const edges: Edge[] = [
{ id: "pe", source: "e", target: "p1", sourceHandle: "outlet", targetHandle: "inlet" },
];
- const controls = buildFixedFreeCalibrationControls(nodes, edges);
- expect(controls).toHaveLength(1);
- expect(controls[0]).toMatchObject({
- measure: { component: "sst_probe", output: "saturationTemperature" },
- actuator: { component: "evap", factor: "z_ua" },
- target: 278.15,
+ const embeddings = buildModelEmbeddings(nodes, edges);
+ expect(embeddings).toHaveLength(1);
+ expect(embeddings[0]).toMatchObject({
+ id: "emb_evap_z_ua",
+ unknown: { component: "evap", factor: "z_ua", start: 0.3, min: 0.05 },
+ equation: {
+ component: "sst_probe",
+ output: "saturationTemperature",
+ value: 278.15,
+ },
});
const cfg = buildScenarioConfig(nodes, edges);
- expect(cfg.controls?.length).toBe(1);
- // UI-only keys stripped from component JSON; Z_UA still emitted as initial value.
+ expect(cfg.embeddings).toHaveLength(1);
+ expect(cfg.controls).toBeUndefined();
const comp = cfg.circuits[0].components[0];
expect(comp[fixedFlagKey("z_ua")]).toBeUndefined();
expect(comp.z_ua).toBe(1.0);
+ expect(comp.ua).toBeUndefined(); // Free z_ua strips absolute ua
});
- it("emits no control when Z_UA stays Fixed even with a Probe present", () => {
+ it("emits no embedding when Z_UA stays Fixed even with a Probe present", () => {
const nodes = [
node("e", "Evaporator", "evap", 0, {
ua: 6000,
@@ -527,18 +530,15 @@ describe("Fixed / Free calibration (Probe-based pairing)", () => {
[fixedFlagKey("z_ua")]: true,
}),
node("p1", "Probe", "sst_probe", 0, {
- measure: "SST",
- fluid: "R134a",
- target: 278.15,
- [fixedFlagKey("target")]: true,
+ tsat_c: 5.0,
+ [fixedFlagKey("tsat_c")]: true,
}),
];
+ expect(buildModelEmbeddings(nodes)).toHaveLength(0);
expect(buildFixedFreeCalibrationControls(nodes)).toHaveLength(0);
});
- it("emits nothing for a freed Z_UA with no matching Probe (HARD RULE)", () => {
- // A freed z-factor without a Probe to measure against must not emit a
- // control — the user must place a Probe. No legacy same-component fallback.
+ it("emits nothing for a freed Z_UA with no matching Probe", () => {
const nodes = [
node("e", "Evaporator", "evap", 0, {
ua: 6000,
@@ -546,6 +546,39 @@ describe("Fixed / Free calibration (Probe-based pairing)", () => {
[fixedFlagKey("z_ua")]: false,
}),
];
- expect(buildFixedFreeCalibrationControls(nodes)).toHaveLength(0);
+ expect(buildModelEmbeddings(nodes)).toHaveLength(0);
+ });
+
+ it("rejects Free Z_UA without a Fixed Probe equation (Modelica balance)", () => {
+ const nodes = [
+ node("e", "BphxEvaporator", "evap", 0, {
+ z_ua: 1.0,
+ [fixedFlagKey("z_ua")]: false,
+ }),
+ ];
+ const issues = validateConfig(nodes, []);
+ expect(issues.some((m) => m.includes("fixed=false") || m.includes("without an equation"))).toBe(
+ true,
+ );
+ });
+
+ it("accepts legacy Probe measure+target (°C → K)", () => {
+ const nodes = [
+ node("e", "BphxEvaporator", "evap", 0, {
+ z_ua: 1.0,
+ [fixedFlagKey("z_ua")]: false,
+ }),
+ node("p1", "Probe", "sst_probe", 0, {
+ measure: "SST",
+ target: 4.4,
+ __fixed_target: true,
+ }),
+ ];
+ const edges: Edge[] = [
+ { id: "pe", source: "e", target: "p1", sourceHandle: "outlet", targetHandle: "inlet" },
+ ];
+ const embeddings = buildModelEmbeddings(nodes, edges);
+ expect(embeddings).toHaveLength(1);
+ expect(embeddings[0].equation.value).toBeCloseTo(277.55, 10);
});
});
diff --git a/apps/web/src/lib/configBuilder.ts b/apps/web/src/lib/configBuilder.ts
index c0465eb..7affe84 100644
--- a/apps/web/src/lib/configBuilder.ts
+++ b/apps/web/src/lib/configBuilder.ts
@@ -56,6 +56,23 @@ export interface ControlConfig {
alpha?: number;
}
+/** Modelica Z-factor embedding (unknown + equation). Not a SaturatedController. */
+export interface EmbeddingConfig {
+ id: string;
+ unknown: {
+ component: string;
+ factor: string;
+ start: number;
+ min: number;
+ max: number;
+ };
+ equation: {
+ component: string;
+ output: string;
+ value: number;
+ };
+}
+
export interface ControlObjectiveConfig {
component: string;
output: string;
@@ -100,8 +117,10 @@ export interface ScenarioConfig {
ua: number;
efficiency: number;
}>;
- /** Steady-state control loops (co-solved). Mirrors crates/cli config `controls`. */
+ /** System regulation loops (EXV/injection). Mirrors CLI `controls`. */
controls?: ControlConfig[];
+ /** Modelica Z-factor embeddings (unknown + equation). Mirrors CLI `embeddings`. */
+ embeddings?: EmbeddingConfig[];
/** Reusable subsystem templates (flattened by the CLI at load time). */
subsystems?: Record