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
36 changes: 18 additions & 18 deletions src/15_conso_aux.js
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,24 @@ export function conso_aux_distribution_ecs(
) {
const typeInstallation = parseInt(de.enum_type_installation_id);

const ratioVirtu = parseFloat(de.ratio_virtualisation);
let Sh_immeuble_ratio = Sh_immeuble;
let Sh_install = de.surface_habitable || Sh_logement;
let Niv_inst_ecs = de.nombre_niveau_installation_ecs || 1;

if (!(Sh_immeuble > Sh_logement) && ratioVirtu > 0 && ratioVirtu < 1) {
Sh_immeuble_ratio = Sh_logement / ratioVirtu;
Sh_install = Sh_logement;
Niv_inst_ecs = nombre_niveau_immeuble || Niv_inst_ecs;
}

// Etape 3: Lb - longueur par défaut du bouclage ECS (m)
// Sh est la surface habitable des logements desservis par l'installation d'ECS
// Pour l'appartement, on utilise la surface à l'échelle de l'immeuble
const Sh = (Sh_install / Sh_logement) * Sh_immeuble_ratio;
const Lb = 4 * Math.pow(Sh / Niv_inst_ecs, 0.5) + 6 * (Niv_inst_ecs - 0.5);
di.lb = Lb;

if (typeInstallation === 1) {
di.conso_auxiliaire_distribution_ecs = 0;
return;
Expand Down Expand Up @@ -402,24 +420,6 @@ export function conso_aux_distribution_ecs(
const ca = enums.classe_altitude[caId];
const zc = enums.zone_climatique[zcId];

const ratioVirtu = parseFloat(de.ratio_virtualisation);
let Sh_immeuble_ratio = Sh_immeuble;
let Sh_install = de.surface_habitable || Sh_logement;
let Niv_inst_ecs = de.nombre_niveau_installation_ecs || 1;

if (!(Sh_immeuble > Sh_logement) && ratioVirtu > 0 && ratioVirtu < 1) {
Sh_immeuble_ratio = Sh_logement / ratioVirtu;
Sh_install = Sh_logement;
Niv_inst_ecs = nombre_niveau_immeuble || Niv_inst_ecs;
}

// Etape 3: Lb - longueur par défaut du bouclage ECS (m)
// Sh est la surface habitable des logements desservis par l'installation d'ECS
// Pour l'appartement, on utilise la surface à l'échelle de l'immeuble
const Sh = (Sh_install / Sh_logement) * Sh_immeuble_ratio;
const Lb = 4 * Math.pow(Sh / Niv_inst_ecs, 0.5) + 6 * (Niv_inst_ecs - 0.5);
di.lb = Lb;

// Etape 4: DeltaPb (kPa) - perte de charge dans le bouclage
const DeltaPb = 0.2 * Lb + 10;

Expand Down
2 changes: 1 addition & 1 deletion src/15_conso_aux.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -874,7 +874,7 @@ describe("conso_aux_distribution_ecs - auxiliaires de distribution d'ECS", () =>
])('%s : pas de longueur de bouclage lb', (_libelle, de) => {
const di = { besoin_ecs: 1000 };
conso_aux_distribution_ecs({}, de, di, 50, 2000, 1, 1, 30);
expect(di.lb).toBeUndefined();
expect(di.lb).toBeCloseTo(181.88543819998318);
});

test('plus de niveaux desservis : bouclage plus court, donc consommation plus faible', () => {
Expand Down
1 change: 1 addition & 0 deletions types.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,7 @@ interface Donnee_intermediaire {
qp0?: number;
pn?: number;
k?: number;
lb?: number;
}
interface Plancher_bas_collection {
plancher_bas: PlancherBasItem[];
Expand Down