diff --git a/spec/iterator/param_equation.spec.ts b/spec/iterator/param_equation.spec.ts index c3125876e705300aa75ca78c611633b4fd1e19e2..119fea71a3dfa49e609ddd7ab5f646759e438cb1 100644 --- a/spec/iterator/param_equation.spec.ts +++ b/spec/iterator/param_equation.spec.ts @@ -45,7 +45,7 @@ describe("iterator : ", () => { const psp: ParallelStructureParams = new ParallelStructureParams(1, 2, 3); const pst = new ParallelStructure(psp); - const st: Structure = CreateStructure(StructureType.SeuilRectangulaire, LoiDebit.Cem88d); + const st: Structure = CreateStructure(StructureType.SeuilRectangulaire, LoiDebit.WeirCem88d); pst.addStructure(st); const symbs = ["Q", "Z1", "Z2", "Cd", "h1", "h2", "L", "Q", "W", "Z1", "Z2", "ZDV"]; diff --git a/spec/structure/cloisons.spec.ts b/spec/structure/cloisons.spec.ts index a57206b8fbc4ec5993838ea071fab504b760a003..1b62e13e611591fc20b3191f0e048bf1de909909 100644 --- a/spec/structure/cloisons.spec.ts +++ b/spec/structure/cloisons.spec.ts @@ -73,7 +73,7 @@ describe("Class Cloisons: ", () => { LoiDebit.KIVI ]; for (let i = 0; i < 3; i++ ) { - c2.addStructure(CreateStructure(iStTypes[i], iLoiDebits[i], false)); + c2.addStructure(CreateStructure(iStTypes[i], iLoiDebits[i], c2, false)); } const prmsKivi: StructureKiviParams = c2.structures[2].prms as StructureKiviParams; prmsKivi.ZRAM.v = 0; diff --git a/spec/structure/dever.spec.ts b/spec/structure/dever.spec.ts index f93eea1866868bd04ae4506ced6b6487fec0aa05..2a1f0bbea52ef72202350440595ab4bd1afabd12 100644 --- a/spec/structure/dever.spec.ts +++ b/spec/structure/dever.spec.ts @@ -20,7 +20,8 @@ const dever: Dever = new Dever( false // debug ); -dever.addStructure(CreateStructure(StructureType.SeuilTriangulaireTrunc, LoiDebit.TriangularTruncWeirFree, false)); +dever.addStructure(CreateStructure(StructureType.SeuilTriangulaireTrunc, + LoiDebit.TriangularTruncWeirFree, dever, false)); describe("Class Dever: ", () => { describe("Calc(Q) Seuil Triangulaire Trunc", () => { diff --git a/spec/structure/structure_cem88d.spec.ts b/spec/structure/structure_cem88d.spec.ts index 1316c24e6494ef321fd777b55841538d5a9785a4..97cf6489e5427c61b3ef94739a4517f2a43b4476 100644 --- a/spec/structure/structure_cem88d.spec.ts +++ b/spec/structure/structure_cem88d.spec.ts @@ -14,7 +14,7 @@ import { itCalcQ } from "./functions"; const structPrm: RectangularStructureParams = new RectangularStructureParams(1, 0, 1, 1, 2, 0.6, 0); const structTest: StructureWeirCem88d = new StructureWeirCem88d(structPrm, false); -describe("Class StructureCem88d: ", () => { +describe("Class StructureWeirCem88d: ", () => { describe("Calcul Q avec W croissant: ", () => { const W: number[] = [ 0.000000, 0.100000, 0.200000, 0.300000, 0.400000, 0.500000, 0.600000, diff --git a/spec/structure/structure_cem88v.spec.ts b/spec/structure/structure_cem88v.spec.ts index 5927b9fc47cf1f5830e70970b2495938ea72bba4..6e15f5d1630c8c37417a1d5c48711664ab66b816 100644 --- a/spec/structure/structure_cem88v.spec.ts +++ b/spec/structure/structure_cem88v.spec.ts @@ -8,14 +8,13 @@ import { RectangularStructureParams } from "../../src/structure/rectangular_structure_params"; import { StructureFlowMode, StructureFlowRegime } from "../../src/structure/structure"; -import { StructureCem88v } from "../../src/structure/structure_cem88v"; -import { Result } from "../../src/util/result"; +import { StructureWeirCem88v } from "../../src/structure/structure_cem88v"; import { itCalcQ } from "./functions"; const structPrm: RectangularStructureParams = new RectangularStructureParams(1, 0, 1, 1, 2, 0.6, 0); -const structTest: StructureCem88v = new StructureCem88v(structPrm, false); +const structTest: StructureWeirCem88v = new StructureWeirCem88v(structPrm, false); -describe("Class StructureCem88v: ", () => { +describe("Class StructureWeirCem88v: ", () => { describe("Calcul Q avec W croissant: ", () => { const W: number[] = [0.000000, 0.100000, 0.200000, 0.300000, 0.400000, 0.500000, 0.600000, 0.700000, 0.800000, 0.900000, 1.000000, 1.100000, 1.200000, 1.300000]; diff --git a/spec/value_ref/value_ref_section.spec.ts b/spec/value_ref/value_ref_section.spec.ts index 4fd94933b7dde34c16dc83c61f38ecee1e46a6ab..2cbe9f44e99718056a539353b076657f419d75ce 100644 --- a/spec/value_ref/value_ref_section.spec.ts +++ b/spec/value_ref/value_ref_section.spec.ts @@ -1,5 +1,5 @@ import { cSnTrapez, ParamsSectionTrapez } from "../../src"; -import { SectionParametree } from "../../src/section/section_nub"; +import { SectionParametree } from "../../src/section/section_parametree"; import { acSection } from "../../src/section/section_type"; /**