From 859691e5d2b24616105fbf75c117788a2183dd79 Mon Sep 17 00:00:00 2001
From: Jean-Pascal <jean-pascal.aubry@inrae.fr>
Date: Fri, 15 Mar 2024 09:40:17 +0000
Subject: [PATCH] fix: delete rugoFond calculator from Nghyd Refs #658
---
src/app/calculators/rugofond/config.json | 49 -------------------
src/app/calculators/rugofond/en.json | 26 ----------
src/app/calculators/rugofond/fr.json | 26 ----------
.../fixedvar-results/var-results.component.ts | 1 -
src/app/config.json | 2 +-
5 files changed, 1 insertion(+), 103 deletions(-)
delete mode 100644 src/app/calculators/rugofond/config.json
delete mode 100644 src/app/calculators/rugofond/en.json
delete mode 100644 src/app/calculators/rugofond/fr.json
diff --git a/src/app/calculators/rugofond/config.json b/src/app/calculators/rugofond/config.json
deleted file mode 100644
index e9b92f7f7..000000000
--- a/src/app/calculators/rugofond/config.json
+++ /dev/null
@@ -1,49 +0,0 @@
-[
- {
- "id": "fs_hydraulique",
- "type": "fieldset",
- "fields": [
- "Q",
- "Z1"
- ]
- },
- {
- "id": "fs_geometry_crete",
- "type": "fieldset",
- "fields": [
- "L",
- "Cd"
- ]
- },
- {
- "id": "fs_geometry_rampe",
- "type": "fieldset",
- "fields": [
- {
- "id": "If",
- "help": "hsl/pente.html"
- },
- "d65",
- "a"
- ]
- },
- {
- "id": "fs_type",
- "type": "fieldset",
- "fields": [
- "ZF1",
- {
- "id": "ZD1",
- "allowEmpty": true
- },
- {
- "id": "ZR1",
- "allowEmpty": true
- },
- {
- "id": "Nb",
- "allowEmpty": true
- }
- ]
- }
-]
diff --git a/src/app/calculators/rugofond/en.json b/src/app/calculators/rugofond/en.json
deleted file mode 100644
index 4d57cf8c6..000000000
--- a/src/app/calculators/rugofond/en.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "fs_hydraulique": "Hydraulic parameters",
- "fs_geometry_crete": "Crest geometry",
- "fs_geometry_rampe": "Ramp geometry",
- "fs_type": "Ramp type",
- "fs_pass": "Fish pass parameters",
- "fs_bloc": "Blocks parameters",
- "fs_pass_type": "Pass type",
- "macrorugo_container": "Aprons",
- "fs_macrorugo": "Apron",
-
- "select_passtype": "Pass type",
- "Q": "Flow",
- "If": "Slope",
- "a": "Strickler correction factor",
- "ZF1": "Upstream ramp bottom elevation",
- "ZD1": "Lower upstream ramp bottom elevation",
- "ZR1": "Upper upstream ramp bottom elevation",
- "Nb": "Number of baffles",
- "L": "Total width of ramp",
- "Cd": "Discharge coefficient",
- "d65": "d65",
-
- "PASSTYPE_0": "Horizontal aprons",
- "PASSTYPE_1": "Inclined apron"
-}
\ No newline at end of file
diff --git a/src/app/calculators/rugofond/fr.json b/src/app/calculators/rugofond/fr.json
deleted file mode 100644
index 371572308..000000000
--- a/src/app/calculators/rugofond/fr.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "fs_hydraulique": "Paramètres hydrauliques",
- "fs_geometry_crete": "Géométrie de la crête",
- "fs_geometry_rampe": "Géométrie de la rampe",
- "fs_type": "Type de rampe",
- "fs_pass": "Paramètres de la passe",
- "fs_bloc": "Paramètres des blocs",
- "fs_pass_type": "Type de passe",
- "macrorugo_container": "Radiers",
- "fs_macrorugo": "Radier",
-
- "select_passtype": "Type de passe",
- "Q": "Débit",
- "If": "Pente",
- "a": "Coefficient correcteur du Strickler",
- "ZF1": "Cote de fond amont rampe",
- "ZD1": "Cote de fond bas amont rampe",
- "ZR1": "Cote de fond haut amont rampe",
- "Nb": "Nombre de ralentisseurs",
- "L": "Largeur totale de la rampe",
- "Cd": "Coefficient de débit",
- "d65": "d65",
-
- "PASSTYPE_0": "Radier horizontal",
- "PASSTYPE_1": "Radier incliné"
-}
\ No newline at end of file
diff --git a/src/app/components/fixedvar-results/var-results.component.ts b/src/app/components/fixedvar-results/var-results.component.ts
index 301959195..cce83891f 100644
--- a/src/app/components/fixedvar-results/var-results.component.ts
+++ b/src/app/components/fixedvar-results/var-results.component.ts
@@ -68,7 +68,6 @@ export class VarResultsComponent extends ResultsComponentDirective implements Ob
if (this._messages.length > 0) { // has log messages
this._headers.push("logMessagesColumn");
}
- console.log("headers", this._varResults.variableParamHeaders);
this._headers = this._headers.concat(this._varResults.variableParamHeaders);
this._headers = this._headers.concat(this._varResults.resultHeaders);
diff --git a/src/app/config.json b/src/app/config.json
index b21ee7df5..bf12d9f31 100644
--- a/src/app/config.json
+++ b/src/app/config.json
@@ -31,7 +31,7 @@
"path": "passe-naturelle.jpg",
"credits": "S. Richard / OFB"
},
- "calculators": [ 11, 17, 27, 37, 38, 39 ]
+ "calculators": [ 11, 17, 27, 37, 38 ]
},
{
"name": "VERIFICATION",
--
GitLab