From a7f9704a21a738def610255f53338586d12e30a4 Mon Sep 17 00:00:00 2001
From: Johan FOURDRINOY <johan.fourdrinoy@edf.fr>
Date: Tue, 28 Jan 2025 13:21:39 +0000
Subject: [PATCH] [mascaret] Add new keyword VARIABLES_PRECISION to control the
precision of saved variables
---
NEWS.txt | 3 +
.../ref/sarap_precision_ref.opt | 214 +++++++++++++++++
.../01_Steady_Kernel/sarap_precision.xcas | 216 ++++++++++++++++++
.../01_Steady_Kernel/vnv_1_steady_kernel.py | 10 +
sources/mascaret/API/f90/calcul_mascaret.f90 | 4 +-
.../API/f90/import_modele_mascaret.f90 | 2 +-
.../mascaret/API/f90/pretrait_interface.f90 | 4 +-
.../mascaret/Modules/m_init_var_sortie_s.f90 | 171 +++++++-------
sources/mascaret/Modules/m_lec_sorties_i.f90 | 8 +-
sources/mascaret/Modules/m_post_imp_i.f90 | 4 +-
sources/mascaret/Modules/m_prelido_i.f90 | 5 +-
sources/mascaret/Modules/m_pretrait_i.f90 | 5 +-
sources/mascaret/Modules/m_stock_i.f90 | 4 +-
sources/mascaret/Modules/m_stock_rep_i.f90 | 4 +-
.../ModulesAPI/m_modele_mascaret_t.f90 | 17 +-
.../ModulesAPI/m_pretrait_interface_i.f90 | 5 +-
sources/mascaret/Post/post_imp.f90 | 7 +-
sources/mascaret/Pretrait/lec_sorties.f90 | 86 ++++++-
sources/mascaret/Pretrait/pretrait.f90 | 5 +-
sources/mascaret/Stock/stock.F90 | 171 +++++++-------
sources/mascaret/Stock/stock_rep.f90 | 71 +++---
sources/mascaret/homere_mascaret.f90 | 83 +++----
sources/mascaret/mascaret.dico | 155 ++++++++++++-
23 files changed, 984 insertions(+), 270 deletions(-)
create mode 100644 examples/mascaret/01_Steady_Kernel/ref/sarap_precision_ref.opt
create mode 100644 examples/mascaret/01_Steady_Kernel/sarap_precision.xcas
diff --git a/NEWS.txt b/NEWS.txt
index e055582ecf..36126af6ff 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -1,6 +1,9 @@
Latest changes
==============
+MASCARET: New keyword VARIABLES PRECISION
+to control the precision of saved variables
+
TELEMAC-2D/TELEMAC-3D/GAIA: fix time series files in longitude/latitude
TELEMAC-2D/TELEMAC-3D: drogues files in long/lat if geometry file is in long/lat
diff --git a/examples/mascaret/01_Steady_Kernel/ref/sarap_precision_ref.opt b/examples/mascaret/01_Steady_Kernel/ref/sarap_precision_ref.opt
new file mode 100644
index 0000000000..b35c2ec3ee
--- /dev/null
+++ b/examples/mascaret/01_Steady_Kernel/ref/sarap_precision_ref.opt
@@ -0,0 +1,214 @@
+[variables]
+"Cote du fond";"ZREF";"m";8
+"Cote de l eau";"Z";"m";8
+"Debit mineur";"QMIN";"m3/s";8
+"Debit majeur";"QMAJ";"m3/s";8
+"Coefficient de frottement mineur";"KMIN";"m1/3/s";8
+"Coefficient de frottement majeur";"KMAJ";"m1/3/s";8
+"Nombre de Froude";"FR";"";8
+"Vitesse mineure";"VMIN";"m/s";8
+"Hauteur d'eau";"Y";"m";8
+"Debit total";"Q";"m3/s";8
+[resultats]
+ 0.0;" 1";" 1"; 0.0000; 5.00000000; 9.97667122; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28757894; 2.00937533; 4.97667122; 1000.00000000
+ 0.0;" 1";" 2"; 100.0000; 4.94999981; 9.92584324; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28765073; 2.00970984; 4.97584295; 1000.00000000
+ 0.0;" 1";" 3"; 200.0000; 4.90000010; 9.87498379; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28772527; 2.01005697; 4.97498369; 1000.00000000
+ 0.0;" 1";" 4"; 300.0000; 4.84999990; 9.82409191; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28780267; 2.01041722; 4.97409153; 1000.00000000
+ 0.0;" 1";" 5"; 400.0000; 4.80000019; 9.77316666; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28788301; 2.01079130; 4.97316647; 1000.00000000
+ 0.0;" 1";" 6"; 500.0000; 4.75000000; 9.72220612; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28796640; 2.01117969; 4.97220612; 1000.00000000
+ 0.0;" 1";" 7"; 600.0000; 4.69999981; 9.67120934; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28805301; 2.01158309; 4.97120905; 1000.00000000
+ 0.0;" 1";" 8"; 700.0000; 4.65000010; 9.62017441; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28814295; 2.01200175; 4.97017479; 1000.00000000
+ 0.0;" 1";" 9"; 800.0000; 4.59999990; 9.56910133; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28823632; 2.01243639; 4.96910143; 1000.00000000
+ 0.0;" 1";" 10"; 900.0000; 4.55000019; 9.51798725; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28833330; 2.01288772; 4.96798706; 1000.00000000
+ 0.0;" 1";" 11"; 1000.0000; 4.50000000; 9.46683025; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28843403; 2.01335645; 4.96683073; 1000.00000000
+ 0.0;" 1";" 12"; 1100.0000; 4.44999981; 9.41563034; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28853863; 2.01384306; 4.96563005; 1000.00000000
+ 0.0;" 1";" 13"; 1200.0000; 4.40000010; 9.36438370; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28864726; 2.01434875; 4.96438408; 1000.00000000
+ 0.0;" 1";" 14"; 1300.0000; 4.34999990; 9.31309032; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28876013; 2.01487374; 4.96309042; 1000.00000000
+ 0.0;" 1";" 15"; 1400.0000; 4.30000019; 9.26174736; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28887737; 2.01541901; 4.96174717; 1000.00000000
+ 0.0;" 1";" 16"; 1500.0000; 4.25000000; 9.21035290; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28899920; 2.01598549; 4.96035290; 1000.00000000
+ 0.0;" 1";" 17"; 1600.0000; 4.19999981; 9.15890503; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28912574; 2.01657414; 4.95890522; 1000.00000000
+ 0.0;" 1";" 18"; 1700.0000; 4.15000010; 9.10740280; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28925723; 2.01718545; 4.95740223; 1000.00000000
+ 0.0;" 1";" 19"; 1800.0000; 4.09999990; 9.05584145; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28939387; 2.01782060; 4.95584202; 1000.00000000
+ 0.0;" 1";" 20"; 1900.0000; 4.05000019; 9.00422096; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28953588; 2.01848078; 4.95422125; 1000.00000000
+ 0.0;" 1";" 21"; 2000.0000; 4.00000000; 8.95253849; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28968349; 2.01916671; 4.95253801; 1000.00000000
+ 0.0;" 1";" 22"; 2100.0000; 3.95000005; 8.90079021; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28983691; 2.01987958; 4.95079041; 1000.00000000
+ 0.0;" 1";" 23"; 2200.0000; 3.90000010; 8.84897518; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28999639; 2.02062035; 4.94897509; 1000.00000000
+ 0.0;" 1";" 24"; 2300.0000; 3.84999990; 8.79708958; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29016221; 2.02139044; 4.94708967; 1000.00000000
+ 0.0;" 1";" 25"; 2400.0000; 3.79999995; 8.74513149; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29033458; 2.02219105; 4.94513083; 1000.00000000
+ 0.0;" 1";" 26"; 2500.0000; 3.75000000; 8.69309616; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29051387; 2.02302337; 4.94309664; 1000.00000000
+ 0.0;" 1";" 27"; 2600.0000; 3.70000005; 8.64098263; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29070032; 2.02388883; 4.94098282; 1000.00000000
+ 0.0;" 1";" 28"; 2700.0000; 3.65000010; 8.58878613; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29089424; 2.02478886; 4.93878651; 1000.00000000
+ 0.0;" 1";" 29"; 2800.0000; 3.59999990; 8.53650475; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29109597; 2.02572489; 4.93650436; 1000.00000000
+ 0.0;" 1";" 30"; 2900.0000; 3.54999995; 8.48413277; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29130584; 2.02669835; 4.93413305; 1000.00000000
+ 0.0;" 1";" 31"; 3000.0000; 3.50000000; 8.43166924; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29152423; 2.02771115; 4.93166876; 1000.00000000
+ 0.0;" 1";" 32"; 3100.0000; 3.45000005; 8.37910748; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29175147; 2.02876496; 4.92910719; 1000.00000000
+ 0.0;" 1";" 33"; 3200.0000; 3.40000010; 8.32644463; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29198802; 2.02986121; 4.92644501; 1000.00000000
+ 0.0;" 1";" 34"; 3300.0000; 3.34999990; 8.27367687; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29223427; 2.03100228; 4.92367697; 1000.00000000
+ 0.0;" 1";" 35"; 3400.0000; 3.29999995; 8.22079945; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29249063; 2.03219008; 4.92079973; 1000.00000000
+ 0.0;" 1";" 36"; 3500.0000; 3.25000000; 8.16780758; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29275760; 2.03342652; 4.91780758; 1000.00000000
+ 0.0;" 1";" 37"; 3600.0000; 3.20000005; 8.11469650; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29303566; 2.03471375; 4.91469622; 1000.00000000
+ 0.0;" 1";" 38"; 3700.0000; 3.15000010; 8.06146049; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29332533; 2.03605437; 4.91146040; 1000.00000000
+ 0.0;" 1";" 39"; 3800.0000; 3.09999990; 8.00809383; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29362711; 2.03745079; 4.90809441; 1000.00000000
+ 0.0;" 1";" 40"; 3900.0000; 3.04999995; 7.95459270; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29394162; 2.03890538; 4.90459251; 1000.00000000
+ 0.0;" 1";" 41"; 4000.0000; 3.00000000; 7.90094948; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29426941; 2.04042101; 4.90094948; 1000.00000000
+ 0.0;" 1";" 42"; 4100.0000; 2.95000005; 7.84715843; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29461119; 2.04200053; 4.89715862; 1000.00000000
+ 0.0;" 1";" 43"; 4200.0000; 2.90000010; 7.79321337; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29496759; 2.04364681; 4.89321327; 1000.00000000
+ 0.0;" 1";" 44"; 4300.0000; 2.84999990; 7.73910618; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29533932; 2.04536343; 4.88910627; 1000.00000000
+ 0.0;" 1";" 45"; 4400.0000; 2.79999995; 7.68483114; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29572713; 2.04715371; 4.88483095; 1000.00000000
+ 0.0;" 1";" 46"; 4500.0000; 2.75000000; 7.63037920; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29613188; 2.04902124; 4.88037920; 1000.00000000
+ 0.0;" 1";" 47"; 4600.0000; 2.70000005; 7.57574272; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29655436; 2.05096960; 4.87574291; 1000.00000000
+ 0.0;" 1";" 48"; 4700.0000; 2.65000010; 7.52091312; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29699552; 2.05300307; 4.87091351; 1000.00000000
+ 0.0;" 1";" 49"; 4800.0000; 2.59999990; 7.46588182; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29745629; 2.05512595; 4.86588192; 1000.00000000
+ 0.0;" 1";" 50"; 4900.0000; 2.54999995; 7.41063881; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29793769; 2.05734277; 4.86063862; 1000.00000000
+ 0.0;" 1";" 51"; 5000.0000; 2.50000000; 7.35517406; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29844087; 2.05965829; 4.85517406; 1000.00000000
+ 0.0;" 1";" 52"; 5100.0000; 2.45000005; 7.29947710; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29896691; 2.06207800; 4.84947681; 1000.00000000
+ 0.0;" 1";" 53"; 5200.0000; 2.40000010; 7.24353647; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29951712; 2.06460714; 4.84353638; 1000.00000000
+ 0.0;" 1";" 54"; 5300.0000; 2.34999990; 7.18733978; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.30009282; 2.06725192; 4.83733988; 1000.00000000
+ 0.0;" 1";" 55"; 5400.0000; 2.29999995; 7.13087511; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.30069539; 2.07001829; 4.83087540; 1000.00000000
+ 0.0;" 1";" 56"; 5500.0000; 2.25000000; 7.07412863; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.30132639; 2.07291317; 4.82412863; 1000.00000000
+ 0.0;" 1";" 57"; 5600.0000; 2.20000005; 7.01708603; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.30198744; 2.07594371; 4.81708622; 1000.00000000
+ 0.0;" 1";" 58"; 5700.0000; 2.15000010; 6.95973206; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.30268031; 2.07911777; 4.80973196; 1000.00000000
+ 0.0;" 1";" 59"; 5800.0000; 2.09999990; 6.90205050; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.30340686; 2.08244371; 4.80205059; 1000.00000000
+ 0.0;" 1";" 60"; 5900.0000; 2.04999995; 6.84402370; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.30416918; 2.08593035; 4.79402399; 1000.00000000
+ 0.0;" 1";" 61"; 6000.0000; 2.00000000; 6.78563356; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.30496946; 2.08958745; 4.78563356; 1000.00000000
+ 0.0;" 1";" 62"; 6100.0000; 1.95000005; 6.72686005; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.30581003; 2.09342551; 4.77685976; 1000.00000000
+ 0.0;" 1";" 63"; 6200.0000; 1.89999998; 6.66768169; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.30669352; 2.09745526; 4.76768208; 1000.00000000
+ 0.0;" 1";" 64"; 6300.0000; 1.85000002; 6.60807657; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.30762270; 2.10168958; 4.75807667; 1000.00000000
+ 0.0;" 1";" 65"; 6400.0000; 1.79999995; 6.54801941; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.30860060; 2.10614133; 4.74801922; 1000.00000000
+ 0.0;" 1";" 66"; 6500.0000; 1.75000000; 6.48748446; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.30963054; 2.11082482; 4.73748446; 1000.00000000
+ 0.0;" 1";" 67"; 6600.0000; 1.70000005; 6.42644310; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.31071618; 2.11575603; 4.72644281; 1000.00000000
+ 0.0;" 1";" 68"; 6700.0000; 1.64999998; 6.36486435; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.31186143; 2.12095165; 4.71486473; 1000.00000000
+ 0.0;" 1";" 69"; 6800.0000; 1.60000002; 6.30271626; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.31307065; 2.12643075; 4.70271635; 1000.00000000
+ 0.0;" 1";" 70"; 6900.0000; 1.54999995; 6.23996162; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.31434861; 2.13221359; 4.68996191; 1000.00000000
+ 0.0;" 1";" 71"; 7000.0000; 1.50000000; 6.17656231; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.31570059; 2.13832283; 4.67656231; 1000.00000000
+ 0.0;" 1";" 72"; 7100.0000; 1.45000005; 6.11239338; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.31714079; 2.14482117; 4.66239357; 1000.00000000
+ 0.0;" 1";" 73"; 7200.0000; 1.39999998; 6.04748058; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.31866848; 2.15170360; 4.64748049; 1000.00000000
+ 0.0;" 1";" 74"; 7300.0000; 1.35000002; 5.98177195; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.32029101; 2.15900111; 4.63177156; 1000.00000000
+ 0.0;" 1";" 75"; 7400.0000; 1.29999995; 5.91520977; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.32201663; 2.16674876; 4.61521006; 1000.00000000
+ 0.0;" 1";" 76"; 7500.0000; 1.25000000; 5.84773207; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.32385454; 2.17498541; 4.59773207; 1000.00000000
+ 0.0;" 1";" 77"; 7600.0000; 1.20000005; 5.77926826; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.32581520; 2.18375492; 4.57926846; 1000.00000000
+ 0.0;" 1";" 78"; 7700.0000; 1.14999998; 5.70974159; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.32791039; 2.19310689; 4.55974150; 1000.00000000
+ 0.0;" 1";" 79"; 7800.0000; 1.10000002; 5.63906479; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.33015352; 2.20309711; 4.53906441; 1000.00000000
+ 0.0;" 1";" 80"; 7900.0000; 1.04999995; 5.56714106; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.33255997; 2.21378946; 4.51714134; 1000.00000000
+ 0.0;" 1";" 81"; 8000.0000; 1.00000000; 5.49386263; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.33514738; 2.22525716; 4.49386263; 1000.00000000
+ 0.0;" 1";" 82"; 8100.0000; 0.94999999; 5.41910505; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.33793616; 2.23758459; 4.46910477; 1000.00000000
+ 0.0;" 1";" 83"; 8200.0000; 0.89999998; 5.34272861; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.34095010; 2.25086904; 4.44272852; 1000.00000000
+ 0.0;" 1";" 84"; 8300.0000; 0.85000002; 5.26457262; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.34421712; 2.26522493; 4.41457272; 1000.00000000
+ 0.0;" 1";" 85"; 8400.0000; 0.80000001; 5.18445253; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.34777024; 2.28078628; 4.38445282; 1000.00000000
+ 0.0;" 1";" 86"; 8500.0000; 0.75000000; 5.10215330; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.35164884; 2.29771304; 4.35215330; 1000.00000000
+ 0.0;" 1";" 87"; 8600.0000; 0.69999999; 5.01742363; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.35590044; 2.31619620; 4.31742334; 1000.00000000
+ 0.0;" 1";" 88"; 8700.0000; 0.64999998; 4.92996454; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.36058298; 2.33646798; 4.27996445; 1000.00000000
+ 0.0;" 1";" 89"; 8800.0000; 0.60000002; 4.83942080; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.36576799; 2.35881281; 4.23942089; 1000.00000000
+ 0.0;" 1";" 90"; 8900.0000; 0.55000001; 4.74536085; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.37154511; 2.38358521; 4.19536066; 1000.00000000
+ 0.0;" 1";" 91"; 9000.0000; 0.50000000; 4.64725351; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.37802857; 2.41123438; 4.14725351; 1000.00000000
+ 0.0;" 1";" 92"; 9100.0000; 0.44999999; 4.54443598; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.38536686; 2.44233894; 4.09443617; 1000.00000000
+ 0.0;" 1";" 93"; 9200.0000; 0.40000001; 4.43606234; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.39375737; 2.47766256; 4.03606224; 1000.00000000
+ 0.0;" 1";" 94"; 9300.0000; 0.34999999; 4.32102633; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.40347010; 2.51824069; 3.97102642; 1000.00000000
+ 0.0;" 1";" 95"; 9400.0000; 0.30000001; 4.19783878; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.41488686; 2.56552434; 3.89783883; 1000.00000000
+ 0.0;" 1";" 96"; 9500.0000; 0.25000000; 4.06433153; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.42858589; 2.62169147; 3.81433129; 1000.00000000
+ 0.0;" 1";" 97"; 9600.0000; 0.20000000; 3.91748524; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.44544247; 2.68999052; 3.71748519; 1000.00000000
+ 0.0;" 1";" 98"; 9700.0000; 0.15000001; 3.75246692; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.46694475; 2.77587557; 3.60246682; 1000.00000000
+ 0.0;" 1";" 99"; 9800.0000; 0.10000000; 3.56077766; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.49591240; 2.88952398; 3.46077752; 1000.00000000
+ 0.0;" 1";" 100"; 9900.0000; 0.05000000; 3.32550740; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.53857678; 3.05296206; 3.27550745; 1000.00000000
+ 0.0;" 1";" 101"; 10000.0000; 0.00000000; 3.00000000; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.61444587; 3.33333325; 3.00000000; 1000.00000000
+ 1.0;" 1";" 1"; 0.0000; 5.00000000; 9.97667122; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28757894; 2.00937533; 4.97667122; 1000.00000000
+ 1.0;" 1";" 2"; 100.0000; 4.94999981; 9.92584324; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28765073; 2.00970984; 4.97584295; 1000.00000000
+ 1.0;" 1";" 3"; 200.0000; 4.90000010; 9.87498379; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28772527; 2.01005697; 4.97498369; 1000.00000000
+ 1.0;" 1";" 4"; 300.0000; 4.84999990; 9.82409191; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28780267; 2.01041722; 4.97409153; 1000.00000000
+ 1.0;" 1";" 5"; 400.0000; 4.80000019; 9.77316666; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28788301; 2.01079130; 4.97316647; 1000.00000000
+ 1.0;" 1";" 6"; 500.0000; 4.75000000; 9.72220612; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28796640; 2.01117969; 4.97220612; 1000.00000000
+ 1.0;" 1";" 7"; 600.0000; 4.69999981; 9.67120934; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28805301; 2.01158309; 4.97120905; 1000.00000000
+ 1.0;" 1";" 8"; 700.0000; 4.65000010; 9.62017441; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28814295; 2.01200175; 4.97017479; 1000.00000000
+ 1.0;" 1";" 9"; 800.0000; 4.59999990; 9.56910133; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28823632; 2.01243639; 4.96910143; 1000.00000000
+ 1.0;" 1";" 10"; 900.0000; 4.55000019; 9.51798725; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28833330; 2.01288772; 4.96798706; 1000.00000000
+ 1.0;" 1";" 11"; 1000.0000; 4.50000000; 9.46683025; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28843403; 2.01335645; 4.96683073; 1000.00000000
+ 1.0;" 1";" 12"; 1100.0000; 4.44999981; 9.41563034; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28853863; 2.01384306; 4.96563005; 1000.00000000
+ 1.0;" 1";" 13"; 1200.0000; 4.40000010; 9.36438370; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28864726; 2.01434875; 4.96438408; 1000.00000000
+ 1.0;" 1";" 14"; 1300.0000; 4.34999990; 9.31309032; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28876013; 2.01487374; 4.96309042; 1000.00000000
+ 1.0;" 1";" 15"; 1400.0000; 4.30000019; 9.26174736; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28887737; 2.01541901; 4.96174717; 1000.00000000
+ 1.0;" 1";" 16"; 1500.0000; 4.25000000; 9.21035290; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28899920; 2.01598549; 4.96035290; 1000.00000000
+ 1.0;" 1";" 17"; 1600.0000; 4.19999981; 9.15890503; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28912574; 2.01657414; 4.95890522; 1000.00000000
+ 1.0;" 1";" 18"; 1700.0000; 4.15000010; 9.10740280; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28925723; 2.01718545; 4.95740223; 1000.00000000
+ 1.0;" 1";" 19"; 1800.0000; 4.09999990; 9.05584145; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28939387; 2.01782060; 4.95584202; 1000.00000000
+ 1.0;" 1";" 20"; 1900.0000; 4.05000019; 9.00422096; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28953588; 2.01848078; 4.95422125; 1000.00000000
+ 1.0;" 1";" 21"; 2000.0000; 4.00000000; 8.95253849; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28968349; 2.01916671; 4.95253801; 1000.00000000
+ 1.0;" 1";" 22"; 2100.0000; 3.95000005; 8.90079021; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28983691; 2.01987958; 4.95079041; 1000.00000000
+ 1.0;" 1";" 23"; 2200.0000; 3.90000010; 8.84897518; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.28999639; 2.02062035; 4.94897509; 1000.00000000
+ 1.0;" 1";" 24"; 2300.0000; 3.84999990; 8.79708958; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29016221; 2.02139044; 4.94708967; 1000.00000000
+ 1.0;" 1";" 25"; 2400.0000; 3.79999995; 8.74513149; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29033458; 2.02219105; 4.94513083; 1000.00000000
+ 1.0;" 1";" 26"; 2500.0000; 3.75000000; 8.69309616; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29051387; 2.02302337; 4.94309664; 1000.00000000
+ 1.0;" 1";" 27"; 2600.0000; 3.70000005; 8.64098263; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29070032; 2.02388883; 4.94098282; 1000.00000000
+ 1.0;" 1";" 28"; 2700.0000; 3.65000010; 8.58878613; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29089424; 2.02478886; 4.93878651; 1000.00000000
+ 1.0;" 1";" 29"; 2800.0000; 3.59999990; 8.53650475; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29109597; 2.02572489; 4.93650436; 1000.00000000
+ 1.0;" 1";" 30"; 2900.0000; 3.54999995; 8.48413277; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29130584; 2.02669835; 4.93413305; 1000.00000000
+ 1.0;" 1";" 31"; 3000.0000; 3.50000000; 8.43166924; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29152423; 2.02771115; 4.93166876; 1000.00000000
+ 1.0;" 1";" 32"; 3100.0000; 3.45000005; 8.37910748; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29175147; 2.02876496; 4.92910719; 1000.00000000
+ 1.0;" 1";" 33"; 3200.0000; 3.40000010; 8.32644463; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29198802; 2.02986121; 4.92644501; 1000.00000000
+ 1.0;" 1";" 34"; 3300.0000; 3.34999990; 8.27367687; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29223427; 2.03100228; 4.92367697; 1000.00000000
+ 1.0;" 1";" 35"; 3400.0000; 3.29999995; 8.22079945; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29249063; 2.03219008; 4.92079973; 1000.00000000
+ 1.0;" 1";" 36"; 3500.0000; 3.25000000; 8.16780758; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29275760; 2.03342652; 4.91780758; 1000.00000000
+ 1.0;" 1";" 37"; 3600.0000; 3.20000005; 8.11469650; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29303566; 2.03471375; 4.91469622; 1000.00000000
+ 1.0;" 1";" 38"; 3700.0000; 3.15000010; 8.06146049; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29332533; 2.03605437; 4.91146040; 1000.00000000
+ 1.0;" 1";" 39"; 3800.0000; 3.09999990; 8.00809383; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29362711; 2.03745079; 4.90809441; 1000.00000000
+ 1.0;" 1";" 40"; 3900.0000; 3.04999995; 7.95459270; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29394162; 2.03890538; 4.90459251; 1000.00000000
+ 1.0;" 1";" 41"; 4000.0000; 3.00000000; 7.90094948; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29426941; 2.04042101; 4.90094948; 1000.00000000
+ 1.0;" 1";" 42"; 4100.0000; 2.95000005; 7.84715843; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29461119; 2.04200053; 4.89715862; 1000.00000000
+ 1.0;" 1";" 43"; 4200.0000; 2.90000010; 7.79321337; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29496759; 2.04364681; 4.89321327; 1000.00000000
+ 1.0;" 1";" 44"; 4300.0000; 2.84999990; 7.73910618; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29533932; 2.04536343; 4.88910627; 1000.00000000
+ 1.0;" 1";" 45"; 4400.0000; 2.79999995; 7.68483114; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29572713; 2.04715371; 4.88483095; 1000.00000000
+ 1.0;" 1";" 46"; 4500.0000; 2.75000000; 7.63037920; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29613188; 2.04902124; 4.88037920; 1000.00000000
+ 1.0;" 1";" 47"; 4600.0000; 2.70000005; 7.57574272; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29655436; 2.05096960; 4.87574291; 1000.00000000
+ 1.0;" 1";" 48"; 4700.0000; 2.65000010; 7.52091312; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29699552; 2.05300307; 4.87091351; 1000.00000000
+ 1.0;" 1";" 49"; 4800.0000; 2.59999990; 7.46588182; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29745629; 2.05512595; 4.86588192; 1000.00000000
+ 1.0;" 1";" 50"; 4900.0000; 2.54999995; 7.41063881; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29793769; 2.05734277; 4.86063862; 1000.00000000
+ 1.0;" 1";" 51"; 5000.0000; 2.50000000; 7.35517406; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29844087; 2.05965829; 4.85517406; 1000.00000000
+ 1.0;" 1";" 52"; 5100.0000; 2.45000005; 7.29947710; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29896691; 2.06207800; 4.84947681; 1000.00000000
+ 1.0;" 1";" 53"; 5200.0000; 2.40000010; 7.24353647; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.29951712; 2.06460714; 4.84353638; 1000.00000000
+ 1.0;" 1";" 54"; 5300.0000; 2.34999990; 7.18733978; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.30009282; 2.06725192; 4.83733988; 1000.00000000
+ 1.0;" 1";" 55"; 5400.0000; 2.29999995; 7.13087511; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.30069539; 2.07001829; 4.83087540; 1000.00000000
+ 1.0;" 1";" 56"; 5500.0000; 2.25000000; 7.07412863; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.30132639; 2.07291317; 4.82412863; 1000.00000000
+ 1.0;" 1";" 57"; 5600.0000; 2.20000005; 7.01708603; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.30198744; 2.07594371; 4.81708622; 1000.00000000
+ 1.0;" 1";" 58"; 5700.0000; 2.15000010; 6.95973206; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.30268031; 2.07911777; 4.80973196; 1000.00000000
+ 1.0;" 1";" 59"; 5800.0000; 2.09999990; 6.90205050; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.30340686; 2.08244371; 4.80205059; 1000.00000000
+ 1.0;" 1";" 60"; 5900.0000; 2.04999995; 6.84402370; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.30416918; 2.08593035; 4.79402399; 1000.00000000
+ 1.0;" 1";" 61"; 6000.0000; 2.00000000; 6.78563356; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.30496946; 2.08958745; 4.78563356; 1000.00000000
+ 1.0;" 1";" 62"; 6100.0000; 1.95000005; 6.72686005; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.30581003; 2.09342551; 4.77685976; 1000.00000000
+ 1.0;" 1";" 63"; 6200.0000; 1.89999998; 6.66768169; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.30669352; 2.09745526; 4.76768208; 1000.00000000
+ 1.0;" 1";" 64"; 6300.0000; 1.85000002; 6.60807657; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.30762270; 2.10168958; 4.75807667; 1000.00000000
+ 1.0;" 1";" 65"; 6400.0000; 1.79999995; 6.54801941; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.30860060; 2.10614133; 4.74801922; 1000.00000000
+ 1.0;" 1";" 66"; 6500.0000; 1.75000000; 6.48748446; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.30963054; 2.11082482; 4.73748446; 1000.00000000
+ 1.0;" 1";" 67"; 6600.0000; 1.70000005; 6.42644310; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.31071618; 2.11575603; 4.72644281; 1000.00000000
+ 1.0;" 1";" 68"; 6700.0000; 1.64999998; 6.36486435; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.31186143; 2.12095165; 4.71486473; 1000.00000000
+ 1.0;" 1";" 69"; 6800.0000; 1.60000002; 6.30271626; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.31307065; 2.12643075; 4.70271635; 1000.00000000
+ 1.0;" 1";" 70"; 6900.0000; 1.54999995; 6.23996162; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.31434861; 2.13221359; 4.68996191; 1000.00000000
+ 1.0;" 1";" 71"; 7000.0000; 1.50000000; 6.17656231; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.31570059; 2.13832283; 4.67656231; 1000.00000000
+ 1.0;" 1";" 72"; 7100.0000; 1.45000005; 6.11239338; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.31714079; 2.14482117; 4.66239357; 1000.00000000
+ 1.0;" 1";" 73"; 7200.0000; 1.39999998; 6.04748058; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.31866848; 2.15170360; 4.64748049; 1000.00000000
+ 1.0;" 1";" 74"; 7300.0000; 1.35000002; 5.98177195; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.32029101; 2.15900111; 4.63177156; 1000.00000000
+ 1.0;" 1";" 75"; 7400.0000; 1.29999995; 5.91520977; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.32201663; 2.16674876; 4.61521006; 1000.00000000
+ 1.0;" 1";" 76"; 7500.0000; 1.25000000; 5.84773207; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.32385454; 2.17498541; 4.59773207; 1000.00000000
+ 1.0;" 1";" 77"; 7600.0000; 1.20000005; 5.77926826; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.32581520; 2.18375492; 4.57926846; 1000.00000000
+ 1.0;" 1";" 78"; 7700.0000; 1.14999998; 5.70974159; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.32791039; 2.19310689; 4.55974150; 1000.00000000
+ 1.0;" 1";" 79"; 7800.0000; 1.10000002; 5.63906479; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.33015352; 2.20309711; 4.53906441; 1000.00000000
+ 1.0;" 1";" 80"; 7900.0000; 1.04999995; 5.56714106; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.33255997; 2.21378946; 4.51714134; 1000.00000000
+ 1.0;" 1";" 81"; 8000.0000; 1.00000000; 5.49386263; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.33514738; 2.22525716; 4.49386263; 1000.00000000
+ 1.0;" 1";" 82"; 8100.0000; 0.94999999; 5.41910505; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.33793616; 2.23758459; 4.46910477; 1000.00000000
+ 1.0;" 1";" 83"; 8200.0000; 0.89999998; 5.34272861; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.34095010; 2.25086904; 4.44272852; 1000.00000000
+ 1.0;" 1";" 84"; 8300.0000; 0.85000002; 5.26457262; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.34421712; 2.26522493; 4.41457272; 1000.00000000
+ 1.0;" 1";" 85"; 8400.0000; 0.80000001; 5.18445253; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.34777024; 2.28078628; 4.38445282; 1000.00000000
+ 1.0;" 1";" 86"; 8500.0000; 0.75000000; 5.10215330; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.35164884; 2.29771304; 4.35215330; 1000.00000000
+ 1.0;" 1";" 87"; 8600.0000; 0.69999999; 5.01742363; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.35590044; 2.31619620; 4.31742334; 1000.00000000
+ 1.0;" 1";" 88"; 8700.0000; 0.64999998; 4.92996454; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.36058298; 2.33646798; 4.27996445; 1000.00000000
+ 1.0;" 1";" 89"; 8800.0000; 0.60000002; 4.83942080; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.36576799; 2.35881281; 4.23942089; 1000.00000000
+ 1.0;" 1";" 90"; 8900.0000; 0.55000001; 4.74536085; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.37154511; 2.38358521; 4.19536066; 1000.00000000
+ 1.0;" 1";" 91"; 9000.0000; 0.50000000; 4.64725351; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.37802857; 2.41123438; 4.14725351; 1000.00000000
+ 1.0;" 1";" 92"; 9100.0000; 0.44999999; 4.54443598; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.38536686; 2.44233894; 4.09443617; 1000.00000000
+ 1.0;" 1";" 93"; 9200.0000; 0.40000001; 4.43606234; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.39375737; 2.47766256; 4.03606224; 1000.00000000
+ 1.0;" 1";" 94"; 9300.0000; 0.34999999; 4.32102633; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.40347010; 2.51824069; 3.97102642; 1000.00000000
+ 1.0;" 1";" 95"; 9400.0000; 0.30000001; 4.19783878; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.41488686; 2.56552434; 3.89783883; 1000.00000000
+ 1.0;" 1";" 96"; 9500.0000; 0.25000000; 4.06433153; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.42858589; 2.62169147; 3.81433129; 1000.00000000
+ 1.0;" 1";" 97"; 9600.0000; 0.20000000; 3.91748524; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.44544247; 2.68999052; 3.71748519; 1000.00000000
+ 1.0;" 1";" 98"; 9700.0000; 0.15000001; 3.75246692; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.46694475; 2.77587557; 3.60246682; 1000.00000000
+ 1.0;" 1";" 99"; 9800.0000; 0.10000000; 3.56077766; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.49591240; 2.88952398; 3.46077752; 1000.00000000
+ 1.0;" 1";" 100"; 9900.0000; 0.05000000; 3.32550740; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.53857678; 3.05296206; 3.27550745; 1000.00000000
+ 1.0;" 1";" 101"; 10000.0000; 0.00000000; 3.00000000; 1000.00000000; 0.00000000; 30.60000038; 30.60000038; 0.61444587; 3.33333325; 3.00000000; 1000.00000000
diff --git a/examples/mascaret/01_Steady_Kernel/sarap_precision.xcas b/examples/mascaret/01_Steady_Kernel/sarap_precision.xcas
new file mode 100644
index 0000000000..e50d6acc7b
--- /dev/null
+++ b/examples/mascaret/01_Steady_Kernel/sarap_precision.xcas
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE fichierCas SYSTEM "mascaret-1.0.dtd">
+<fichierCas>
+ <parametresCas>
+ <parametresGeneraux>
+ <versionCode>3</versionCode>
+ <code>1</code>
+ <fichMotsCles>sarap.xcas</fichMotsCles>
+ <dictionaire>dico.txt</dictionaire>
+ <progPrincipal>princi.f</progPrincipal>
+ <sauveModele>false</sauveModele>
+ <fichSauvModele>sarap.tmp</fichSauvModele>
+ <validationCode>false</validationCode>
+ <typeValidation>1</typeValidation>
+ <presenceCasiers>false</presenceCasiers>
+ <bibliotheques>
+ <bibliotheque>mascaretV5P1.a damoV3P0.a</bibliotheque>
+ </bibliotheques>
+ </parametresGeneraux>
+ <parametresModelePhysique>
+ <perteChargeConf>false</perteChargeConf>
+ <compositionLits>1</compositionLits>
+ <conservFrotVertical>false</conservFrotVertical>
+ <elevCoteArrivFront>0.05</elevCoteArrivFront>
+ <interpolLinStrickler>false</interpolLinStrickler>
+ <debordement>
+ <litMajeur>false</litMajeur>
+ <zoneStock>false</zoneStock>
+ </debordement>
+ </parametresModelePhysique>
+ <parametresNumeriques>
+ <calcOndeSubmersion>false</calcOndeSubmersion>
+ <decentrement>false</decentrement>
+ <froudeLimCondLim>1000.0</froudeLimCondLim>
+ <traitImplicitFrot>false</traitImplicitFrot>
+ <hauteurEauMini>0.005</hauteurEauMini>
+ <implicitNoyauTrans>false</implicitNoyauTrans>
+ <optimisNoyauTrans>false</optimisNoyauTrans>
+ <perteChargeAutoElargissement>false</perteChargeAutoElargissement>
+ <termesNonHydrostatiques>false</termesNonHydrostatiques>
+ <apportDebit>0</apportDebit>
+ <attenuationConvection>false</attenuationConvection>
+ </parametresNumeriques>
+ <parametresTemporels>
+ <pasTemps>1.0</pasTemps>
+ <tempsInit>0.0</tempsInit>
+ <critereArret>2</critereArret>
+ <nbPasTemps>2</nbPasTemps>
+ <tempsMax>1.0</tempsMax>
+ <pasTempsVar>false</pasTempsVar>
+ <nbCourant>0.8</nbCourant>
+ <coteMax>0.0</coteMax>
+ <abscisseControle>0.0</abscisseControle>
+ <biefControle>1</biefControle>
+ </parametresTemporels>
+ <parametresGeometrieReseau>
+ <geometrie>
+ <fichier>geometrie</fichier>
+ <format>2</format>
+ <profilsAbscAbsolu>true</profilsAbscAbsolu>
+ </geometrie>
+ <listeBranches>
+ <nb>1</nb>
+ <numeros>1</numeros>
+ <abscDebut>0.0</abscDebut>
+ <abscFin>10000.0</abscFin>
+ <numExtremDebut>1</numExtremDebut>
+ <numExtremFin>2</numExtremFin>
+ </listeBranches>
+ <listeNoeuds>
+ <nb>0</nb>
+ <noeuds/>
+ </listeNoeuds>
+ <extrLibres>
+ <nb>2</nb>
+ <num>1 2</num>
+ <numExtrem>1 2</numExtrem>
+ <noms>
+ <string>limite1</string>
+ <string>limite2</string>
+ </noms>
+ <typeCond>1 2</typeCond>
+ <numLoi>1 2</numLoi>
+ </extrLibres>
+ </parametresGeometrieReseau>
+ <parametresConfluents>
+ <nbConfluents>0</nbConfluents>
+ <confluents/>
+ </parametresConfluents>
+ <parametresPlanimetrageMaillage>
+ <methodeMaillage>5</methodeMaillage>
+ <planim>
+ <nbPas>101</nbPas>
+ <nbZones>1</nbZones>
+ <valeursPas>1.0</valeursPas>
+ <num1erProf>1</num1erProf>
+ <numDerProf>2</numDerProf>
+ </planim>
+ <maillage>
+ <modeSaisie>2</modeSaisie>
+ <sauvMaillage>false</sauvMaillage>
+ <maillageClavier>
+ <nbSections>0</nbSections>
+ <nbPlages>1</nbPlages>
+ <num1erProfPlage>1</num1erProfPlage>
+ <numDerProfPlage>2</numDerProfPlage>
+ <pasEspacePlage>100.0</pasEspacePlage>
+ <nbZones>0</nbZones>
+ </maillageClavier>
+ </maillage>
+ </parametresPlanimetrageMaillage>
+ <parametresSingularite>
+ <nbSeuils>0</nbSeuils>
+ </parametresSingularite>
+ <parametresApportDeversoirs/>
+ <parametresCalage>
+ <frottement>
+ <loi>1</loi>
+ <nbZone>1</nbZone>
+ <numBranche>1</numBranche>
+ <absDebZone>0.0</absDebZone>
+ <absFinZone>10000.0</absFinZone>
+ <coefLitMin>30.6</coefLitMin>
+ <coefLitMaj>30.6</coefLitMaj>
+ </frottement>
+ <zoneStockage>
+ <nbProfils>0</nbProfils>
+ <numProfil>-0</numProfil>
+ <limGauchLitMaj>-0</limGauchLitMaj>
+ <limDroitLitMaj>-0</limDroitLitMaj>
+ </zoneStockage>
+ </parametresCalage>
+ <parametresLoisHydrauliques>
+ <nb>2</nb>
+ <lois>
+ <structureParametresLoi>
+ <nom>loi_1_hydrogramme</nom>
+ <type>1</type>
+ <donnees>
+ <modeEntree>1</modeEntree>
+ <fichier>hydrogramme.loi</fichier>
+ <uniteTps>-0</uniteTps>
+ <nbPoints>-0</nbPoints>
+ <nbDebitsDifferents>-0</nbDebitsDifferents>
+ </donnees>
+ </structureParametresLoi>
+ <structureParametresLoi>
+ <nom>loi_2_limnigramme</nom>
+ <type>2</type>
+ <donnees>
+ <modeEntree>1</modeEntree>
+ <fichier>limnigramme.loi</fichier>
+ <uniteTps>-0</uniteTps>
+ <nbPoints>-0</nbPoints>
+ <nbDebitsDifferents>-0</nbDebitsDifferents>
+ </donnees>
+ </structureParametresLoi>
+ </lois>
+ </parametresLoisHydrauliques>
+ <parametresConditionsInitiales>
+ <repriseEtude>
+ <repriseCalcul>false</repriseCalcul>
+ </repriseEtude>
+ <ligneEau>
+ <LigEauInit>false</LigEauInit>
+ <modeEntree>2</modeEntree>
+ <formatFichLig>1</formatFichLig>
+ <nbPts>0</nbPts>
+ <branche>-0</branche>
+ <abscisse>-0</abscisse>
+ <cote>-0</cote>
+ <debit>-0</debit>
+ </ligneEau>
+ </parametresConditionsInitiales>
+ <parametresImpressionResultats>
+ <titreCalcul>Etude hydraulique1d</titreCalcul>
+ <impression>
+ <impressionGeometrie>false</impressionGeometrie>
+ <impressionPlanimetrage>false</impressionPlanimetrage>
+ <impressionReseau>false</impressionReseau>
+ <impressionLoiHydraulique>false</impressionLoiHydraulique>
+ <impressionligneEauInitiale>false</impressionligneEauInitiale>
+ <impressionCalcul>false</impressionCalcul>
+ </impression>
+ <pasStockage>
+ <premPasTpsStock>1</premPasTpsStock>
+ <pasStock>1</pasStock>
+ <pasImpression>1</pasImpression>
+ </pasStockage>
+ <resultats>
+ <fichResultat>sarap_ecr.opt</fichResultat>
+ <postProcesseur>2</postProcesseur>
+ </resultats>
+ <listing>
+ <fichListing>sarap.lis</fichListing>
+ </listing>
+ <fichReprise>
+ <fichRepriseEcr>sarap_ecr.rep</fichRepriseEcr>
+ </fichReprise>
+ <rubens>
+ <ecartInterBranch>1.0</ecartInterBranch>
+ </rubens>
+ <stockage>
+ <option>1</option>
+ <nbSite>0</nbSite>
+ </stockage>
+ </parametresImpressionResultats>
+ <parametresVariablesCalculees>
+ <variablesCalculees>false false false false false false false false false false false false false false false</variablesCalculees>
+ </parametresVariablesCalculees>
+ <parametresVariablesStockees>
+ <variablesStockees>true false false false false true true true false false false false false false false false false false false true false false true false false false false false false false false false false false false false false false false false false false</variablesStockees>
+ <variablesPrecision>8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8</variablesPrecision>
+ </parametresVariablesStockees>
+ </parametresCas>
+</fichierCas>
diff --git a/examples/mascaret/01_Steady_Kernel/vnv_1_steady_kernel.py b/examples/mascaret/01_Steady_Kernel/vnv_1_steady_kernel.py
index 7dffc546c6..4f6fbc5b2c 100644
--- a/examples/mascaret/01_Steady_Kernel/vnv_1_steady_kernel.py
+++ b/examples/mascaret/01_Steady_Kernel/vnv_1_steady_kernel.py
@@ -37,6 +37,11 @@ class VnvStudy(AbstractVnvStudy):
'mascaret',
'mascaret_imp.xcas')
+ # Test1 steady kernel precision
+ self.add_study('vnv_4',
+ 'mascaret',
+ 'sarap_precision.xcas')
+
def _check_results(self):
"""
Comparison with reference file
@@ -56,6 +61,11 @@ class VnvStudy(AbstractVnvStudy):
eps=[1.E-3],
masc=True)
+ self.check_epsilons('vnv_4:res',
+ 'ref/sarap_precision_ref.opt',
+ eps=[1.E-3],
+ masc=True)
+
def _post(self):
"""
Post-treatment processes
diff --git a/sources/mascaret/API/f90/calcul_mascaret.f90 b/sources/mascaret/API/f90/calcul_mascaret.f90
index d73e6c0f11..7d84b7d3c8 100644
--- a/sources/mascaret/API/f90/calcul_mascaret.f90
+++ b/sources/mascaret/API/f90/calcul_mascaret.f90
@@ -19,7 +19,7 @@
! *********************************************************************
! PROGICIEL : MASCARET J.-M. LACOMBE
!
-! VERSION : V8P4R0 EDF-CEREMA
+! VERSION : V9P0R0 EDF-CEREMA
! *********************************************************************
!.................................................................................................................................
! Calcul d'un nouvel etat au "TpsFinal" en utilisant le modele courant et l'etat precedent
@@ -1151,6 +1151,7 @@ subroutine CALCUL_MASCARET(RetourErreur, Identifiant, TpsInitial, TpsFinal, PasT
ImpressionCalcul , & ! ImpressionCalcul
Modele%Regime , & ! Regime Permanent / Non Permanent
Modele%VarCalc , & ! Variables a imprimer
+ Modele%VarPre , & ! Precision des variables a imprimer
FichierListing%Unite , & ! Unite logique listing
Etat%TempsPrecedent , & ! Temps precedent
VolBiefActif, VolBiefStockage, & ! Volumes actifs et de stockage
@@ -1255,6 +1256,7 @@ subroutine CALCUL_MASCARET(RetourErreur, Identifiant, TpsInitial, TpsFinal, PasT
phase_stock_casier , &
Etat%numPasTps , &
Modele%VarSto , &
+ Modele%VarPre , &
Modele%SectionStockage , &
FichierMotCle , &
Erreur )
diff --git a/sources/mascaret/API/f90/import_modele_mascaret.f90 b/sources/mascaret/API/f90/import_modele_mascaret.f90
index 845d16c9cd..1f851197c0 100644
--- a/sources/mascaret/API/f90/import_modele_mascaret.f90
+++ b/sources/mascaret/API/f90/import_modele_mascaret.f90
@@ -529,7 +529,7 @@
FichierResultat, Modele%FormatResu, FichierResultat2 , &
Modele%FormatResu2 , &
FichierListing , &
- Modele%VarCalc, Modele%VarSto , &
+ Modele%VarCalc, Modele%VarSto, Modele%VarPre , &
Modele%OptionStockage, Modele%SectionStockage , &
Modele%LoisHydrau, FichierLoiHydrau , &
Modele%Barrage, Modele%Singularites, Modele%PCSing , &
diff --git a/sources/mascaret/API/f90/pretrait_interface.f90 b/sources/mascaret/API/f90/pretrait_interface.f90
index 7848cf93bd..1f3a0335aa 100644
--- a/sources/mascaret/API/f90/pretrait_interface.f90
+++ b/sources/mascaret/API/f90/pretrait_interface.f90
@@ -55,7 +55,7 @@ subroutine PRETRAIT_INTERFACE ( &
PremierPasStocke , &
FichierResultat, FormatResu, FichierResultat2, FormatResu2 ,&
FichierListing , &
- VarCalc, VarSto , &
+ VarCalc, VarSto, VarPre , &
OptionStockage, SectionStockage , &
LoiHydrau, FichierLoiHydrau , &
Barrage, Singularite, PCSing , &
@@ -283,6 +283,7 @@ use M_XCAS_S
logical, dimension(NB_TOT_VAR), intent( out) :: VarCalc
logical, dimension(NB_TOT_VAR), intent( out) :: VarSto
+ integer, dimension(NB_TOT_VAR), intent( out) :: VarPre
integer , intent( out) :: OptionStockage
integer, dimension(:) , pointer :: SectionStockage
@@ -1441,6 +1442,7 @@ read(unit=line, fmt=*) ModeleLit
call LEC_SORTIES ( &
VarSto , &
VarCalc , &
+ VarPre , &
unitNum , & ! Unite logique .xcas
Erreur & ! Erreur
)
diff --git a/sources/mascaret/Modules/m_init_var_sortie_s.f90 b/sources/mascaret/Modules/m_init_var_sortie_s.f90
index 2e0c896de8..4c8e405bb3 100644
--- a/sources/mascaret/Modules/m_init_var_sortie_s.f90
+++ b/sources/mascaret/Modules/m_init_var_sortie_s.f90
@@ -23,7 +23,7 @@ module M_INIT_VAR_SORTIE_S
! P. CHERUBINI
! S. PERON
! S. MANDELKERN
-! VERSION : V8P4R0 EDF-CEREMA
+! VERSION : V9P1R0 EDF-CEREMA
!***********************************************************************
!***********************************************************************
@@ -76,40 +76,41 @@ module M_INIT_VAR_SORTIE_S
contains
subroutine INIT_VAR_SORTIE_S( &
- Var_nom , &
- Gdr , &
- X , &
- ZREF , &
- RGC , RDC , &
- CF1 , CF2 , &
- Z , &
- Q , &
- Q1 , Q2 , &
- DebitFlux , &
- S1 , S2 , &
- B1 , B2 , &
- BS , &
- P1 , P2 , &
- RH1 , RH2 , &
- FR , BETA , &
- TAUF , &
- Y , HMOY , &
- Q2G , Q2D , &
- VOL , VOLS , &
- CHARG , &
- SS , &
- V1 , V2 , &
- ZMAX , TZMAX, &
- VZMAX , &
- ZMIN , TZMIN, &
- V1MIN, V1MAX, &
- BMAX , &
- TOND , &
- QMAX , TQMAX, &
- EMAX , &
- YVRAI, QVRAI, &
- Qdeverse , &
- VarASortir , &
+ Var_nom , &
+ Gdr , &
+ X , &
+ ZREF , &
+ RGC , RDC , &
+ CF1 , CF2 , &
+ Z , &
+ Q , &
+ Q1 , Q2 , &
+ DebitFlux , &
+ S1 , S2 , &
+ B1 , B2 , &
+ BS , &
+ P1 , P2 , &
+ RH1 , RH2 , &
+ FR , BETA , &
+ TAUF , &
+ Y , HMOY , &
+ Q2G , Q2D , &
+ VOL , VOLS , &
+ CHARG , &
+ SS , &
+ V1 , V2 , &
+ ZMAX , TZMAX , &
+ VZMAX , &
+ ZMIN , TZMIN , &
+ V1MIN, V1MAX , &
+ BMAX , &
+ TOND , &
+ QMAX , TQMAX , &
+ EMAX , &
+ YVRAI, QVRAI , &
+ Qdeverse , &
+ VarASortir , &
+ VarPrecision , &
PhaseSimulation &
)
! .....................................................................
@@ -171,6 +172,7 @@ module M_INIT_VAR_SORTIE_S
! ! EMAX ! R ! -->! Energie maximale
! ! Qdeverse ! R ! -->! debit deverse par les deversoirs
! ! VarASortir ! L ! -->! Drapeaux sur les variables a sortir
+ ! ! VarPrecision! I ! -->! Precision des variables a stockees
! ! PhaseSimulation!I! -->! Variable indiquant la phase de la simulation
! !_____________!____!____!_______________________________________________
!
@@ -292,7 +294,9 @@ module M_INIT_VAR_SORTIE_S
real(DOUBLE) , dimension (:),pointer :: Qdeverse
real(DOUBLE) , dimension (:),pointer :: DebitFlux
logical , dimension(:) , intent(in) :: VarASortir
+ integer , dimension(:) , intent(in) :: VarPrecision
integer , intent(in) :: PhaseSimulation
+
!.. Constantes ..
!----------------
@@ -303,56 +307,57 @@ module M_INIT_VAR_SORTIE_S
!============================ Initialisations ===========================
label_initialisation : if( PhaseSimulation == PHASE_INITIALISATION ) then
!..................... initialisation du tableau de structure Var_nom ........................
- Var_nom(VAR_X )=VAR_NOM_T(.true. ,"Maillage ","X ","m ",2,.false.)!
- Var_nom(VAR_ZREF )=VAR_NOM_T(.true.,"Cote du fond ","ZREF","m ",4, .false.)!
- Var_nom(VAR_RGC )=VAR_NOM_T(.false.,"Cote de la rive gauche ","RGC ","m ",4,.false.)!
- Var_nom(VAR_RDC )=VAR_NOM_T(.false.,"Cote de la rive droite ","RDC ","m ",4,.false.)!
- Var_nom(VAR_CF1 )=VAR_NOM_T(.true.,"Coefficient de frottement mineur","KMIN","m1/3/s",0,.false.)!
- Var_nom(VAR_CF2 )=VAR_NOM_T(.true.,"Coefficient de frottement majeur","KMAJ","m1/3/s",0,.false.)!
- Var_nom(VAR_Z )=VAR_NOM_T(.true. ,"Cote de l eau ","Z ","m ",3,.true. )!
- Var_nom(VAR_Q )=VAR_NOM_T(.true. ,"Debit total ","Q ","m3/s ",3,.true.) !
- Var_nom(VAR_Q1 )=VAR_NOM_T(.true.,"Debit mineur ","QMIN","m3/s ",3,.true. )!
- Var_nom(VAR_Q2 )=VAR_NOM_T(.true.,"Debit majeur ","QMAJ","m3/s ",3,.true. )!
- Var_nom(VAR_S1 )=VAR_NOM_T(.false.,"Section mouillee mineure ","S1 ","m2 ",2,.true. )!
- Var_nom(VAR_S2 )=VAR_NOM_T(.false.,"Section mouillee majeure ","S2 ","m2 ",2,.true. )!
- Var_nom(VAR_B1 )=VAR_NOM_T(.false.,"Largeur au miroir mineure ","B1 ","m ",2,.true. )!
- Var_nom(VAR_B2 )=VAR_NOM_T(.false.,"Largeur au miroir majeure ","B2 ","m ",2,.true. )!
- Var_nom(VAR_BS )=VAR_NOM_T(.false.,"Largeur au miroir du stockage ","BS ","m ",2,.true. )!
- Var_nom(VAR_P1 )=VAR_NOM_T(.false.,"Perimetre mouille mineur ","P1 ","m ",2,.true. )!
- Var_nom(VAR_P2 )=VAR_NOM_T(.false.,"Perimetre mouille majeur ","P2 ","m ",2,.true. )!
- Var_nom(VAR_RH1 )=VAR_NOM_T(.false.,"Rayon hydraulique mineur ","RH1 ","m ",2,.true. )!
- Var_nom(VAR_RH2 )=VAR_NOM_T(.false.,"Rayon hydraulique majeur ","RH2 ","m ",2,.true. )!
- Var_nom(VAR_FR )=VAR_NOM_T(.true.,"Nombre de Froude ","FR "," ",5,.true. )!
- Var_nom(VAR_BETA )=VAR_NOM_T(.false.,"Coefficient beta modele DEBORD ","BETA"," ",2,.true. )!
- Var_nom(VAR_TAUF )=VAR_NOM_T(.false.,"Contrainte au fond ","TAUF","Pa ",6,.true. )!
- Var_nom(VAR_Y )=VAR_NOM_T(.false.,"Hauteur d'eau ","Y ","m ",3,.true. )!
- Var_nom(VAR_HMOY )=VAR_NOM_T(.false.,"Hauteur d'eau moyenne ","HMOY","m ",3,.true. )!
- Var_nom(VAR_Q2G )=VAR_NOM_T(.false.,"Debit majeur gauche ","Q2G ","m3/s ",2,.true. )!
- Var_nom(VAR_Q2D )=VAR_NOM_T(.false.,"Debit majeur droit ","Q2D ","m3/s ",2,.true. )!
- Var_nom(VAR_VOL )=VAR_NOM_T(.false.,"Volume du lit actif ","VOL ","m3 ",0,.true. )!
- Var_nom(VAR_VOLS )=VAR_NOM_T(.false.,"Volume de stockage ","VOLS","m3 ",0,.true. )!
- Var_nom(VAR_CHARG)=VAR_NOM_T(.false.,"Charge ","CHAR","m ",2,.true. )!
- Var_nom(VAR_SS )=VAR_NOM_T(.false.,"Section mouillee du stockage ","SS ","m2 ",2,.true. )!
- Var_nom(VAR_V1 )=VAR_NOM_T(.false.,"Vitesse mineure ","VMIN","m/s ",4,.true. )!
- Var_nom(VAR_V2 )=VAR_NOM_T(.false.,"Vitesse majeure ","VMAJ","m/s ",4,.true. )!
- Var_nom(VAR_ZMAX )=VAR_NOM_T(.false.,"Cote maximale atteinte ","ZMAX","m ",2,.true. )!
- Var_nom(VAR_TZMAX)=VAR_NOM_T(.false.,"Instant de cote maximale ","TZMA","s ",1,.true. )!
- Var_nom(VAR_VZMAX)=VAR_NOM_T(.false.,"Vitesse a la cote maximale ","VZMX","m/s ",4,.true. )!
- Var_nom(VAR_ZMIN )=VAR_NOM_T(.false.,"Cote minimale atteinte ","ZMIN","m ",2,.true. )!
- Var_nom(VAR_TZMIN)=VAR_NOM_T(.false.,"Instant de cote minimale ","TZMI","s ",1,.true. )!
- Var_nom(VAR_V1MIN)=VAR_NOM_T(.false.,"Vitesse mineure minimale ","VINF","m/s ",4,.true. )!
- Var_nom(VAR_V1MAX)=VAR_NOM_T(.false.,"Vitesse mineure maximale ","VSUP","m/s ",4,.true. )!
- Var_nom(VAR_BMAX )=VAR_NOM_T(.false.,"Largeur au miroir maximale ","BMAX","m ",2,.true. )!
- Var_nom(VAR_TOND )=VAR_NOM_T(.false.,"Instant d'arrivee d'onde ","TOND","s ",1,.true. )!
- Var_nom(VAR_QMAX )=VAR_NOM_T(.false.,"Debit maximal ","QMAX","m3/s ",2,.true. )!
- Var_nom(VAR_TQMAX)=VAR_NOM_T(.false.,"Instant de debit maximal ","TQMA","s ",1,.true. )!
- Var_nom(VAR_EMAX )=VAR_NOM_T(.false.,"Energie maximale ","EMAX","J ",3,.true. )!
- Var_nom(VAR_YVRAI )=VAR_NOM_T(.false.,"Hauteur d eau analy ","YVRAI","m ",3,.true. )!!..................... fin initialisation du tableau de structure Var_nom .......................!
- Var_nom(VAR_QVRAI )=VAR_NOM_T(.false.,"Debit analy ","QVRAI","m ",3,.true. )!!.
- Var_nom(VAR_QDEV )=VAR_NOM_T(.false.,"Debit deverse ","QDEV","m3/s ",3,.true. )!!
- Var_nom(VAR_Debi )=VAR_NOM_T(.false.,"Flux de masse ","Debi","m3/s ",3,.true. )!!..
+ Var_nom(VAR_X )=VAR_NOM_T(.true. ,"Maillage ","X ","m ",VarPrecision(VAR_X ),.false.)!
+ Var_nom(VAR_ZREF )=VAR_NOM_T(.true.,"Cote du fond ","ZREF","m ",VarPrecision(VAR_ZREF ), .false.)!
+ Var_nom(VAR_RGC )=VAR_NOM_T(.false.,"Cote de la rive gauche ","RGC ","m ",VarPrecision(VAR_RGC ),.false.)!
+ Var_nom(VAR_RDC )=VAR_NOM_T(.false.,"Cote de la rive droite ","RDC ","m ",VarPrecision(VAR_RDC ),.false.)!
+ Var_nom(VAR_CF1 )=VAR_NOM_T(.true.,"Coefficient de frottement mineur","KMIN","m1/3/s",VarPrecision(VAR_CF1 ),.false.)!
+ Var_nom(VAR_CF2 )=VAR_NOM_T(.true.,"Coefficient de frottement majeur","KMAJ","m1/3/s",VarPrecision(VAR_CF2 ),.false.)!
+ Var_nom(VAR_Z )=VAR_NOM_T(.true. ,"Cote de l eau ","Z ","m ",VarPrecision(VAR_Z ),.true. )!
+ Var_nom(VAR_Q )=VAR_NOM_T(.true. ,"Debit total ","Q ","m3/s ",VarPrecision(VAR_Q ),.true.) !
+ Var_nom(VAR_Q1 )=VAR_NOM_T(.true.,"Debit mineur ","QMIN","m3/s ",VarPrecision(VAR_Q1 ),.true. )!
+ Var_nom(VAR_Q2 )=VAR_NOM_T(.true.,"Debit majeur ","QMAJ","m3/s ",VarPrecision(VAR_Q2 ),.true. )!
+ Var_nom(VAR_S1 )=VAR_NOM_T(.false.,"Section mouillee mineure ","S1 ","m2 ",VarPrecision(VAR_S1 ),.true. )!
+ Var_nom(VAR_S2 )=VAR_NOM_T(.false.,"Section mouillee majeure ","S2 ","m2 ",VarPrecision(VAR_S2 ),.true. )!
+ Var_nom(VAR_B1 )=VAR_NOM_T(.false.,"Largeur au miroir mineure ","B1 ","m ",VarPrecision(VAR_B1 ),.true. )!
+ Var_nom(VAR_B2 )=VAR_NOM_T(.false.,"Largeur au miroir majeure ","B2 ","m ",VarPrecision(VAR_B2 ),.true. )!
+ Var_nom(VAR_BS )=VAR_NOM_T(.false.,"Largeur au miroir du stockage ","BS ","m ",VarPrecision(VAR_BS ),.true. )!
+ Var_nom(VAR_P1 )=VAR_NOM_T(.false.,"Perimetre mouille mineur ","P1 ","m ",VarPrecision(VAR_P1 ),.true. )!
+ Var_nom(VAR_P2 )=VAR_NOM_T(.false.,"Perimetre mouille majeur ","P2 ","m ",VarPrecision(VAR_P2 ),.true. )!
+ Var_nom(VAR_RH1 )=VAR_NOM_T(.false.,"Rayon hydraulique mineur ","RH1 ","m ",VarPrecision(VAR_RH1 ),.true. )!
+ Var_nom(VAR_RH2 )=VAR_NOM_T(.false.,"Rayon hydraulique majeur ","RH2 ","m ",VarPrecision(VAR_RH2 ),.true. )!
+ Var_nom(VAR_FR )=VAR_NOM_T(.true.,"Nombre de Froude ","FR "," ",VarPrecision(VAR_FR ),.true. )!
+ Var_nom(VAR_BETA )=VAR_NOM_T(.false.,"Coefficient beta modele DEBORD ","BETA"," ",VarPrecision(VAR_BETA ),.true. )!
+ Var_nom(VAR_TAUF )=VAR_NOM_T(.false.,"Contrainte au fond ","TAUF","Pa ",VarPrecision(VAR_TAUF ),.true. )!
+ Var_nom(VAR_Y )=VAR_NOM_T(.false.,"Hauteur d'eau ","Y ","m ",VarPrecision(VAR_Y ),.true. )!
+ Var_nom(VAR_HMOY )=VAR_NOM_T(.false.,"Hauteur d'eau moyenne ","HMOY","m ",VarPrecision(VAR_HMOY ),.true. )!
+ Var_nom(VAR_Q2G )=VAR_NOM_T(.false.,"Debit majeur gauche ","Q2G ","m3/s ",VarPrecision(VAR_Q2G ),.true. )!
+ Var_nom(VAR_Q2D )=VAR_NOM_T(.false.,"Debit majeur droit ","Q2D ","m3/s ",VarPrecision(VAR_Q2D ),.true. )!
+ Var_nom(VAR_VOL )=VAR_NOM_T(.false.,"Volume du lit actif ","VOL ","m3 ",VarPrecision(VAR_VOL ),.true. )!
+ Var_nom(VAR_VOLS )=VAR_NOM_T(.false.,"Volume de stockage ","VOLS","m3 ",VarPrecision(VAR_VOLS ),.true. )!
+ Var_nom(VAR_CHARG)=VAR_NOM_T(.false.,"Charge ","CHAR","m ",VarPrecision(VAR_CHARG),.true. )!
+ Var_nom(VAR_SS )=VAR_NOM_T(.false.,"Section mouillee du stockage ","SS ","m2 ",VarPrecision(VAR_SS ),.true. )!
+ Var_nom(VAR_V1 )=VAR_NOM_T(.false.,"Vitesse mineure ","VMIN","m/s ",VarPrecision(VAR_V1 ),.true. )!
+ Var_nom(VAR_V2 )=VAR_NOM_T(.false.,"Vitesse majeure ","VMAJ","m/s ",VarPrecision(VAR_V2 ),.true. )!
+ Var_nom(VAR_ZMAX )=VAR_NOM_T(.false.,"Cote maximale atteinte ","ZMAX","m ",VarPrecision(VAR_ZMAX),.true. )!
+ Var_nom(VAR_TZMAX)=VAR_NOM_T(.false.,"Instant de cote maximale ","TZMA","s ",VarPrecision(VAR_TZMAX),.true. )!
+ Var_nom(VAR_VZMAX)=VAR_NOM_T(.false.,"Vitesse a la cote maximale ","VZMX","m/s ",VarPrecision(VAR_VZMAX),.true. )!
+ Var_nom(VAR_ZMIN )=VAR_NOM_T(.false.,"Cote minimale atteinte ","ZMIN","m ",VarPrecision(VAR_ZMIN ),.true. )!
+ Var_nom(VAR_TZMIN)=VAR_NOM_T(.false.,"Instant de cote minimale ","TZMI","s ",VarPrecision(VAR_TZMIN),.true. )!
+ Var_nom(VAR_V1MIN)=VAR_NOM_T(.false.,"Vitesse mineure minimale ","VINF","m/s ",VarPrecision(VAR_V1MIN),.true. )!
+ Var_nom(VAR_V1MAX)=VAR_NOM_T(.false.,"Vitesse mineure maximale ","VSUP","m/s ",VarPrecision(VAR_V1MAX),.true. )!
+ Var_nom(VAR_BMAX )=VAR_NOM_T(.false.,"Largeur au miroir maximale ","BMAX","m ",VarPrecision(VAR_BMAX ),.true. )!
+ Var_nom(VAR_TOND )=VAR_NOM_T(.false.,"Instant d'arrivee d'onde ","TOND","s ",VarPrecision(VAR_TOND ),.true. )!
+ Var_nom(VAR_QMAX )=VAR_NOM_T(.false.,"Debit maximal ","QMAX","m3/s ",VarPrecision(VAR_QMAX ),.true. )!
+ Var_nom(VAR_TQMAX)=VAR_NOM_T(.false.,"Instant de debit maximal ","TQMA","s ",VarPrecision(VAR_TQMAX),.true. )!
+ Var_nom(VAR_EMAX )=VAR_NOM_T(.false.,"Energie maximale ","EMAX","J ",VarPrecision(VAR_EMAX ),.true. )!
+ Var_nom(VAR_YVRAI )=VAR_NOM_T(.false.,"Hauteur d eau analy ","YVRAI","m ",VarPrecision(VAR_YVRAI),.true. )!!..................... fin initialisation du tableau de structure Var_nom .......................!
+ Var_nom(VAR_QVRAI )=VAR_NOM_T(.false.,"Debit analy ","QVRAI","m ",VarPrecision(VAR_QVRAI),.true. )!!.
+ Var_nom(VAR_QDEV )=VAR_NOM_T(.false.,"Debit deverse ","QDEV","m3/s ",VarPrecision(VAR_QDEV ),.true. )!!
+ Var_nom(VAR_Debi )=VAR_NOM_T(.false.,"Flux de masse ","Debi","m3/s ",VarPrecision(VAR_Debi ),.true. )!!..
end if label_initialisation
+
!============================ Instructions ==============================
! Une variable a sortir est :
! - soit une variable obligatoire `Var_nom(:)%Obligatoire == .true.'
diff --git a/sources/mascaret/Modules/m_lec_sorties_i.f90 b/sources/mascaret/Modules/m_lec_sorties_i.f90
index 92c0d1f7bd..6c2618fd03 100644
--- a/sources/mascaret/Modules/m_lec_sorties_i.f90
+++ b/sources/mascaret/Modules/m_lec_sorties_i.f90
@@ -20,14 +20,15 @@ module M_LEC_SORTIES_I
!***********************************************************************
! PROGICIEL : MASCARET N. GOUTAL
!
-! VERSION : V8P4R0 EDF-CEREMA
+! VERSION : V9P1R0 EDF-CEREMA
!***********************************************************************
interface
subroutine LEC_SORTIES( &
- VarSto , &
+ VarSto , &
VarCalc , &
- unitNum , & ! Unite logique .xcas
+ VarPre , &
+ unitNum , & ! Unite logique .xcas
Erreur & ! Erreur
)
@@ -45,6 +46,7 @@ module M_LEC_SORTIES_I
! Arguments
logical , dimension(:) , intent( out) :: VarCalc
logical , dimension(:) , intent( out) :: VarSto
+ integer , dimension(:) , intent( out) :: VarPre
integer, intent(in) :: unitNum
type(ERREUR_T) , intent(inout) :: Erreur
diff --git a/sources/mascaret/Modules/m_post_imp_i.f90 b/sources/mascaret/Modules/m_post_imp_i.f90
index 0e3c24530a..f05bd2b340 100644
--- a/sources/mascaret/Modules/m_post_imp_i.f90
+++ b/sources/mascaret/Modules/m_post_imp_i.f90
@@ -23,7 +23,7 @@ module M_POST_IMP_I
! S. PERON
! S. MANDELKERN
!
-! VERSION : V8P4R0 EDF-CEREMA
+! VERSION : V9P1R0 EDF-CEREMA
!***********************************************************************
interface
@@ -68,6 +68,7 @@ module M_POST_IMP_I
ImpressionCalcul , & ! ImpressionCalcul
Regime , & ! Regime Permanent / Non Permanent
VarImp , & ! Variables a imprimer
+ VarPre , & ! Precision des variables
UniteListing , & ! Unite logique ficheier listing
! Etats
TempsPrecedent , & ! Temps precedent
@@ -180,6 +181,7 @@ module M_POST_IMP_I
integer , intent(in ) :: PhaseSimulation
integer , intent(in ) :: Regime
logical , dimension(:), intent(in ) :: VarImp
+ integer , dimension(:), intent(in ) :: VarPre
integer , intent(in ) :: UniteListing
! Etats
real(DOUBLE) , intent(inout) :: TempsPrecedent
diff --git a/sources/mascaret/Modules/m_prelido_i.f90 b/sources/mascaret/Modules/m_prelido_i.f90
index 0d7224f491..d9f3e3cb43 100644
--- a/sources/mascaret/Modules/m_prelido_i.f90
+++ b/sources/mascaret/Modules/m_prelido_i.f90
@@ -20,7 +20,7 @@ module M_PRELIDO_I
!***********************************************************************
! PROGICIEL : MASCARET S. MANDELKERN
!
-! VERSION : V8P4R0 EDF-CEREMA
+! VERSION : V9P1R0 EDF-CEREMA
!***********************************************************************
interface
@@ -46,7 +46,7 @@ module M_PRELIDO_I
PasStockage, PasImpression , &
PremierPasStocke , &
FichierResultat, FormatResu, FichierListing , &
- VarCalc, VarSto , &
+ VarCalc, VarSto, VarPre , &
OptionStockage, SectionStockage , &
LoiHydrau, FichierLoiHydrau , &
Singularite, PCSing , &
@@ -223,6 +223,7 @@ module M_PRELIDO_I
real(DOUBLE) :: ecart
logical, dimension(NB_TOT_VAR), intent( out) :: VarCalc
logical, dimension(NB_TOT_VAR), intent( out) :: VarSto
+ integer, dimension(NB_TOT_VAR), intent( out) :: VarPre
! Lois hydrauliques
type(LOI_T) , dimension(:), pointer :: LoiHydrau
type(FICHIER_T) , intent(inout) :: FichierLoiHydrau
diff --git a/sources/mascaret/Modules/m_pretrait_i.f90 b/sources/mascaret/Modules/m_pretrait_i.f90
index 25f787f5e0..de9aa787b5 100644
--- a/sources/mascaret/Modules/m_pretrait_i.f90
+++ b/sources/mascaret/Modules/m_pretrait_i.f90
@@ -20,7 +20,7 @@ module M_PRETRAIT_I
!***********************************************************************
! PROGICIEL : MASCARET S. MANDELKERN
!
-! VERSION : V8P4R0 EDF-CEREMA
+! VERSION : V9P0R0 EDF-CEREMA
!***********************************************************************
interface
@@ -60,7 +60,7 @@ module M_PRETRAIT_I
PremierPasStocke , &
FichierResultat,FormatResu,FichierResultat2, FormatResu2 , &
FichierListing , &
- VarCalc, VarSto , &
+ VarCalc, VarSto, VarPre , &
OptionStockage, SectionStockage , &
LoiHydrau, FichierLoiHydrau , &
Barrage, Singularite, PCSing , &
@@ -262,6 +262,7 @@ module M_PRETRAIT_I
real(DOUBLE) :: ecart
logical, dimension(NB_TOT_VAR), intent( out) :: VarCalc
logical, dimension(NB_TOT_VAR), intent( out) :: VarSto
+ integer, dimension(NB_TOT_VAR), intent( out) :: VarPre
integer , intent( out) :: OptionStockage
integer, dimension(:) , pointer :: SectionStockage
! Lois hydrauliques
diff --git a/sources/mascaret/Modules/m_stock_i.f90 b/sources/mascaret/Modules/m_stock_i.f90
index 9c9cc4753d..1ed4268aaf 100644
--- a/sources/mascaret/Modules/m_stock_i.f90
+++ b/sources/mascaret/Modules/m_stock_i.f90
@@ -23,7 +23,7 @@ module M_STOCK_I
! S. PERON
! S. MANDELKERN
!
-! VERSION : V8P4R0 EDF-CEREMA
+! VERSION : V9P1R0 EDF-CEREMA
!***********************************************************************
interface
@@ -76,6 +76,7 @@ module M_STOCK_I
PhaseStockCasier, &
NumeroPasTemps , &
VarSto , &
+ VarPre , &
SectionSto , &
FichierMotCle , &
Erreur )
@@ -236,6 +237,7 @@ module M_STOCK_I
integer , intent(in ) :: PhaseSimulation, NumeroPasTemps ,&
PhaseStockCasier
logical , dimension(:) , intent(in ) :: VarSto
+ integer , dimension(:) , intent(in ) :: VarPre
integer , dimension(:) , pointer :: SectionSto
type(ERREUR_T) , intent(inout) :: Erreur
diff --git a/sources/mascaret/Modules/m_stock_rep_i.f90 b/sources/mascaret/Modules/m_stock_rep_i.f90
index 9930d43794..57f469dadf 100644
--- a/sources/mascaret/Modules/m_stock_rep_i.f90
+++ b/sources/mascaret/Modules/m_stock_rep_i.f90
@@ -23,7 +23,7 @@ module M_STOCK_REP_I
! S. PERON
! S. MANDELKERN
!
-! VERSION : V8P4R0 EDF-CEREMA
+! VERSION : V9P1R0 EDF-CEREMA
!***********************************************************************
interface
subroutine STOCK_REP ( X , &
@@ -64,6 +64,7 @@ module M_STOCK_REP_I
! Parametre
FichierResultat , &
VarSto , &
+ VarPre , &
SectionSto , &
Erreur )
@@ -210,6 +211,7 @@ module M_STOCK_REP_I
! Parametres
type(FICHIER_T) , intent(in ) :: FichierResultat
logical , dimension(:) , intent(in ) :: VarSto
+ integer , dimension(:) , intent(in ) :: VarPre
integer , dimension(:) , pointer :: SectionSto
type(ERREUR_T) , intent(inout) :: Erreur
diff --git a/sources/mascaret/ModulesAPI/m_modele_mascaret_t.f90 b/sources/mascaret/ModulesAPI/m_modele_mascaret_t.f90
index 11291176d9..2c49b454da 100644
--- a/sources/mascaret/ModulesAPI/m_modele_mascaret_t.f90
+++ b/sources/mascaret/ModulesAPI/m_modele_mascaret_t.f90
@@ -87,7 +87,7 @@ Type MODELE_MASCARET_T
logical :: OptionTracer
logical :: OptionCourlis
logical, dimension(NB_TOT_VAR) :: VarSto
- logical, dimension(NB_TOT_VAR) :: VarCalc
+ logical, dimension(NB_TOT_VAR) :: VarCalc
logical :: ImpressionCalcul
logical :: ImpressionPlanim
logical :: RepriseCalcul
@@ -137,6 +137,7 @@ Type MODELE_MASCARET_T
integer :: TypeValidation
integer :: Noyau
integer :: VersionCode
+ integer, dimension(NB_TOT_VAR) :: VarPre
character(LEN=255) :: TitreCas
real(DOUBLE), dimension(:), pointer :: DZ
real(DOUBLE), dimension(:), pointer :: XD
@@ -450,6 +451,9 @@ contains
tabNomVar(i) ="Model.decentrement"
tabDescriptionVar(i) ="Option to use upwind numerical scheme"
i=i+1
+ tabNomVar(i) ="Model.PreVar"
+ tabDescriptionVar(i) ="Precision of recorded variables"
+ i=i+1
return
@@ -687,6 +691,9 @@ contains
else if ( index(NomVar, 'Model.decentrement') > 0) then
TypeVar = 'BOOL'
dimVar = 0
+ else if ( index(NomVar, 'Model.PreVar') > 0) then
+ TypeVar = 'INT'
+ dimVar = 1
else if ( INDEX(NomVar,'Model.Connect.') > 0) then
GET_TYPE_VAR_MODELE_MASCARET = GET_TYPE_VAR_CONNECT(NomVar, TypeVar, Categorie, Modifiable, dimVar, MessageErreur)
else if ( INDEX(NomVar,'Model.CrossSection.') > 0) then
@@ -870,6 +877,10 @@ contains
taille1 = 0
taille2 = 0
taille3 = 0
+ else if ( index(NomVar, 'Model.PreVar') > 0) then
+ taille1 = size(Instance%VarPre)
+ taille2 = 0
+ taille3 = 0
else if ( index(NomVar, 'Model.Zbot') > 0) then
if (ASSOCIATED(Instance%ZREF)) then
taille1 = size(Instance%ZREF)
@@ -2729,6 +2740,8 @@ contains
valeur = Instance%ProfFinBief(index1)
else if ( index(NomVar, 'Model.CQMV') > 0) then
valeur = Instance%CQMV
+ else if ( index(NomVar, 'Model.PreVar') > 0) then
+ valeur = Instance%VarPre(index1)
else if (INDEX(NomVar,'Model.Connect.') > 0) then
GET_INT_MODELE_MASCARET = GET_INT_CONNECT(instance%Connect, NomVar, index1,&
index2, index3, valeur, MessageErreur)
@@ -3151,6 +3164,8 @@ contains
Instance%ProfFinBief(index1) = valeur
else if ( index(NomVar,'Model.CQMV') > 0) then
Instance%CQMV = valeur
+ else if ( index(NomVar,'Model.PreVar') > 0) then
+ Instance%VarPre(index1) = valeur
else if (INDEX(NomVar,'Model.Connect.') > 0) then
SET_INT_MODELE_MASCARET = SET_INT_CONNECT(instance%Connect, NomVar, index1,&
index2, index3, valeur, MessageErreur)
diff --git a/sources/mascaret/ModulesAPI/m_pretrait_interface_i.f90 b/sources/mascaret/ModulesAPI/m_pretrait_interface_i.f90
index 4c4ea3e8a5..55b829fcfb 100644
--- a/sources/mascaret/ModulesAPI/m_pretrait_interface_i.f90
+++ b/sources/mascaret/ModulesAPI/m_pretrait_interface_i.f90
@@ -59,7 +59,7 @@ subroutine PRETRAIT_INTERFACE ( &
PremierPasStocke , &
FichierResultat, FormatResu, FichierResultat2, FormatResu2 ,&
FichierListing , &
- VarCalc, VarSto , &
+ VarCalc, VarSto, VarPre , &
OptionStockage, SectionStockage , &
LoiHydrau, FichierLoiHydrau , &
Barrage, Singularite, PCSing , &
@@ -278,7 +278,8 @@ use M_XCAS_S
logical, dimension(NB_TOT_VAR), intent( out) :: VarCalc
logical, dimension(NB_TOT_VAR), intent( out) :: VarSto
-
+ integer, dimension(NB_TOT_VAR), intent( out) :: VarPre
+
integer , intent( out) :: OptionStockage
integer, dimension(:) , pointer :: SectionStockage
diff --git a/sources/mascaret/Post/post_imp.f90 b/sources/mascaret/Post/post_imp.f90
index 074410fdcf..19811910f6 100644
--- a/sources/mascaret/Post/post_imp.f90
+++ b/sources/mascaret/Post/post_imp.f90
@@ -57,6 +57,7 @@ subroutine POST_IMP( &
ImpressionCalcul , & ! impression complete du calcul
Regime , & ! Regime Permanent / Non Permanent
VarImp , & ! Variables a imprimer
+ VarPre , & ! Precision des variables a imprimer
UniteListing , & ! Unite logique ficheier listing
! Etats
TempsPrecedent , & ! Temps precedent
@@ -70,7 +71,7 @@ subroutine POST_IMP( &
! S. PERON
! S. MANDELKERN
!
-! VERSION : V8P4R0 EDF-CEREMA
+! VERSION : V9P1R0 EDF-CEREMA
! *********************************************************************
! FONCTION : IMPRESSION DES VALEURS DES VARIABLES SUR LISTING
! --------
@@ -176,6 +177,7 @@ subroutine POST_IMP( &
integer , intent(in ) :: PhaseSimulation
integer , intent(in ) :: Regime
logical , dimension(:), intent(in ) :: VarImp
+ integer , dimension(:), intent(in ) :: VarPre
integer , intent(in ) :: UniteListing
Logical , intent(in ) :: ImpressionCalcul
! Etats
@@ -318,7 +320,8 @@ subroutine POST_IMP( &
YVRAI, QVRAI , &
Qdeverse , &
VarImp , &
- PhaseSimulation &
+ VarPre , &
+ PhaseSimulation &
)
do isec = 1 , size(X)
diff --git a/sources/mascaret/Pretrait/lec_sorties.f90 b/sources/mascaret/Pretrait/lec_sorties.f90
index e7d764252e..f8c09f3419 100644
--- a/sources/mascaret/Pretrait/lec_sorties.f90
+++ b/sources/mascaret/Pretrait/lec_sorties.f90
@@ -19,6 +19,7 @@
subroutine LEC_SORTIES( &
VarSto , &
VarCalc , &
+ VarPre , &
unitNum , & ! Unite logique .xcasL
Erreur & ! Erreur
)
@@ -27,7 +28,7 @@ subroutine LEC_SORTIES( &
! PROGICIEL : MASCARET S. MANDELKERN
! F. ZAOUI
!
-! VERSION : V8P4R0 EDF-CEREMA
+! VERSION : V9P1R0 EDF-CEREMA
! *********************************************************************
!========================= Declarations ===========================
@@ -44,6 +45,7 @@ subroutine LEC_SORTIES( &
! Arguments
logical , dimension(:) , intent( out) :: VarCalc
logical , dimension(:) , intent( out) :: VarSto
+ integer , dimension(:) , intent( out) :: VarPre
integer, intent(in) :: unitNum
type(ERREUR_T) , intent(inout) :: Erreur
! Variables locales
@@ -51,6 +53,8 @@ subroutine LEC_SORTIES( &
logical :: reponse_logique
integer :: nb_deversoir
logical, allocatable :: ltab1(:),ltab2(:)
+ integer, allocatable :: ltab3(:)
+ integer, dimension(42) :: VarPreDefault
character(len=256) :: pathNode
character(len=8192) :: line
!character(132) :: !arbredappel_old
@@ -63,7 +67,15 @@ subroutine LEC_SORTIES( &
!Erreur%arbredappel = trim(!Erreur%arbredappel)//'=>LEC_SORTIES'
VarSto(:) = .false.
VarCalc(:) = .false.
-
+ VarPre(:) = 8
+ VarPreDefault = (/ &
+ 4, 4, 4, 0, 0, 3, 3, 3, 2, 2, &
+ 5, 2, 2, 2, 2, 2, 2, 2, 2, 4, &
+ 4, 6, 3, 3, 2, 2, 2, 0, 0, 2, &
+ 2, 1, 4, 2, 1, 4, 4, 2, 1, 2, &
+ 1, 3 &
+/)
+
allocate( ltab1(42) , STAT = retour )
if( retour /= 0 ) then
Erreur%Numero = 5
@@ -78,10 +90,19 @@ subroutine LEC_SORTIES( &
Erreur%Numero = 5
Erreur%ft = err_5
Erreur%ft_c = err_5c
- call TRAITER_ERREUR( Erreur , 'ltab1' )
+ call TRAITER_ERREUR( Erreur , 'ltab2' )
return
end if
ltab2(:) = .false.
+ allocate( ltab3(42) , STAT = retour )
+ if( retour /= 0 ) then
+ Erreur%Numero = 5
+ Erreur%ft = err_5
+ Erreur%ft_c = err_5c
+ call TRAITER_ERREUR( Erreur , 'ltab3' )
+ return
+ end if
+ ltab3(:) = VarPreDefault(:)
pathNode = 'parametresVariablesStockees/variablesStockees'
line = xcasReader(unitNum, pathNode)
@@ -90,6 +111,10 @@ subroutine LEC_SORTIES( &
pathNode = 'parametresVariablesStockees/variablesCalculees'
line = xcasReader(unitNum, pathNode)
if(len(trim(line)).ne.0) read(unit=line, fmt=*) ltab2
+
+ pathNode = 'parametresVariablesStockees/variablesPrecision'
+ line = xcasReader(unitNum, pathNode)
+ if(len(trim(line)).ne.0) read(unit=line, fmt=*) ltab3
! Variables stockees
VarSto(VAR_X) = .true.
@@ -181,6 +206,60 @@ subroutine LEC_SORTIES( &
VarSto(VAR_QDEV) = .false.
endif
+ ! Precision Variables stockees
+ VarPre(VAR_X) = 4
+
+ VarPre(VAR_ZREF) = merge(ltab3(1), VarPreDefault(1), ltab3(1) >= 0 .and. ltab3(1) <= 9)
+ VarPre(VAR_RGC) = merge(ltab3(2), VarPreDefault(2), ltab3(2) >= 0 .and. ltab3(2) <= 9)
+ VarPre(VAR_RDC) = merge(ltab3(3), VarPreDefault(3), ltab3(3) >= 0 .and. ltab3(3) <= 9)
+ VarPre(VAR_CF1) = merge(ltab3(4), VarPreDefault(4), ltab3(4) >= 0 .and. ltab3(4) <= 9)
+ VarPre(VAR_CF2) = merge(ltab3(5), VarPreDefault(5), ltab3(5) >= 0 .and. ltab3(5) <= 9)
+ VarPre(VAR_Z) = merge(ltab3(6), VarPreDefault(6), ltab3(6) >= 0 .and. ltab3(6) <= 9)
+ VarPre(VAR_Q1) = merge(ltab3(7), VarPreDefault(7), ltab3(7) >= 0 .and. ltab3(7) <= 9)
+ VarPre(VAR_Q2) = merge(ltab3(8), VarPreDefault(8), ltab3(8) >= 0 .and. ltab3(8) <= 9)
+ VarPre(VAR_S1) = merge(ltab3(9), VarPreDefault(9), ltab3(9) >= 0 .and. ltab3(9) <= 9)
+ VarPre(VAR_S2) = merge(ltab3(10), VarPreDefault(10), ltab3(10) >= 0 .and. ltab3(10) <= 9)
+ VarPre(VAR_FR) = merge(ltab3(11), VarPreDefault(11), ltab3(11) >= 0 .and. ltab3(11) <= 9)
+ VarPre(VAR_BETA) = merge(ltab3(12), VarPreDefault(12), ltab3(12) >= 0 .and. ltab3(12) <= 9)
+ VarPre(VAR_B1) = merge(ltab3(13), VarPreDefault(13), ltab3(13) >= 0 .and. ltab3(13) <= 9)
+ VarPre(VAR_B2) = merge(ltab3(14), VarPreDefault(14), ltab3(14) >= 0 .and. ltab3(14) <= 9)
+ VarPre(VAR_BS) = merge(ltab3(15), VarPreDefault(15), ltab3(15) >= 0 .and. ltab3(15) <= 9)
+ VarPre(VAR_P1) = merge(ltab3(16), VarPreDefault(16), ltab3(16) >= 0 .and. ltab3(16) <= 9)
+ VarPre(VAR_P2) = merge(ltab3(17), VarPreDefault(17), ltab3(17) >= 0 .and. ltab3(17) <= 9)
+ VarPre(VAR_RH1) = merge(ltab3(18), VarPreDefault(18), ltab3(18) >= 0 .and. ltab3(18) <= 9)
+ VarPre(VAR_RH2) = merge(ltab3(19), VarPreDefault(19), ltab3(19) >= 0 .and. ltab3(19) <= 9)
+ VarPre(VAR_V1) = merge(ltab3(20), VarPreDefault(20), ltab3(20) >= 0 .and. ltab3(20) <= 9)
+ VarPre(VAR_V2) = merge(ltab3(21), VarPreDefault(21), ltab3(21) >= 0 .and. ltab3(21) <= 9)
+ VarPre(VAR_TAUF) = merge(ltab3(22), VarPreDefault(22), ltab3(22) >= 0 .and. ltab3(22) <= 9)
+ VarPre(VAR_Y) = merge(ltab3(23), VarPreDefault(23), ltab3(23) >= 0 .and. ltab3(23) <= 9)
+ VarPre(VAR_HMOY) = merge(ltab3(24), VarPreDefault(24), ltab3(24) >= 0 .and. ltab3(24) <= 9)
+ VarPre(VAR_Q2G) = merge(ltab3(25), VarPreDefault(25), ltab3(25) >= 0 .and. ltab3(25) <= 9)
+ VarPre(VAR_Q2D) = merge(ltab3(26), VarPreDefault(26), ltab3(26) >= 0 .and. ltab3(26) <= 9)
+ VarPre(VAR_SS) = merge(ltab3(27), VarPreDefault(27), ltab3(27) >= 0 .and. ltab3(27) <= 9)
+ VarPre(VAR_VOL) = merge(ltab3(28), VarPreDefault(28), ltab3(28) >= 0 .and. ltab3(28) <= 9)
+ VarPre(VAR_VOLS) = merge(ltab3(29), VarPreDefault(29), ltab3(29) >= 0 .and. ltab3(29) <= 9)
+ VarPre(VAR_CHARG) = merge(ltab3(30), VarPreDefault(30), ltab3(30) >= 0 .and. ltab3(30) <= 9)
+ VarPre(VAR_ZMAX) = merge(ltab3(31), VarPreDefault(31), ltab3(31) >= 0 .and. ltab3(31) <= 9)
+ VarPre(VAR_TZMAX) = merge(ltab3(32), VarPreDefault(32), ltab3(32) >= 0 .and. ltab3(32) <= 9)
+ VarPre(VAR_VZMAX) = merge(ltab3(33), VarPreDefault(33), ltab3(33) >= 0 .and. ltab3(33) <= 9)
+ VarPre(VAR_ZMIN) = merge(ltab3(34), VarPreDefault(34), ltab3(34) >= 0 .and. ltab3(34) <= 9)
+ VarPre(VAR_TZMIN) = merge(ltab3(35), VarPreDefault(35), ltab3(35) >= 0 .and. ltab3(35) <= 9)
+ VarPre(VAR_V1MIN) = merge(ltab3(36), VarPreDefault(36), ltab3(36) >= 0 .and. ltab3(36) <= 9)
+ VarPre(VAR_V1MAX) = merge(ltab3(37), VarPreDefault(37), ltab3(37) >= 0 .and. ltab3(37) <= 9)
+ VarPre(VAR_BMAX) = merge(ltab3(38), VarPreDefault(38), ltab3(38) >= 0 .and. ltab3(38) <= 9)
+ VarPre(VAR_TOND) = merge(ltab3(39), VarPreDefault(39), ltab3(39) >= 0 .and. ltab3(39) <= 9)
+ VarPre(VAR_QMAX) = merge(ltab3(40), VarPreDefault(40), ltab3(40) >= 0 .and. ltab3(40) <= 9)
+ VarPre(VAR_TQMAX) = merge(ltab3(41), VarPreDefault(41), ltab3(41) >= 0 .and. ltab3(41) <= 9)
+ VarPre(VAR_EMAX) = merge(ltab3(42), VarPreDefault(42), ltab3(42) >= 0 .and. ltab3(42) <= 9)
+
+
+ VarPre(VAR_QDEV) = VarPre(VAR_Q1)
+ VarPre(VAR_Q) = VarPre(VAR_Q1)
+ VarPre(VAR_Debi) = VarPre(VAR_Q1)
+ VarPre(VAR_YVRAI) = VarPre(VAR_Y)
+ VarPre(VAR_QVRAI) = VarPre(VAR_Q1)
+
+
! Variables calculees
VarCalc(VAR_X) = .true.
VarCalc(VAR_ZREF) = .true.
@@ -298,6 +377,7 @@ subroutine LEC_SORTIES( &
deallocate(ltab1)
deallocate(ltab2)
+ deallocate(ltab3)
!Erreur%arbredappel = !arbredappel_old
diff --git a/sources/mascaret/Pretrait/pretrait.f90 b/sources/mascaret/Pretrait/pretrait.f90
index 9f6ef53ccf..3f2320dc7f 100644
--- a/sources/mascaret/Pretrait/pretrait.f90
+++ b/sources/mascaret/Pretrait/pretrait.f90
@@ -51,7 +51,7 @@ subroutine PRETRAIT ( &
PremierPasStocke , &
FichierResultat, FormatResu, FichierResultat2, FormatResu2 ,&
FichierListing , &
- VarCalc, VarSto , &
+ VarCalc, VarSto, VarPre , &
OptionStockage, SectionStockage , &
LoiHydrau, FichierLoiHydrau , &
Barrage, Singularite, PCSing , &
@@ -255,6 +255,7 @@ subroutine PRETRAIT ( &
real(DOUBLE) :: ecart
logical, dimension(NB_TOT_VAR), intent( out) :: VarCalc
logical, dimension(NB_TOT_VAR), intent( out) :: VarSto
+ integer, dimension(NB_TOT_VAR), intent( out) :: VarPre
integer , intent( out) :: OptionStockage
integer, dimension(:) , pointer :: SectionStockage
integer, dimension(:) , pointer :: SectionStoTmp => null()
@@ -2041,6 +2042,7 @@ subroutine PRETRAIT ( &
call LEC_SORTIES ( &
VarSto , &
VarCalc , &
+ VarPre , &
unitNum , & ! Unite logique .xcas
Erreur & ! Erreur
)
@@ -2349,6 +2351,7 @@ subroutine PRETRAIT ( &
write(ul,*)FormatResu ! pour stock
write(ul,*)VarCalc ! pour Post
write(ul,*)VarSto ! pour post_imp et stock
+ write(ul,*)VarPre ! pour precision post_imp et stoc
write(ul,*)OptionStockage ! pour stock
write(ul,*)SectionStockage ! pour stock
diff --git a/sources/mascaret/Stock/stock.F90 b/sources/mascaret/Stock/stock.F90
index ffd310f836..77feda77d4 100644
--- a/sources/mascaret/Stock/stock.F90
+++ b/sources/mascaret/Stock/stock.F90
@@ -16,56 +16,57 @@
! along with MASCARET. If not, see <http://www.gnu.org/licenses/>
!
-subroutine STOCK ( X , &
- ZREF , &
- RGC , RDC , &
- CF1 , CF2 , &
- Z , &
- Q , &
- Q1 , Q2 , &
- DebitFlux , &
- S1 , S2 , &
- B1 , B2 , &
- BS , &
- P1 , P2 , &
- RH1 , RH2 , &
- FR , BETA , &
- TAUF , &
- Y , HMOY , &
- Q2G , Q2D , &
- VOL , VOLS , &
- CHARG , &
- SS , &
- V1 , V2 , &
- ZMAX , TZMAX , &
- VZMAX , &
- ZMIN , TZMIN , &
- V1MIN, V1MAX , &
- BMAX , &
- TOND , &
- QMAX , TQMAX , &
- EMAX , &
- YVRAI , QVRAI , &
- Qdeverse , &
- TEMPS , &
+subroutine STOCK ( X , &
+ ZREF , &
+ RGC , RDC , &
+ CF1 , CF2 , &
+ Z , &
+ Q , &
+ Q1 , Q2 , &
+ DebitFlux , &
+ S1 , S2 , &
+ B1 , B2 , &
+ BS , &
+ P1 , P2 , &
+ RH1 , RH2 , &
+ FR , BETA , &
+ TAUF , &
+ Y , HMOY , &
+ Q2G , Q2D , &
+ VOL , VOLS , &
+ CHARG , &
+ SS , &
+ V1 , V2 , &
+ ZMAX , TZMAX , &
+ VZMAX , &
+ ZMIN , TZMIN , &
+ V1MIN, V1MAX , &
+ BMAX , &
+ TOND , &
+ QMAX , TQMAX , &
+ EMAX , &
+ YVRAI , QVRAI , &
+ Qdeverse , &
+ TEMPS , &
! Modele
- Connect , &
- Casier , &
- Liaison , &
+ Connect , &
+ Casier , &
+ Liaison , &
! Parametre
- FichierResultat , &
- FichierResultat2 ,&
- FichierResultatCasier, &
- FichierResultatLiaison,&
- OptionSto , &
- FormatResu , &
- FormatResu2 , &
- PhaseSimulation , &
- PhaseStockCasier, &
- NumeroPasTemps , &
- VarSto , &
- SectionSto , &
- FichierMotCle , &
+ FichierResultat , &
+ FichierResultat2 , &
+ FichierResultatCasier , &
+ FichierResultatLiaison, &
+ OptionSto , &
+ FormatResu , &
+ FormatResu2 , &
+ PhaseSimulation , &
+ PhaseStockCasier , &
+ NumeroPasTemps , &
+ VarSto , &
+ VarPre , &
+ SectionSto , &
+ FichierMotCle , &
Erreur )
! *********************************************************************
@@ -75,7 +76,7 @@ subroutine STOCK ( X , &
! S. MANDELKERN
! D. POIZAT
!
-! VERSION : V8P4R0 EDF-CEREMA
+! VERSION : V9P1R0 EDF-CEREMA
! *********************************************************************
! FONCTION :
! --------
@@ -230,6 +231,7 @@ subroutine STOCK ( X , &
integer , intent(in ) :: PhaseSimulation, NumeroPasTemps ,&
PhaseStockCasier
logical , dimension(:) , intent(in ) :: VarSto
+ integer , dimension(:) , intent(in ) :: VarPre
integer , dimension(:) , pointer :: SectionSto
type(ERREUR_T) , intent(inout) :: Erreur
!.. Variables locales ..
@@ -257,41 +259,42 @@ subroutine STOCK ( X , &
!Erreur%arbredappel = trim(!Erreur%arbredappel)//'=>STOCK'
call INIT_VAR_SORTIE_S( &
- var_nom , &
- gdr , &
- X , &
- ZREF , &
- RGC , RDC , &
- CF1 , CF2 , &
- Z , &
- Q , &
- Q1 , Q2 , &
- DebitFlux , &
- S1 , S2 , &
- B1 , B2 , &
- BS , &
- P1 , P2 , &
- RH1 , RH2 , &
- FR , BETA , &
- TAUF , &
- Y , HMOY , &
- Q2G , Q2D , &
- VOL , VOLS , &
- CHARG , &
- SS , &
- V1 , V2 , &
- ZMAX , TZMAX, &
- VZMAX , &
- ZMIN , TZMIN, &
- V1MIN, V1MAX, &
- BMAX , &
- TOND , &
- QMAX , TQMAX, &
- EMAX , &
- YVRAI , QVRAI , &
- Qdeverse , &
- VarSto , &
- PhaseSimulation &
+ var_nom , &
+ gdr , &
+ X , &
+ ZREF , &
+ RGC , RDC , &
+ CF1 , CF2 , &
+ Z , &
+ Q , &
+ Q1 , Q2 , &
+ DebitFlux , &
+ S1 , S2 , &
+ B1 , B2 , &
+ BS , &
+ P1 , P2 , &
+ RH1 , RH2 , &
+ FR , BETA , &
+ TAUF , &
+ Y , HMOY , &
+ Q2G , Q2D , &
+ VOL , VOLS , &
+ CHARG , &
+ SS , &
+ V1 , V2 , &
+ ZMAX , TZMAX , &
+ VZMAX , &
+ ZMIN , TZMIN , &
+ V1MIN, V1MAX , &
+ BMAX , &
+ TOND , &
+ QMAX , TQMAX , &
+ EMAX , &
+ YVRAI , QVRAI , &
+ Qdeverse , &
+ VarSto , &
+ VarPre , &
+ PhaseSimulation &
)
! Traitement du probleme spatial
diff --git a/sources/mascaret/Stock/stock_rep.f90 b/sources/mascaret/Stock/stock_rep.f90
index d39967a20c..f038e06aa4 100644
--- a/sources/mascaret/Stock/stock_rep.f90
+++ b/sources/mascaret/Stock/stock_rep.f90
@@ -54,6 +54,7 @@ subroutine STOCK_REP ( X , &
! Parametre
FichierResultat , &
VarSto , &
+ VarPre , &
SectionSto , &
Erreur )
@@ -64,7 +65,7 @@ subroutine STOCK_REP ( X , &
! S. MANDELKERN
! D. POIZAT
!
-! VERSION : V8P4R0 EDF-CEREMA
+! VERSION : V9P0R0 EDF-CEREMA
! *********************************************************************
! FONCTION :
! --------
@@ -207,7 +208,8 @@ subroutine STOCK_REP ( X , &
type(CONNECT_T), intent(in ) :: Connect
! Parametres
type(FICHIER_T) , intent(in ) :: FichierResultat
- logical , dimension(:) , intent(in ) :: VarSto
+ logical , dimension(:) , intent(in ) :: VarSto
+ integer , dimension(:) , intent(in ) :: VarPre
integer , dimension(:) , pointer :: SectionSto
type(ERREUR_T) , intent(inout) :: Erreur
!.. Variables locales ..
@@ -239,40 +241,41 @@ subroutine STOCK_REP ( X , &
PhaseSimulation = 1
call INIT_VAR_SORTIE_S( &
- var_nom , &
- gdr , &
- X , &
- ZREF , &
- RGC , RDC , &
- CF1 , CF2 , &
- Z , &
- Q , &
- Q1 , Q2 , &
- DebitFlux , &
- S1 , S2 , &
- B1 , B2 , &
- BS , &
- P1 , P2 , &
- RH1 , RH2 , &
- FR , BETA , &
- TAUF , &
- Y , HMOY , &
- Q2G , Q2D , &
- VOL , VOLS , &
- CHARG , &
- SS , &
- V1 , V2 , &
- ZMAX , TZMAX, &
- VZMAX , &
- ZMIN , TZMIN, &
- V1MIN, V1MAX, &
- BMAX , &
- TOND , &
- QMAX , TQMAX, &
- EMAX , &
+ var_nom , &
+ gdr , &
+ X , &
+ ZREF , &
+ RGC , RDC , &
+ CF1 , CF2 , &
+ Z , &
+ Q , &
+ Q1 , Q2 , &
+ DebitFlux , &
+ S1 , S2 , &
+ B1 , B2 , &
+ BS , &
+ P1 , P2 , &
+ RH1 , RH2 , &
+ FR , BETA , &
+ TAUF , &
+ Y , HMOY , &
+ Q2G , Q2D , &
+ VOL , VOLS , &
+ CHARG , &
+ SS , &
+ V1 , V2 , &
+ ZMAX , TZMAX , &
+ VZMAX , &
+ ZMIN , TZMIN , &
+ V1MIN, V1MAX , &
+ BMAX , &
+ TOND , &
+ QMAX , TQMAX , &
+ EMAX , &
ZVRAI , QVRAI , &
Qdev , &
- VarSto , &
+ VarSto , &
+ VarPre , &
PhaseSimulation &
)
diff --git a/sources/mascaret/homere_mascaret.f90 b/sources/mascaret/homere_mascaret.f90
index 9203833b2c..f3d1556625 100644
--- a/sources/mascaret/homere_mascaret.f90
+++ b/sources/mascaret/homere_mascaret.f90
@@ -24,7 +24,7 @@ program HOMERE_MASCARET
! C.COULET
! F. DEMANGEON
!
-! VERSION : V8P4R0 EDF-CEREMA-ARTELIA
+! VERSION : V9P0R0 EDF-CEREMA-ARTELIA
! *********************************************************************
! Fonction : Programme Chef d'Orchestre, Execution pas a pas d'un des
! trois noyaux de calculs :
@@ -287,6 +287,7 @@ program HOMERE_MASCARET
integer :: FormatResu2
logical, dimension(NB_TOT_VAR) :: VarCalc
logical, dimension(NB_TOT_VAR) :: VarSto
+ integer, dimension(NB_TOT_VAR) :: VarPre
integer :: OptionStockage
integer, dimension(:) , pointer :: SectionStockage => null()
! Lois hydrauliques
@@ -621,7 +622,7 @@ program HOMERE_MASCARET
PremierPasStocke , &
FichierResultat, FormatResu, FichierResultat2, FormatResu2 , &
FichierListing , &
- VarCalc, VarSto , &
+ VarCalc, VarSto, VarPre , &
OptionStockage, SectionStockage , &
LoiHydrau, FichierLoiHydrau , &
Barrage, Singularite, PCSing , &
@@ -793,7 +794,6 @@ program HOMERE_MASCARET
! ALLOCATIONS ET INITIALISATIONS
!===============================
-
nb_sect = size(X)
nb_bief = size(Connect%OrigineBief)
@@ -2457,6 +2457,7 @@ program HOMERE_MASCARET
ImpressionCalcul, & ! ImpressionCalcul
Regime , & ! Regime Permanent / Non Permanent
VarCalc , & ! Variables a imprimer
+ VarPre , & ! Precision des variables a imprimer
FichierListing%Unite , & ! Unite logique listing
TempsPrecedent , & ! Temps precedent
VolBiefActif, VolBiefStockage, & ! Volumes actifs et de stockage
@@ -2543,6 +2544,7 @@ program HOMERE_MASCARET
phase_stock_casier , &
num_pas , &
VarSto , &
+ VarPre , &
SectionStockage , &
FichierMotCle , &
Erreur )
@@ -3068,43 +3070,44 @@ program HOMERE_MASCARET
!TAPENADE--
If( Noyau == NOYAU_MASCARET ) then
- call STOCK_REP ( X , &
- ZREF , &
- RGC , RDC , &
- CF1 , CF2 , &
- Z , &
- Q , &
- Q1 , Q2 , &
- DebitFlux , &
- S1 , S2 , &
- B1 , B2 , &
- BS , &
- P1 , P2 , &
- RH1 , RH2 , &
- Froude, BETA , &
- TAUF , &
- Y , HMOY , &
- Q2G , Q2D , &
- VOL , VOLS , &
- CHARG , &
- SS , &
- V1 , V2 , &
- ZMAX , TZMAX , &
- VZMAX , &
- ZMIN , TZMIN , &
- V1MIN, V1MAX , &
- BMAX , &
- TOND , &
- QMAX , TQMAX , &
- EMAX , &
- ZVRAI , QVRAI , &
- XFRON , &
- Qdeverse , &
- TEMPS , &
- Connect , &
- FichierRepriseEcr , &
- VarSto , &
- SectionStockage , &
+ call STOCK_REP ( X , &
+ ZREF , &
+ RGC , RDC , &
+ CF1 , CF2 , &
+ Z , &
+ Q , &
+ Q1 , Q2 , &
+ DebitFlux , &
+ S1 , S2 , &
+ B1 , B2 , &
+ BS , &
+ P1 , P2 , &
+ RH1 , RH2 , &
+ Froude, BETA , &
+ TAUF , &
+ Y , HMOY , &
+ Q2G , Q2D , &
+ VOL , VOLS , &
+ CHARG , &
+ SS , &
+ V1 , V2 , &
+ ZMAX , TZMAX , &
+ VZMAX , &
+ ZMIN , TZMIN , &
+ V1MIN, V1MAX , &
+ BMAX , &
+ TOND , &
+ QMAX , TQMAX , &
+ EMAX , &
+ ZVRAI , QVRAI , &
+ XFRON , &
+ Qdeverse , &
+ TEMPS , &
+ Connect , &
+ FichierRepriseEcr , &
+ VarSto , &
+ VarPre , &
+ SectionStockage , &
Erreur )
if( Erreur%Numero /= 0 ) then
write(*,321)
diff --git a/sources/mascaret/mascaret.dico b/sources/mascaret/mascaret.dico
index 9b5f02b2fe..2d168c3511 100644
--- a/sources/mascaret/mascaret.dico
+++ b/sources/mascaret/mascaret.dico
@@ -37,11 +37,11 @@ MNEMO = 'VersionCode'
CHOIX =
'1=""';
'2=""';
-'3="MASCARET V8P3 "'
+'3="MASCARET V9P1 "'
CHOIX1 =
'1=""';
'2=""';
-'3="MASCARET V8P3 "'
+'3="MASCARET V9P1 "'
RUBRIQUE = 'PARAMETRES GENERAUX';'';''
RUBRIQUE1 = 'GENERAL PARAMETERS';'';''
NIVEAU = 0
@@ -1813,8 +1813,8 @@ NO;
NO;
NO
MNEMO = 'VarCalc'
-RUBRIQUE = 'VARIABLES CALCULEES ET STOCKEES';'';''
-RUBRIQUE1 = 'VARIABLES CALCULEES ET STOCKEES';'';''
+RUBRIQUE = 'VARIABLES CALCULEES ET STOCKEES';'VARIABLES CALCULEES';''
+RUBRIQUE1 = 'VARIABLES CALCULEES ET STOCKEES';'VARIABLES CALCULATED';''
NIVEAU = 0
AIDE = 'Liste les variables a calculer'
AIDE1 = 'List variables to be computed'
@@ -1912,7 +1912,6 @@ NO;
NO;
NO;
NO
-MNEMO = 'VarSto'
NIVEAU = 0
AIDE = '
ZREF => OUI
@@ -1958,13 +1957,155 @@ QMAX => NON
TQMAX => NON
EMAX => NON'
MNEMO = 'VarSto'
-RUBRIQUE = 'VARIABLES CALCULEES ET STOCKEES';'';''
-RUBRIQUE1 = 'VARIABLES CALCULEES ET STOCKEES';'';''
+RUBRIQUE = 'VARIABLES CALCULEES ET STOCKEES';'VARIABLES STOCKEES';''
+RUBRIQUE1 = 'VARIABLES CALCULEES ET STOCKEES';'VARIABLES SAVED';''
NIVEAU = 0
AIDE = 'Liste des variables stockees'
AIDE1 = 'List of variables to be saved'
PATHNODE = 'parametresCas/parametresVariablesStockees/variablesStockees'
/
+NOM = 'VARIABLES PRECISION'
+NOM1 = 'VARIABLES PRECISION'
+TYPE = INTEGER
+INDEX = 50
+TAILLE = 42
+DEFAUT =
+4;
+4;
+4;
+0;
+0;
+3;
+3;
+3;
+2;
+2;
+5;
+2;
+2;
+2;
+2;
+2;
+2;
+2;
+2;
+4;
+4;
+6;
+3;
+3;
+2;
+2;
+2;
+0;
+0;
+2;
+2;
+1;
+4;
+2;
+1;
+4;
+4;
+2;
+1;
+2;
+1;
+3
+DEFAUT1 =
+4;
+4;
+4;
+0;
+0;
+3;
+3;
+3;
+2;
+2;
+5;
+2;
+2;
+2;
+2;
+2;
+2;
+2;
+2;
+4;
+4;
+6;
+3;
+3;
+2;
+2;
+2;
+0;
+0;
+2;
+2;
+1;
+4;
+2;
+1;
+4;
+4;
+2;
+1;
+2;
+1;
+3
+AIDE = '
+ZREF => 4
+RGC => 4
+RDC => 4
+CF1 => 0
+CF2 => 0
+Z => 3
+Q1 => 3
+Q2 => 3
+S1 => 2
+S2 => 2
+FR => 5
+BETA => 2
+B1 => 2
+B2 => 2
+BS => 2
+P1 => 2
+P2 => 2
+RH1 => 2
+RH2 => 2
+V1 => 4
+V2 => 4
+TAUF => 6
+Y => 3
+HMOY => 3
+Q2G => 2
+Q2D => 2
+SS => 2
+VOL => 0
+VOLS => 0
+CHARG => 2
+ZMAX => 2
+TZMAX => 1
+VZMAX => 4
+ZMIN => 2
+TZMIN => 1
+V1MIN => 4
+V1MAX => 4
+BMAX => 2
+TOND => 1
+QMAX => 2
+TQMAX => 1
+EMAX => 3'
+MNEMO = 'VarPre'
+RUBRIQUE = 'VARIABLES CALCULEES ET STOCKEES';'PRECISION';''
+RUBRIQUE1 = 'VARIABLES CALCULEES ET STOCKEES';'PRECISION';''
+NIVEAU = 1
+AIDE = 'Precision des variables stockees (entier entre 0 et 9)'
+AIDE1 = 'Precision of variables to be saved (integer between 0 and 9)'
+PATHNODE = 'parametresCas/parametresVariablesStockees/variablesPrecision'
+/
////////////////// PARAMETRES CONDITIONS INITIALES ////////////////////
/
NOM = 'REPRISE DE CALCUL'
--
GitLab