From 38c109615efd19a130c12d8bcaade07c07d6473f Mon Sep 17 00:00:00 2001
From: "francois.grand" <francois.grand@irstea.fr>
Date: Mon, 26 Mar 2018 09:28:25 +0200
Subject: [PATCH] =?UTF-8?q?modifs=20pour=20ngHyd=20par=20rapport=20=C3=A0?=
=?UTF-8?q?=20Kindsvater-Carter=20&=20Villemonte?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/compute-node.ts | 2 ++
src/parameters.ts | 9 +++++++++
2 files changed, 11 insertions(+)
diff --git a/src/compute-node.ts b/src/compute-node.ts
index 7ec2cf58..92c5ec74 100644
--- a/src/compute-node.ts
+++ b/src/compute-node.ts
@@ -22,6 +22,8 @@ export enum ComputeNodeType {
SectionTrapeze, SectionRectangle, SectionCercle, SectionPuissance,
// types d'ouvrages hydrauliques
StructureRectangle,
+ // ouvrages hydrauliques : Kindsvater-Carter & Villemonte
+ StructureKIVI
}
/**
diff --git a/src/parameters.ts b/src/parameters.ts
index 710b5b55..88275fa9 100644
--- a/src/parameters.ts
+++ b/src/parameters.ts
@@ -17,6 +17,8 @@ import { ParallelStructureParams } from "./structure/parallel_structure_params";
import { ParallelStructure } from "./structure/parallel_structure";
import { RectangularStructureParams } from "./structure/rectangular_structure_params";
import { StructureCem88d } from "./structure/structure_cem88d";
+import { StructureKiviParams } from "./structure/structure_kivi_params";
+import { StructureKivi } from "./structure/structure_kivi";
export class ComputeNodeParameters {
@@ -132,6 +134,13 @@ export class ComputeNodeParameters {
let n = new StructureCem88d(cn);
return cn;
+ case ComputeNodeType.StructureKIVI:
+ {
+ let cn = new StructureKiviParams(undefined, 1, 2, 1, undefined, undefined, undefined, undefined);
+ let n = new StructureKivi(cn);
+ return cn;
+ }
+
default:
throw new Error(`ComputeNodeParameters.createComputeNodeParameters() : calculatrice '${CalculatorType[calcType]}' / noeud de calcul '${ComputeNodeType[nodeType]}' non pris en charge`);
}
--
GitLab