From 802d4bbe1ab88feb55a38e9f65b3a39ea12bb29d Mon Sep 17 00:00:00 2001
From: Quentin Rodier <quentin.rodier@meteo.fr>
Date: Wed, 14 Aug 2024 11:47:51 +0200
Subject: [PATCH] Quentin 14/08/2024: adapt test cases with modif of BACKUP
management + cleaning (profiles, LFI old files) + add new plots for recent
test cases
---
.../HPC/16JAN/PYTHON/plot_16JAN.py | 2 +-
.../HPC/16JAN/PYTHON/run_python | 0
.../HPC/16JAN/RUN/DIAG1.nam_1 | 5 +-
.../HPC/16JAN/RUN/DIAG1.nam_2 | 4 +-
.../ARMCU_LES/PYTHON/plot_ARMCU_LES_DEAR.py | 2 +-
.../ARMCU_LES/PYTHON/plot_ARMCU_LES_HM21.py | 2 +-
.../HPC/AZF_2M/007_run/EXSEG1.nam | 2 +-
.../HPC/BIOMAIDO_DMS/001_prep_pgd1/run_pgd.sh | 2 -
.../HPC/BIOMAIDO_DMS/002_prep_pgd2/run_pgd.sh | 2 -
.../003_prep_nest/run_prep_nest.sh | 2 -
.../run_prep_real_case.sh | 6 +-
.../run_prep_real_case.sh | 5 +-
.../006_mesonh_283TO3003/run_mesonh.sh | 7 +-
...plot_MEGAN_REUNION.py => plot_BIOMAIDO.py} | 0
.../BIOMAIDO_DMS/PYTHON/plot_BIOMAIDO_DMS.py | 192 ++++++++++++++++++
.../HPC/BIOMAIDO_DMS/PYTHON/run_python | 6 +-
.../HPC/BLAZE_OROG/02_mesonh/run_mesonh | 5 +-
.../HPC/BLAZE_OROG/03_python/plot_BLAZE.py | 12 +-
.../HPC/CHARMEX/NO_MEGAN/plot_chem_06.ncl | 2 +-
.../HPC/CHARMEX/NO_MEGAN/plot_chem_12.ncl | 2 +-
.../HPC/CYCLONE/RUN/run_diag | 8 +-
.../HPC/CYCLONE/RUN/run_diag2 | 13 +-
.../ADNR/01-1WT/02_RUN_EOL/run_python | 4 +-
.../02-1WT_and_Nest/04_RUN_EOL/run_python | 4 +-
.../03-2WT_Pre_and_Nest/05_RUN_EOL/run_python | 4 +-
.../02_RUN_EOL/EXSEG1.nam_SEG1 | 3 +-
.../02_RUN_EOL/EXSEG1.nam_SEG2 | 5 +-
.../02_RUN_EOL/EXSEG1.nam_SEG3 | 5 +-
.../02_RUN_EOL/EXSEG1.nam_SEG4 | 5 +-
.../ALM/02_1WT_high_res/02_RUN_EOL/run_python | 6 +-
.../ALM/03_2WT_and_Nest/04_RUN_EOL/EXSEG1.nam | 7 +-
.../ALM/03_2WT_and_Nest/04_RUN_EOL/EXSEG2.nam | 2 +-
.../ALM/03_2WT_and_Nest/04_RUN_EOL/run_mesonh | 6 +-
.../ALM/03_2WT_and_Nest/04_RUN_EOL/run_python | 6 +-
.../HPC/FANNY/PYTHON/plot_FANNY_LIMA.py | 2 +-
.../HPC/FANNY/PYTHON/plot_FANNY_LIMA_CAMS.py | 2 +-
.../FANNY/PYTHON/plot_FANNY_LIMA_v222222.py | 2 +-
.../HPC/FANNY/PYTHON/plot_ICE3.py | 2 +-
.../HPC/FANNY/PYTHON/plot_ICE3_LRED.py | 2 +-
.../HPC/FANNY/PYTHON/plot_ICE3_LRED_MOENG.py | 2 +-
.../HPC/FOG_3D/PYTHON/plot_FOG_3D_ICE3.py | 2 +-
.../FOG_3D/PYTHON/plot_FOG_3D_LIMA_ECRAD.py | 2 +-
.../FOG_3D/PYTHON/plot_FOG_3D_LIMA_v22222.py | 2 +-
.../IBM/CUBE_FLUME_4/002_mesonh/EXSEG1.nam | 4 +-
.../HPC/ICART2M/011_ncl/run_ncl | 1 +
.../HPC/IHOP/PYTHON/plot_IHOP.py | 180 ++++++++++++++++
.../HPC/IHOP/PYTHON/run_python | 5 +-
.../HPC/KMAP/PYTHON/run_python | 2 +-
.../INTEGRATION_CASES/HPC/KMAP/RUN/run_diag | 15 --
.../KW78_ELECTRICITY/003_python/run_python | 12 +-
.../HPC/PANAME/010_run/EXSEG1.nam | 3 +-
.../HPC/PANAME/010_run/EXSEG2.nam | 3 +-
.../HPC/PANAME/010_run/EXSEG3.nam | 3 +-
.../HPC/PANAME/011_python/plot_PANAME_mod1.py | 2 +-
.../HPC/PANAME/011_python/plot_PANAME_mod2.py | 2 +-
.../HPC/PANAME/011_python/plot_PANAME_mod3.py | 2 +-
.../HPC/PANAME/011_python/run_python | 2 +-
.../HPC/RECYCLING/002_mesonh/EXSEG1.nam | 4 +-
.../HPC/RECYCLING/005_MNHD2/EXSEG1.nam | 8 +-
.../HPC/RECYCLING/005_MNHD2_NORECY/EXSEG1.nam | 8 +-
.../HPC/SNOW_BLOW/PYTHON/run_python | 4 +-
.../HPC/SNOW_BLOW/PYTHON/trace_snow.py | 4 +-
.../HPC/STERAO/PYTHON/plot_STERAO.py | 2 +-
.../HPC/STERAO/PYTHON/run_python | 0
.../HPC/XYNTHIA_2.5km/PYTHON/plot_XYNTHIA.py | 2 +-
.../XYNTHIA_2.5km/PYTHON/plot_XYNTHIA_AGG4.py | 2 +-
.../HPC/XYNTHIA_2.5km/PYTHON/run_python | 0
.../LOCAL/2Drelief/003_python/run_python | 2 +-
.../LOCAL/3Drelief/002_mesonh/EXSEG1.nam | 2 +-
.../LOCAL/3Drelief/003_python/run_python | 2 +-
.../LOCAL/COLD_BUBBLE/003_python/run_python | 10 +-
MY_RUN/KTEST/005_ARM/002_mesonh/EXSEG1.nam | 4 +-
72 files changed, 490 insertions(+), 156 deletions(-)
mode change 100644 => 100755 MY_RUN/INTEGRATION_CASES/HPC/16JAN/PYTHON/run_python
rename MY_RUN/INTEGRATION_CASES/HPC/BIOMAIDO_DMS/PYTHON/{plot_MEGAN_REUNION.py => plot_BIOMAIDO.py} (100%)
create mode 100644 MY_RUN/INTEGRATION_CASES/HPC/BIOMAIDO_DMS/PYTHON/plot_BIOMAIDO_DMS.py
create mode 100644 MY_RUN/INTEGRATION_CASES/HPC/IHOP/PYTHON/plot_IHOP.py
mode change 100644 => 100755 MY_RUN/INTEGRATION_CASES/HPC/STERAO/PYTHON/run_python
mode change 100644 => 100755 MY_RUN/INTEGRATION_CASES/HPC/XYNTHIA_2.5km/PYTHON/run_python
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/16JAN/PYTHON/plot_16JAN.py b/MY_RUN/INTEGRATION_CASES/HPC/16JAN/PYTHON/plot_16JAN.py
index 250bf4279..92bae0f27 100644
--- a/MY_RUN/INTEGRATION_CASES/HPC/16JAN/PYTHON/plot_16JAN.py
+++ b/MY_RUN/INTEGRATION_CASES/HPC/16JAN/PYTHON/plot_16JAN.py
@@ -17,7 +17,7 @@ os.system('rm -f tempgraph*')
# User's parameter / Namelist
#
#
-path="../RUN/NETCDF/"
+path="../RUN/"
LnameFiles = ['16JA1.1.WENO5.004dg.nc', '16JA2.2.WENO5.002dg.nc']
Dvar_input = {
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/16JAN/PYTHON/run_python b/MY_RUN/INTEGRATION_CASES/HPC/16JAN/PYTHON/run_python
old mode 100644
new mode 100755
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/16JAN/RUN/DIAG1.nam_1 b/MY_RUN/INTEGRATION_CASES/HPC/16JAN/RUN/DIAG1.nam_1
index 6bf911357..7b7821e17 100644
--- a/MY_RUN/INTEGRATION_CASES/HPC/16JAN/RUN/DIAG1.nam_1
+++ b/MY_RUN/INTEGRATION_CASES/HPC/16JAN/RUN/DIAG1.nam_1
@@ -15,7 +15,10 @@
LCLD_COV=T,
NCAPE=1,
LRADAR=T,
- LDIAG(:)=.FALSE. /
+ LDIAG(:)=.FALSE.,
+ LISOAL=T, XISOAL(1)=9000,
+ LISOPR=T, XISOPR(1)=850, XISOPR(2)=700 /
+
&NAM_DIAG_FILE YINIFILE(1) = "16JA1.1.WENO5.004" ,
YINIFILEPGD(1) = "16JAN98_36km.neste1",
YSUFFIX='dg' /
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/16JAN/RUN/DIAG1.nam_2 b/MY_RUN/INTEGRATION_CASES/HPC/16JAN/RUN/DIAG1.nam_2
index a1e9d0337..2c4a16f7c 100644
--- a/MY_RUN/INTEGRATION_CASES/HPC/16JAN/RUN/DIAG1.nam_2
+++ b/MY_RUN/INTEGRATION_CASES/HPC/16JAN/RUN/DIAG1.nam_2
@@ -1,5 +1,7 @@
&NAM_CONFIO LCDF4=T, LLFIOUT=F, LLFIREAD=F /
-&NAM_DIAG CISO='', LVAR_RS=F, LVAR_LS=F, LVAR_PR=T, LTOTAL_PR=T /
+&NAM_DIAG CISO='', LVAR_RS=F, LVAR_LS=F, LVAR_PR=T, LTOTAL_PR=T,
+ LISOAL=T, XISOAL(1)=9000,
+ LISOPR=T, XISOPR(1)=850, XISOPR(2)=700 /
&NAM_BLANK /
&NAM_DIAG_FILE YINIFILE(1) = "16JA2.2.WENO5.002",
YINIFILEPGD(1) = "16JAN98_9km.neste1",
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/ARMCU_LES/PYTHON/plot_ARMCU_LES_DEAR.py b/MY_RUN/INTEGRATION_CASES/HPC/ARMCU_LES/PYTHON/plot_ARMCU_LES_DEAR.py
index 91a446130..e7268afa2 100644
--- a/MY_RUN/INTEGRATION_CASES/HPC/ARMCU_LES/PYTHON/plot_ARMCU_LES_DEAR.py
+++ b/MY_RUN/INTEGRATION_CASES/HPC/ARMCU_LES/PYTHON/plot_ARMCU_LES_DEAR.py
@@ -17,7 +17,7 @@ os.system('rm -f tempgraph*')
#
# User's parameter / Namelist
#
-path="../DEAR/NETCDF/"
+path="../DEAR/"
LnameFiles = ['ARM__.1.CEN4T.000.nc' ]
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/ARMCU_LES/PYTHON/plot_ARMCU_LES_HM21.py b/MY_RUN/INTEGRATION_CASES/HPC/ARMCU_LES/PYTHON/plot_ARMCU_LES_HM21.py
index 77007869c..b77373842 100644
--- a/MY_RUN/INTEGRATION_CASES/HPC/ARMCU_LES/PYTHON/plot_ARMCU_LES_HM21.py
+++ b/MY_RUN/INTEGRATION_CASES/HPC/ARMCU_LES/PYTHON/plot_ARMCU_LES_HM21.py
@@ -17,7 +17,7 @@ os.system('rm -f tempgraph*')
#
# User's parameter / Namelist
#
-path="../HM21/NETCDF/"
+path="../HM21/"
LnameFiles = ['ARM__.1.CEN4T.000.nc' ]
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/AZF_2M/007_run/EXSEG1.nam b/MY_RUN/INTEGRATION_CASES/HPC/AZF_2M/007_run/EXSEG1.nam
index 27216e2e7..fe2351580 100644
--- a/MY_RUN/INTEGRATION_CASES/HPC/AZF_2M/007_run/EXSEG1.nam
+++ b/MY_RUN/INTEGRATION_CASES/HPC/AZF_2M/007_run/EXSEG1.nam
@@ -30,7 +30,7 @@
&NAM_DYN XSEGLEN = 3600, XASSELIN = 0.2, LCORIO = T, LNUMDIFU = T,
XALKTOP = 0.003, XALZBOT = 15000. /
&NAM_NESTING NDAD(2) = 1,NDTRATIO(2) =5 ,XWAY(2) = 2. /
-&NAM_BACKUP XBAK_TIME(1,1)=0., XBAK_TIME(1,2)=60.,XBAK_TIME(1,3)=600.,XBAK_TIME(1,4)=900.,XBAK_TIME(1,5)=1800.,XBAK_TIME(1,6)=2700.,XBAK_TIME(1,7)=3600. /
+&NAM_BACKUP XBAK_TIME(1,1)=10., XBAK_TIME(1,2)=60.,XBAK_TIME(1,3)=600.,XBAK_TIME(1,4)=900.,XBAK_TIME(1,5)=1800.,XBAK_TIME(1,6)=2700.,XBAK_TIME(1,7)=3600. /
&NAM_PASPOL
LPASPOL = T ,
NRELEASE = 2 ,
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/BIOMAIDO_DMS/001_prep_pgd1/run_pgd.sh b/MY_RUN/INTEGRATION_CASES/HPC/BIOMAIDO_DMS/001_prep_pgd1/run_pgd.sh
index 5bc60bc5d..0297423bb 100755
--- a/MY_RUN/INTEGRATION_CASES/HPC/BIOMAIDO_DMS/001_prep_pgd1/run_pgd.sh
+++ b/MY_RUN/INTEGRATION_CASES/HPC/BIOMAIDO_DMS/001_prep_pgd1/run_pgd.sh
@@ -14,8 +14,6 @@ set -e
# Nom de la machine
hostname
-
-#. ~/DEV_57/MNH-PHYEX070-b95d84d7/conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-ECRAD140-MPIAUTO-O2-PIERRE
. ~/DEV_57/MNH-PHYEX070-b95d84d7/conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-ECRAD140-MPIAUTO-O2
ln -sf ~/SAVE/mesonh/PGD/* .
ln -sf ~/SAVE/EMISSIONS_MEGAN/DATA/DATA_EMIS/* .
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/BIOMAIDO_DMS/002_prep_pgd2/run_pgd.sh b/MY_RUN/INTEGRATION_CASES/HPC/BIOMAIDO_DMS/002_prep_pgd2/run_pgd.sh
index 832fc1c2c..1e6431fa7 100755
--- a/MY_RUN/INTEGRATION_CASES/HPC/BIOMAIDO_DMS/002_prep_pgd2/run_pgd.sh
+++ b/MY_RUN/INTEGRATION_CASES/HPC/BIOMAIDO_DMS/002_prep_pgd2/run_pgd.sh
@@ -14,8 +14,6 @@ set -e
# Nom de la machine
hostname
-
-#. ~/DEV_57/MNH-PHYEX070-b95d84d7/conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-ECRAD140-MPIAUTO-O2-PIERRE
. ~/DEV_57/MNH-PHYEX070-b95d84d7/conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-ECRAD140-MPIAUTO-O2
ln -sf ../001_prep_pgd1/BIOM* .
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/BIOMAIDO_DMS/003_prep_nest/run_prep_nest.sh b/MY_RUN/INTEGRATION_CASES/HPC/BIOMAIDO_DMS/003_prep_nest/run_prep_nest.sh
index 9ccb2efd7..bceedb484 100755
--- a/MY_RUN/INTEGRATION_CASES/HPC/BIOMAIDO_DMS/003_prep_nest/run_prep_nest.sh
+++ b/MY_RUN/INTEGRATION_CASES/HPC/BIOMAIDO_DMS/003_prep_nest/run_prep_nest.sh
@@ -17,13 +17,11 @@ hostname
ln -sf ../001_prep_pgd1/BIOM* .
ln -sf ../002_prep_pgd2/BIOM* .
. ~/DEV_57/MNH-PHYEX070-b95d84d7/conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-ECRAD140-MPIAUTO-O2
-#. ~/DEV_57/MNH-PHYEX070-b95d84d7/conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-ECRAD140-MPIAUTO-O2-PIERRE
export MPIRUN="Mpirun -np 1"
set -x
set -e
-
time ${MPIRUN} PREP_NEST_PGD${XYZ}
cd ../004_prep_real_case_d1
sbatch run_prep_real_case.sh
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/BIOMAIDO_DMS/004_prep_real_case_d1/run_prep_real_case.sh b/MY_RUN/INTEGRATION_CASES/HPC/BIOMAIDO_DMS/004_prep_real_case_d1/run_prep_real_case.sh
index 8d5908be0..c4071fe22 100755
--- a/MY_RUN/INTEGRATION_CASES/HPC/BIOMAIDO_DMS/004_prep_real_case_d1/run_prep_real_case.sh
+++ b/MY_RUN/INTEGRATION_CASES/HPC/BIOMAIDO_DMS/004_prep_real_case_d1/run_prep_real_case.sh
@@ -11,15 +11,11 @@ ulimit -c 0
ulimit -s unlimited
# Arrete du job des la premiere erreur
set -e
-# Nom de la machine
-hostname
-
ln -sf ../003_prep_nest/BIOM* .
ln -sf ~/SAVE/GRIB_KTEST/CAMS_20190328_* .
ln -sf ~/SAVE/GRIB_KTEST/ecmwf.OD.20190328.* .
-. ~/DEV_57/MNH-PHYEX070-b95d84d7/conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-ECRAD140-MPIAUTO-DEBUG
-#. ~/DEV_57/MNH-PHYEX070-b95d84d7/conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-ECRAD140-MPIAUTO-O2-PIERRE
+. ~/DEV_57/MNH-PHYEX070-b95d84d7/conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-ECRAD140-MPIAUTO-O2
export MPIRUN="Mpirun -np 1"
set -x
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/BIOMAIDO_DMS/005_prep_real_case_d2/run_prep_real_case.sh b/MY_RUN/INTEGRATION_CASES/HPC/BIOMAIDO_DMS/005_prep_real_case_d2/run_prep_real_case.sh
index c930a8ad4..08bb7200d 100755
--- a/MY_RUN/INTEGRATION_CASES/HPC/BIOMAIDO_DMS/005_prep_real_case_d2/run_prep_real_case.sh
+++ b/MY_RUN/INTEGRATION_CASES/HPC/BIOMAIDO_DMS/005_prep_real_case_d2/run_prep_real_case.sh
@@ -11,13 +11,10 @@ ulimit -c 0
ulimit -s unlimited
# Arrete du job des la premiere erreur
set -e
-# Nom de la machine
-hostname
-
ln -sf ../003_prep_nest/BIOM* .
ln -sf ../004_prep_real_case_d1/ECMWF* .
-. ~/DEV_57/MNH-PHYEX070-b95d84d7/conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-ECRAD140-MPIAUTO-O2-RELACS
+. ~/DEV_57/MNH-PHYEX070-b95d84d7/conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-ECRAD140-MPIAUTO-O2
export MPIRUN="Mpirun -np 1"
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/BIOMAIDO_DMS/006_mesonh_283TO3003/run_mesonh.sh b/MY_RUN/INTEGRATION_CASES/HPC/BIOMAIDO_DMS/006_mesonh_283TO3003/run_mesonh.sh
index e260899d1..bbefc8d0b 100755
--- a/MY_RUN/INTEGRATION_CASES/HPC/BIOMAIDO_DMS/006_mesonh_283TO3003/run_mesonh.sh
+++ b/MY_RUN/INTEGRATION_CASES/HPC/BIOMAIDO_DMS/006_mesonh_283TO3003/run_mesonh.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-#SBATCH -J run_megan1
+#SBATCH -J run_biomaido
#SBATCH -N 1 # nodes number (=NBP)
#SBATCH -n 64 # CPUs number (on all nodes) (=NBP*TPN)
#SBATCH -o run_megan.eo%j #
@@ -11,11 +11,8 @@ ulimit -c 0
ulimit -s unlimited
# Arrete du job des la premiere erreur
set -e
-# Nom de la machine
-hostname
-
-. ~/DEV_57/MNH-PHYEX070-b95d84d7/conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-ECRAD140-MPIAUTO-O2-RELACS
+. ~/DEV_57/MNH-PHYEX070-b95d84d7/conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-ECRAD140-MPIAUTO-O2
ln -sf ../003_prep_nest/BIOM* .
ln -sf ../004_prep_real_case_d1/ECMWF* .
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/BIOMAIDO_DMS/PYTHON/plot_MEGAN_REUNION.py b/MY_RUN/INTEGRATION_CASES/HPC/BIOMAIDO_DMS/PYTHON/plot_BIOMAIDO.py
similarity index 100%
rename from MY_RUN/INTEGRATION_CASES/HPC/BIOMAIDO_DMS/PYTHON/plot_MEGAN_REUNION.py
rename to MY_RUN/INTEGRATION_CASES/HPC/BIOMAIDO_DMS/PYTHON/plot_BIOMAIDO.py
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/BIOMAIDO_DMS/PYTHON/plot_BIOMAIDO_DMS.py b/MY_RUN/INTEGRATION_CASES/HPC/BIOMAIDO_DMS/PYTHON/plot_BIOMAIDO_DMS.py
new file mode 100644
index 000000000..3b02bd190
--- /dev/null
+++ b/MY_RUN/INTEGRATION_CASES/HPC/BIOMAIDO_DMS/PYTHON/plot_BIOMAIDO_DMS.py
@@ -0,0 +1,192 @@
+#!/usr/bin/env python3
+"""
+@author: Quentin Rodier
+Creation : 07/01/2021
+
+Last modifications
+"""
+import matplotlib as mpl
+mpl.use('Agg')
+import cartopy.crs as ccrs
+try:
+ import MNHPy
+ from MNHPy.read_MNHfile import read_netcdf
+ from MNHPy.Panel_Plot import PanelPlot
+except:
+ from read_MNHfile import read_netcdf
+ from Panel_Plot import PanelPlot
+import os
+
+Lpath=["../006_mesonh_283TO3003/"]
+LnameFiles=['A2830.1.MEGAD.006.nc']
+
+variables=['CO','O3','NO2','NO','BIOP','HCHO','BIO','latitude','longitude',
+ 'ETH', 'CARBO','PHO','SO2','SULF','DMS','CH4','XO2','PAN',
+ 'DEAERM31C','DEAERM32C','DEAERM31R','DEAERM32R',
+ 'SLTM01','SLTM02','SLTM03','SLTM04','SLTM05','SLTM06','SLTM07','SLTM08']
+Dvar_input = {'f1': variables}
+
+# Read the variables in the files
+Dvar = {}
+Dvar = read_netcdf(LnameFiles, Dvar_input, path=Lpath, removeHALO=True, get_data_only=True)
+
+os.system('rm -f tempgraph*')
+
+f=Dvar['f1']
+nb_subplot=4
+
+lon = [Dvar['f1']['longitude']]*nb_subplot
+lat = [Dvar['f1']['latitude']]*nb_subplot
+Lxlab = ['longitude']*nb_subplot
+Lylab = ['latitude']*nb_subplot
+Lprojection = [ccrs.PlateCarree()]*nb_subplot
+Llvl = [0]*nb_subplot
+
+################################################################
+######### PANEL 1
+###############################################################
+Panel = PanelPlot(2,2, [20,20],'KTEST MEGAN Reunion K=0', minmaxpad=1.05)
+
+Lplot=[f['BIOP'],f['BIO'],f['CO'],f['HCHO']]
+Ltitle = ['BIOP','BIO','CO','HCHO']
+Lminval=[0, 0, 30, 0.001 ]
+Lmaxval=[15.0, 1000, 110, 1 ]
+Lstep=[0.25, 20, 2, 0.04 ]
+Lstepticks=[1, 100, 10, 0.1 ]
+Lfacconv=[1E12,1E12,1E9,1E9 ]
+Lcbarlabel = ['ppt','ppt','ppb','ppb']*nb_subplot
+LaddWhite_cm=[True]*len(Lplot)
+Lcolormap = ['gist_rainbow_r']*len(Lplot)
+
+fig = Panel.psectionH(lon=lon, lat=lat, Lvar=Lplot, Llevel=Llvl, Lxlab=Lxlab, Lylab=Lylab, Ltitle=Ltitle, Lminval=Lminval, Lmaxval=Lmaxval, Lcarte=[54.5,56,-22,-20],
+ Lstep=Lstep, Lstepticks=Lstepticks, Lcolormap=Lcolormap, Lcbarlabel=Lcbarlabel, Lproj=Lprojection, Lfacconv=Lfacconv, LaddWhite_cm=LaddWhite_cm)
+
+Panel.save_graph(1,fig)
+
+################################################################
+######### PANEL 2
+###############################################################
+Panel = PanelPlot(2,2, [20,20],'KTEST MEGAN Reunion K=0', minmaxpad=1.05)
+
+Lplot=[f['O3'],f['NO2'],f['NO'],f['ETH']]
+Ltitle = ['O3','NO2','NO','ETH']
+Lminval=[15, 0, 30, 125 ]
+Lmaxval=[25.0, 1000, 1000, 175 ]
+Lstep=[0.1, 20, 20, 0.25 ]
+Lstepticks=[1, 100, 100, 5 ]
+Lfacconv=[1E9,1E12,1E12,1E12 ]
+Lcbarlabel = ['ppb','ppt','ppt','ppt']*nb_subplot
+LaddWhite_cm=[True]*len(Lplot)
+Lcolormap = ['gist_rainbow_r']*len(Lplot)
+
+fig = Panel.psectionH(lon=lon, lat=lat, Lvar=Lplot, Llevel=Llvl, Lxlab=Lxlab, Lylab=Lylab, Ltitle=Ltitle, Lminval=Lminval, Lmaxval=Lmaxval, Lcarte=[54.5,56,-22,-20],
+ Lstep=Lstep, Lstepticks=Lstepticks, Lcolormap=Lcolormap, Lcbarlabel=Lcbarlabel, Lproj=Lprojection, Lfacconv=Lfacconv, LaddWhite_cm=LaddWhite_cm)
+
+Panel.save_graph(2,fig)
+
+################################################################
+######### PANEL 3
+###############################################################
+Panel = PanelPlot(2,2, [20,20],'KTEST MEGAN Reunion K=0', minmaxpad=1.05)
+
+Lplot=[f['CARBO'],f['PHO'],f['SO2'],f['SULF']]
+Ltitle = ['CARBO','PHO','SO2','SULF']
+Lminval=[0, 0, 50, 0 ]
+Lmaxval=[400, 0.7, 1000, 1 ]
+Lstep=[5, 0.01, 10, 0.01 ]
+Lstepticks=[100, 0.1, 100, 0.1 ]
+Lfacconv=[1E12,1E12,1E12,1E12 ]
+Lcbarlabel = ['ppt','ppt','ppt','ppt']*nb_subplot
+LaddWhite_cm=[True]*len(Lplot)
+Lcolormap = ['gist_rainbow_r']*len(Lplot)
+
+fig = Panel.psectionH(lon=lon, lat=lat, Lvar=Lplot, Llevel=Llvl, Lxlab=Lxlab, Lylab=Lylab, Ltitle=Ltitle, Lminval=Lminval, Lmaxval=Lmaxval, Lcarte=[54.5,56,-22,-20],
+ Lstep=Lstep, Lstepticks=Lstepticks, Lcolormap=Lcolormap, Lcbarlabel=Lcbarlabel, Lproj=Lprojection, Lfacconv=Lfacconv, LaddWhite_cm=LaddWhite_cm)
+
+Panel.save_graph(3,fig)
+
+
+################################################################
+######### PANEL 4
+###############################################################
+Panel = PanelPlot(2,2, [20,20],'KTEST MEGAN Reunion K=0', minmaxpad=1.05)
+
+Lplot=[f['DMS'],f['CH4'],f['XO2'],f['PAN']]
+Ltitle = ['DMS','CH4','XO2','PAN']
+Lminval=[0, 0, 0.1, 0 ]
+Lmaxval=[300, 0.1, 0.6, 500 ]
+Lstep=[2, 0.001, 0.01, 5 ]
+Lstepticks=[50, 0.01, 0.1, 100 ]
+Lfacconv=[1E12,1E12,1E12,1E12 ]
+Lcbarlabel = ['ppt','ppt','ppt','ppt']*nb_subplot
+LaddWhite_cm=[True]*len(Lplot)
+Lcolormap = ['gist_rainbow_r']*len(Lplot)
+
+fig = Panel.psectionH(lon=lon, lat=lat, Lvar=Lplot, Llevel=Llvl, Lxlab=Lxlab, Lylab=Lylab, Ltitle=Ltitle, Lminval=Lminval, Lmaxval=Lmaxval, Lcarte=[54.5,56,-22,-20],
+ Lstep=Lstep, Lstepticks=Lstepticks, Lcolormap=Lcolormap, Lcbarlabel=Lcbarlabel, Lproj=Lprojection, Lfacconv=Lfacconv, LaddWhite_cm=LaddWhite_cm)
+
+Panel.save_graph(4,fig)
+
+################################################################
+######### PANEL 5
+###############################################################
+Panel = PanelPlot(2,2, [20,20],'KTEST MEGAN Reunion K=0', minmaxpad=1.05)
+
+Lplot=[f['DEAERM31C'],f['DEAERM32C'],f['DEAERM31R'],f['DEAERM32R']]
+Ltitle = ['DEAERM31C','DEAERM32C','DEAERM31R','DEAERM32R']
+Lminval=[0, 0, 0, 0 ]
+Lmaxval=[10, 40, 1, 1 ]
+Lstep=[0.005, ]*4
+Lstepticks=[0.5 ]*4
+Lfacconv=[1E12,1E12,1E12,1E12 ]
+Lcbarlabel = ['ppt','ppt','ppt','ppt']*nb_subplot
+LaddWhite_cm=[True]*len(Lplot)
+Lcolormap = ['gist_rainbow_r']*len(Lplot)
+
+fig = Panel.psectionH(lon=lon, lat=lat, Lvar=Lplot, Llevel=Llvl, Lxlab=Lxlab, Lylab=Lylab, Ltitle=Ltitle, Lminval=Lminval, Lmaxval=Lmaxval, Lcarte=[54.5,56,-22,-20],
+ Lstep=Lstep, Lstepticks=Lstepticks, Lcolormap=Lcolormap, Lcbarlabel=Lcbarlabel, Lproj=Lprojection, Lfacconv=Lfacconv, LaddWhite_cm=LaddWhite_cm)
+
+Panel.save_graph(5,fig)
+
+################################################################
+######### PANEL 6
+###############################################################
+Panel = PanelPlot(2,2, [20,20],'KTEST MEGAN Reunion K=0', minmaxpad=1.05)
+
+Lplot=[f['SLTM01'],f['SLTM02'],f['SLTM03'],f['SLTM04']]
+Ltitle = ['SLTM01','SLTM02','SLTM03','SLTM04']
+Lminval=[0]*4
+Lmaxval=[3]*4
+Lstep=[0.01 ]*4
+Lstepticks=[1 ]*4
+Lfacconv=[1E18,1E18,1E18,1E18 ]
+Lcbarlabel = ['1E-6 ppt','1E-6 ppt','1E-6 ppt','1E-6 ppt']*nb_subplot
+LaddWhite_cm=[True]*len(Lplot)
+Lcolormap = ['gist_rainbow_r']*len(Lplot)
+
+fig = Panel.psectionH(lon=lon, lat=lat, Lvar=Lplot, Llevel=Llvl, Lxlab=Lxlab, Lylab=Lylab, Ltitle=Ltitle, Lminval=Lminval, Lmaxval=Lmaxval, Lcarte=[54.5,56,-22,-20],
+ Lstep=Lstep, Lstepticks=Lstepticks, Lcolormap=Lcolormap, Lcbarlabel=Lcbarlabel, Lproj=Lprojection, Lfacconv=Lfacconv, LaddWhite_cm=LaddWhite_cm)
+
+Panel.save_graph(6,fig)
+
+################################################################
+######### PANEL 7
+###############################################################
+Panel = PanelPlot(2,2, [20,20],'KTEST MEGAN Reunion K=0', minmaxpad=1.05)
+
+Lplot=[f['SLTM05'],f['SLTM06'],f['SLTM07'],f['SLTM08']]
+Ltitle = ['SLTM05','SLTM06','SLTM07','SLTM08']
+Lminval=[0 ]*4
+Lmaxval=[1 ]*4
+Lstep=[0.01 ]*4
+Lstepticks=[0.1 ]*4
+Lfacconv=[1E18,1E21,1E21,1E21 ]
+Lcbarlabel = ['1E-6 ppt','1E-9 ppt','1E-9 ppt','1E-9 ppt']*nb_subplot
+LaddWhite_cm=[True]*len(Lplot)
+Lcolormap = ['gist_rainbow_r']*len(Lplot)
+
+fig = Panel.psectionH(lon=lon, lat=lat, Lvar=Lplot, Llevel=Llvl, Lxlab=Lxlab, Lylab=Lylab, Ltitle=Ltitle, Lminval=Lminval, Lmaxval=Lmaxval, Lcarte=[54.5,56,-22,-20],
+ Lstep=Lstep, Lstepticks=Lstepticks, Lcolormap=Lcolormap, Lcbarlabel=Lcbarlabel, Lproj=Lprojection, Lfacconv=Lfacconv, LaddWhite_cm=LaddWhite_cm)
+
+Panel.save_graph(7,fig)
+
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/BIOMAIDO_DMS/PYTHON/run_python b/MY_RUN/INTEGRATION_CASES/HPC/BIOMAIDO_DMS/PYTHON/run_python
index 0ab392102..8861bc8c4 100755
--- a/MY_RUN/INTEGRATION_CASES/HPC/BIOMAIDO_DMS/PYTHON/run_python
+++ b/MY_RUN/INTEGRATION_CASES/HPC/BIOMAIDO_DMS/PYTHON/run_python
@@ -11,12 +11,12 @@ ulimit -s unlimited
# Arrete du job des la premiere erreur
set -e
-. ~rodierq/DEV_57/MNH-PHYEX070-b95d84d7/conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-ECRAD140-MPIAUTO-O2-PIERRE
+. ~rodierq/DEV_57/MNH-git_open_source-lfs-0a57991/conf/profile_mesonh-LXifort-R8I4-MNH-V5-7-0-ECRAD140-MPIAUTO-O2
ln -sf ${SRC_MESONH}/src/LIB/Python/* .
module purge
module load python/3.7.6
-python3 plot_MEGAN_REUNION.py
-convert *.png MEGAN_REUNION.pdf
+python3 plot_BIOMAIDO_DMS.py
+convert *.png BIOMAIDO_DMS.pdf
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/BLAZE_OROG/02_mesonh/run_mesonh b/MY_RUN/INTEGRATION_CASES/HPC/BLAZE_OROG/02_mesonh/run_mesonh
index 45ad45928..30c47021c 100755
--- a/MY_RUN/INTEGRATION_CASES/HPC/BLAZE_OROG/02_mesonh/run_mesonh
+++ b/MY_RUN/INTEGRATION_CASES/HPC/BLAZE_OROG/02_mesonh/run_mesonh
@@ -19,12 +19,15 @@ export MPIRUN="Mpirun -np 128"
set -x
set -e
+
+# Prepare the Fuel map (input of the MESONH step)
#module purge
#module load python/3.7.6
-
#python3 fuelmap.py
#module purge
+ln -sf ~rodierq/SAVE/GRIB_KTEST/Fuel* .
+
. ~rodierq/DEV_57/MNH-PHYEX070-b95d84d7/conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-ECRAD140-MPIAUTO-O2
ln -sf ../01_prep_ideal_case/PGDFireTest.* .
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/BLAZE_OROG/03_python/plot_BLAZE.py b/MY_RUN/INTEGRATION_CASES/HPC/BLAZE_OROG/03_python/plot_BLAZE.py
index 062f8133e..d6250d98a 100644
--- a/MY_RUN/INTEGRATION_CASES/HPC/BLAZE_OROG/03_python/plot_BLAZE.py
+++ b/MY_RUN/INTEGRATION_CASES/HPC/BLAZE_OROG/03_python/plot_BLAZE.py
@@ -43,10 +43,10 @@ Ltitle = ['u', 'v','w','théta',]
Lcbarlabel = ['m/s','m/s','m/s','K']
Lxlab = ['x (m)']*len(Lplot)
Lylab = ['y (m)']*len(Lplot)
-Lminval = [-1.5, -3.5, -1.5, 286]
-Lmaxval = [3.5,3.5,1.5,300]
-Lstep = [0.1,0.1,0.1,0.25]
-Lstepticks = [0.5,0.5,0.5,1]
+Lminval = [-1.5, -3.5, -1.5, 299]
+Lmaxval = [3.5,3.5,1.5,300.5]
+Lstep = [0.1,0.1,0.1,0.05]
+Lstepticks = [0.5,0.5,0.5,0.25]
Lfacconv = [1]*len(Lplot)
Lcolormap = ['gist_rainbow_r','RdBu_r','RdBu_r','gist_rainbow_r']*len(Lplot)
Llvl = [1]*len(Lplot)
@@ -66,8 +66,8 @@ Panel1.save_graph(1,fig1)
Panel1 = PanelPlot(2,2, [25,15],'K=28', titlepad=25, minmaxpad=1.04, timepad=-0.07, colorbarpad=0.01)
Llvl = [28]*len(Lplot)
-Lminval = [-2, -2., -1.5, 285]
-Lmaxval = [4,2.,4,288]
+Lminval = [-2, -2., -1.5, 299.5]
+Lmaxval = [4,2.,4,302.5]
Lstep = [0.1,0.1,0.1,0.05]
fig2 = Panel1.psectionH(lon=LaxeX, lat=LaxeY, Lvar=Lplot, Llevel=Llvl, Lxlab=Lxlab, Lylab=Lylab, Ltitle=Ltitle, Lminval=Lminval, Lmaxval=Lmaxval,
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/CHARMEX/NO_MEGAN/plot_chem_06.ncl b/MY_RUN/INTEGRATION_CASES/HPC/CHARMEX/NO_MEGAN/plot_chem_06.ncl
index 841c2a0a3..e98545ff0 100644
--- a/MY_RUN/INTEGRATION_CASES/HPC/CHARMEX/NO_MEGAN/plot_chem_06.ncl
+++ b/MY_RUN/INTEGRATION_CASES/HPC/CHARMEX/NO_MEGAN/plot_chem_06.ncl
@@ -8,7 +8,7 @@ begin
; open file and read in data
;=================================================;
- a = addfile("../RUN/OUTFILES/CHARM.1.SEG02.003.nc", "r")
+ a = addfile("OUTFILES/CHARM.1.SEG02.003.nc", "r")
;=================================================;
; Get informations on variable sizes
; dims are dims-2 to remove non-physical values
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/CHARMEX/NO_MEGAN/plot_chem_12.ncl b/MY_RUN/INTEGRATION_CASES/HPC/CHARMEX/NO_MEGAN/plot_chem_12.ncl
index b719a6f61..c39cfd4d3 100644
--- a/MY_RUN/INTEGRATION_CASES/HPC/CHARMEX/NO_MEGAN/plot_chem_12.ncl
+++ b/MY_RUN/INTEGRATION_CASES/HPC/CHARMEX/NO_MEGAN/plot_chem_12.ncl
@@ -8,7 +8,7 @@ begin
; open file and read in data
;=================================================;
- a = addfile("../RUN/OUTFILES/CHARM.1.SEG02.009.nc", "r")
+ a = addfile("OUTFILES/CHARM.1.SEG02.009.nc", "r")
;=================================================;
; Get informations on variable sizes
; dims are dims-2 to remove non-physical values
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/CYCLONE/RUN/run_diag b/MY_RUN/INTEGRATION_CASES/HPC/CYCLONE/RUN/run_diag
index 9b1253298..b04b847be 100755
--- a/MY_RUN/INTEGRATION_CASES/HPC/CYCLONE/RUN/run_diag
+++ b/MY_RUN/INTEGRATION_CASES/HPC/CYCLONE/RUN/run_diag
@@ -28,7 +28,7 @@ for ECH in '001' '002' '003' '004' '005' '006' '007' '008' '009' '010'
do
cat > DIAG1.nam << EOF
-&NAM_CONFIO LCDF4=T LLFIOUT=T LLFIREAD=T /
+&NAM_CONFIO LCDF4=T LLFIOUT=F LLFIREAD=F /
&NAM_DIAG
CISO='PREVTK',
LVAR_RS=T,
@@ -46,16 +46,10 @@ rm -f REFid.1.D70Ca.${ECH}type.???
time ${MPIRUN} DIAG${XYZ}
mv OUTPUT_LISTING0 OUTPUT_LISTING0_diagA.${ECH}
mv OUTPUT_LISTING1 OUTPUT_LISTING1_diagA.${ECH}
-ls -lrt
-
done
-
rm -f file_for_xtransfer pipe_name
rm -f DIAG1.nam
-
-ls -lrt
-
sbatch run_diag2
ja
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/CYCLONE/RUN/run_diag2 b/MY_RUN/INTEGRATION_CASES/HPC/CYCLONE/RUN/run_diag2
index e15573037..0f523c19b 100755
--- a/MY_RUN/INTEGRATION_CASES/HPC/CYCLONE/RUN/run_diag2
+++ b/MY_RUN/INTEGRATION_CASES/HPC/CYCLONE/RUN/run_diag2
@@ -28,7 +28,7 @@ for ECH in '001' '002' '003' '004' '005' '006' '007' '008'
do
cat > DIAG1.nam << EOF
-&NAM_CONFIO LCDF4=T LLFIOUT=T LLFIREAD=T /
+&NAM_CONFIO LCDF4=T LLFIOUT=F LLFIREAD=F /
&NAM_DIAG
CISO='PREVTK',
LVAR_RS=T,
@@ -46,22 +46,11 @@ rm -f REFid.1.D70Cb.${ECH}type.???
time ${MPIRUN} DIAG${XYZ}
mv OUTPUT_LISTING0 OUTPUT_LISTING0_diagB.${ECH}
mv OUTPUT_LISTING1 OUTPUT_LISTING1_diagB.${ECH}
-ls -lrt
-
done
-
rm -f DIAG1.nam
rm -f file_for_xtransfer pipe_name
-
-ls -lrt
-mkdir OUTPUT
-mv OUTPUT_L* OUTPUT
-mkdir LFI
-mv *.lfi LFI/.
-mv *.des LFI/.
ja
-
cd ../PYTHON
sbatch run_python
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/01-1WT/02_RUN_EOL/run_python b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/01-1WT/02_RUN_EOL/run_python
index 6dfceec3c..4278bac93 100755
--- a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/01-1WT/02_RUN_EOL/run_python
+++ b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/01-1WT/02_RUN_EOL/run_python
@@ -9,6 +9,6 @@
module load python/2.7.17
rm -f *.png
-python eol_2D_fields.py DTU10.1.SEG1.003.nc UT
-python eol_2D_fields.py DTU10.1.SEG1.003.nc UMME
+python eol_2D_fields.py DTU10.1.SEG1.002.nc UT
+python eol_2D_fields.py DTU10.1.SEG1.002.nc UMME
convert *.png ADNR_1WT.pdf
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/02-1WT_and_Nest/04_RUN_EOL/run_python b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/02-1WT_and_Nest/04_RUN_EOL/run_python
index 664c9e6ff..8516f1322 100755
--- a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/02-1WT_and_Nest/04_RUN_EOL/run_python
+++ b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/02-1WT_and_Nest/04_RUN_EOL/run_python
@@ -8,7 +8,7 @@
module load python/2.7.17
rm *.png
-python eol_2D_fields.py DTU10.2.SEG1.003.nc UT
-python eol_2D_fields.py DTU10.2.SEG1.003.nc UMME
+python eol_2D_fields.py DTU10.2.SEG1.002.nc UT
+python eol_2D_fields.py DTU10.2.SEG1.002.nc UMME
convert *.png ADNR_1WT_Nest.pdf
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/03-2WT_Pre_and_Nest/05_RUN_EOL/run_python b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/03-2WT_Pre_and_Nest/05_RUN_EOL/run_python
index 90844e799..75027b4f4 100755
--- a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/03-2WT_Pre_and_Nest/05_RUN_EOL/run_python
+++ b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ADNR/03-2WT_Pre_and_Nest/05_RUN_EOL/run_python
@@ -10,7 +10,7 @@ module purge
module load python/2.7.17
rm *.png
-python eol_2D_fields.py DTU10.2.SEG1.003.nc UT
-python eol_2D_fields.py DTU10.2.SEG1.003.nc UMME
+python eol_2D_fields.py DTU10.2.SEG1.002.nc UT
+python eol_2D_fields.py DTU10.2.SEG1.002.nc UMME
convert *.png ADNR_2WT_PreNest.pdf
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ALM/02_1WT_high_res/02_RUN_EOL/EXSEG1.nam_SEG1 b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ALM/02_1WT_high_res/02_RUN_EOL/EXSEG1.nam_SEG1
index 6b3085083..d8206628a 100755
--- a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ALM/02_1WT_high_res/02_RUN_EOL/EXSEG1.nam_SEG1
+++ b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ALM/02_1WT_high_res/02_RUN_EOL/EXSEG1.nam_SEG1
@@ -93,5 +93,4 @@
LTECOUTPTS = .FALSE./
-&NAM_BACKUP XBAK_TIME(1,1) = 0.0,
- XBAK_TIME(1,2) = 100.0/
+&NAM_BACKUP XBAK_TIME(1,1) = 100.0/
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ALM/02_1WT_high_res/02_RUN_EOL/EXSEG1.nam_SEG2 b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ALM/02_1WT_high_res/02_RUN_EOL/EXSEG1.nam_SEG2
index a81bfdd7d..253aef77a 100755
--- a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ALM/02_1WT_high_res/02_RUN_EOL/EXSEG1.nam_SEG2
+++ b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ALM/02_1WT_high_res/02_RUN_EOL/EXSEG1.nam_SEG2
@@ -1,4 +1,4 @@
-&NAM_LUNITn CINIFILE = "DTU10.1.SEG1.002",
+&NAM_LUNITn CINIFILE = "DTU10.1.SEG1.001",
CINIFILEPGD = "FIRE_PGD"/
&NAM_CONFIO LCDF4 = T,
@@ -95,5 +95,4 @@
LTECOUTPTS = .FALSE./
-&NAM_BACKUP XBAK_TIME(1,1) = 0.0,
- XBAK_TIME(1,2) = 100.0/
+&NAM_BACKUP XBAK_TIME(1,1) = 100.0/
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ALM/02_1WT_high_res/02_RUN_EOL/EXSEG1.nam_SEG3 b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ALM/02_1WT_high_res/02_RUN_EOL/EXSEG1.nam_SEG3
index 60ee3bb16..7e1790573 100755
--- a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ALM/02_1WT_high_res/02_RUN_EOL/EXSEG1.nam_SEG3
+++ b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ALM/02_1WT_high_res/02_RUN_EOL/EXSEG1.nam_SEG3
@@ -1,4 +1,4 @@
-&NAM_LUNITn CINIFILE = "DTU10.1.SEG2.002",
+&NAM_LUNITn CINIFILE = "DTU10.1.SEG2.001",
CINIFILEPGD = "FIRE_PGD"/
&NAM_CONFIO LCDF4 = T,
@@ -95,5 +95,4 @@
LTECOUTPTS = .FALSE./
-&NAM_BACKUP XBAK_TIME(1,1) = 0.0,
- XBAK_TIME(1,2) = 100.0/
+&NAM_BACKUP XBAK_TIME(1,1) = 100.0/
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ALM/02_1WT_high_res/02_RUN_EOL/EXSEG1.nam_SEG4 b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ALM/02_1WT_high_res/02_RUN_EOL/EXSEG1.nam_SEG4
index d664ee4eb..1bc7a99f4 100755
--- a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ALM/02_1WT_high_res/02_RUN_EOL/EXSEG1.nam_SEG4
+++ b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ALM/02_1WT_high_res/02_RUN_EOL/EXSEG1.nam_SEG4
@@ -1,4 +1,4 @@
-&NAM_LUNITn CINIFILE = "DTU10.1.SEG3.002",
+&NAM_LUNITn CINIFILE = "DTU10.1.SEG3.001",
CINIFILEPGD = "FIRE_PGD"/
&NAM_CONFIO LCDF4 = T,
@@ -95,5 +95,4 @@
LTECOUTPTS = .FALSE./
-&NAM_BACKUP XBAK_TIME(1,1) = 0.0,
- XBAK_TIME(1,2) = 6.25/
+&NAM_BACKUP XBAK_TIME(1,1) = 6.25/
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ALM/02_1WT_high_res/02_RUN_EOL/run_python b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ALM/02_1WT_high_res/02_RUN_EOL/run_python
index cbd7f9578..6d43100a8 100755
--- a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ALM/02_1WT_high_res/02_RUN_EOL/run_python
+++ b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ALM/02_1WT_high_res/02_RUN_EOL/run_python
@@ -8,8 +8,8 @@
module load python/2.7.17
rm -f *.png
-python eol_2D_fields.py DTU10.1.SEG4.002.nc UT
-python eol_2D_fields.py DTU10.1.SEG4.002.nc UMME
-python eol_aerodyn_var.py DTU10.1.SEG4.002.nc
+python eol_2D_fields.py DTU10.1.SEG4.001.nc UT
+python eol_2D_fields.py DTU10.1.SEG4.001.nc UMME
+python eol_aerodyn_var.py DTU10.1.SEG4.001.nc
convert *.png ALM_1WT_HighRes.pdf
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ALM/03_2WT_and_Nest/04_RUN_EOL/EXSEG1.nam b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ALM/03_2WT_and_Nest/04_RUN_EOL/EXSEG1.nam
index 5f8e8bd52..e2ca260be 100755
--- a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ALM/03_2WT_and_Nest/04_RUN_EOL/EXSEG1.nam
+++ b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ALM/03_2WT_and_Nest/04_RUN_EOL/EXSEG1.nam
@@ -1,4 +1,4 @@
-&NAM_LUNITn CINIFILE = "FIRE_.1.SEG1.003",
+&NAM_LUNITn CINIFILE = "FIRE_.1.SEG1.002",
CINIFILEPGD = "FIRE_PGD"/
&NAM_CONFIO LCDF4 = T,
@@ -85,6 +85,5 @@
NDTRATIO(2) = 10,
XWAY(2) = 2/
-&NAM_BACKUP XBAK_TIME(2,1) = 0.0,
- XBAK_TIME(2,2) = 1800.0,
- XBAK_TIME(2,3) = 2400.0/
+&NAM_BACKUP XBAK_TIME(2,1) = 1800.0,
+ XBAK_TIME(2,2) = 2400.0/
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ALM/03_2WT_and_Nest/04_RUN_EOL/EXSEG2.nam b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ALM/03_2WT_and_Nest/04_RUN_EOL/EXSEG2.nam
index 26ad31a70..a686ed6da 100755
--- a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ALM/03_2WT_and_Nest/04_RUN_EOL/EXSEG2.nam
+++ b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ALM/03_2WT_and_Nest/04_RUN_EOL/EXSEG2.nam
@@ -1,4 +1,4 @@
-&NAM_LUNITn CINIFILE = "FIRE_.2.SEG1.003",
+&NAM_LUNITn CINIFILE = "FIRE_.2.SEG1.002",
CINIFILEPGD = "FIRE_INI.spa00"/
&NAM_DYNn XTSTEP = 0.1,
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ALM/03_2WT_and_Nest/04_RUN_EOL/run_mesonh b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ALM/03_2WT_and_Nest/04_RUN_EOL/run_mesonh
index 74f77fd91..fddef8bb0 100755
--- a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ALM/03_2WT_and_Nest/04_RUN_EOL/run_mesonh
+++ b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ALM/03_2WT_and_Nest/04_RUN_EOL/run_mesonh
@@ -14,7 +14,7 @@ set -e
# Nom de la machine
hostname
-. ~rodierq/DEV_57/MNH-PHYEX070-b95d84d7/conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-ECRAD140-MPIAUTO-O2
+. ~rodierq/DEV_57/MNH-git_open_source-lfs-0a57991/conf/profile_mesonh-LXifort-R8I4-MNH-V5-7-0-ECRAD140-MPIAUTO-O2
export MPIRUN="Mpirun -np 256"
@@ -23,8 +23,8 @@ set -e
ln -sf ../01_PREP/FIRE_* .
ln -sf ../02_SPAWN/FIRE_INI.spa* .
-ln -sf ../03_RUN_PRE/FIRE_.1.SEG1.003* .
-ln -sf ../03_RUN_PRE/FIRE_.2.SEG1.003* .
+ln -sf ../03_RUN_PRE/FIRE_.1.SEG1.002* .
+ln -sf ../03_RUN_PRE/FIRE_.2.SEG1.002* .
time ${MPIRUN} MESONH${XYZ}
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ALM/03_2WT_and_Nest/04_RUN_EOL/run_python b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ALM/03_2WT_and_Nest/04_RUN_EOL/run_python
index 50b66b4bc..ebb571f93 100755
--- a/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ALM/03_2WT_and_Nest/04_RUN_EOL/run_python
+++ b/MY_RUN/INTEGRATION_CASES/HPC/EOLIENNE/ALM/03_2WT_and_Nest/04_RUN_EOL/run_python
@@ -9,8 +9,8 @@
module load python/2.7.17
rm -f *.png
-python eol_2D_fields.py DTU10.2.SEG1.003.nc UT
-python eol_2D_fields.py DTU10.2.SEG1.003.nc UMME
-python eol_aerodyn_var.py DTU10.2.SEG1.003.nc
+python eol_2D_fields.py DTU10.2.SEG1.002.nc UT
+python eol_2D_fields.py DTU10.2.SEG1.002.nc UMME
+python eol_aerodyn_var.py DTU10.2.SEG1.002.nc
convert *.png ALM_2WT_Nest.pdf
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/FANNY/PYTHON/plot_FANNY_LIMA.py b/MY_RUN/INTEGRATION_CASES/HPC/FANNY/PYTHON/plot_FANNY_LIMA.py
index 7c284e63a..4e52235f7 100644
--- a/MY_RUN/INTEGRATION_CASES/HPC/FANNY/PYTHON/plot_FANNY_LIMA.py
+++ b/MY_RUN/INTEGRATION_CASES/HPC/FANNY/PYTHON/plot_FANNY_LIMA.py
@@ -20,7 +20,7 @@ os.system('rm -f tempgraph*')
# User's parameter / Namelist
#
path="../LIMA/"
-LnameFiles = ['FANNY.1.WENO5.025.nc']
+LnameFiles = ['FANNY.1.WENO5.024.nc']
Dvar_input = {
'f1':['ZS', 'UT','VT', 'THT', 'ACPRT', 'level', 'longitude','latitude','time','TKET','WT']}
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/FANNY/PYTHON/plot_FANNY_LIMA_CAMS.py b/MY_RUN/INTEGRATION_CASES/HPC/FANNY/PYTHON/plot_FANNY_LIMA_CAMS.py
index bf527777d..14e4171e3 100644
--- a/MY_RUN/INTEGRATION_CASES/HPC/FANNY/PYTHON/plot_FANNY_LIMA_CAMS.py
+++ b/MY_RUN/INTEGRATION_CASES/HPC/FANNY/PYTHON/plot_FANNY_LIMA_CAMS.py
@@ -20,7 +20,7 @@ os.system('rm -f tempgraph*')
# User's parameter / Namelist
#
path="../LIMA_CAMS/"
-LnameFiles = ['FANNY.1.WENO5.025.nc','FANNY.1.WENO5.007.nc', ]
+LnameFiles = ['FANNY.1.WENO5.024.nc','FANNY.1.WENO5.006.nc', ]
Dvar_input = {
'f1':['ZS', 'UT','VT', 'THT', 'ACPRT', 'level', 'longitude','latitude','time'],
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/FANNY/PYTHON/plot_FANNY_LIMA_v222222.py b/MY_RUN/INTEGRATION_CASES/HPC/FANNY/PYTHON/plot_FANNY_LIMA_v222222.py
index ea3455cf6..8f090315d 100644
--- a/MY_RUN/INTEGRATION_CASES/HPC/FANNY/PYTHON/plot_FANNY_LIMA_v222222.py
+++ b/MY_RUN/INTEGRATION_CASES/HPC/FANNY/PYTHON/plot_FANNY_LIMA_v222222.py
@@ -20,7 +20,7 @@ os.system('rm -f tempgraph*')
# User's parameter / Namelist
#
path="../LIMA_v222222/"
-LnameFiles = ['FANNY.1.WENO5.025.nc']
+LnameFiles = ['FANNY.1.WENO5.024.nc']
Dvar_input = {
'f1':['ZS', 'UT','VT', 'THT', 'ACPRT', 'level', 'longitude','latitude','time','TKET','WT']}
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/FANNY/PYTHON/plot_ICE3.py b/MY_RUN/INTEGRATION_CASES/HPC/FANNY/PYTHON/plot_ICE3.py
index d14c46a49..6b9c4f4a5 100644
--- a/MY_RUN/INTEGRATION_CASES/HPC/FANNY/PYTHON/plot_ICE3.py
+++ b/MY_RUN/INTEGRATION_CASES/HPC/FANNY/PYTHON/plot_ICE3.py
@@ -20,7 +20,7 @@ os.system('rm -f tempgraph*')
# User's parameter / Namelist
#
path="../ICE3/"
-LnameFiles = ['FANNY.1.WENO5.025.nc']
+LnameFiles = ['FANNY.1.WENO5.024.nc']
Dvar_input = {
'f1':['ZS', 'UT','VT', 'THT', 'ACPRT', 'level', 'longitude','latitude','time']}
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/FANNY/PYTHON/plot_ICE3_LRED.py b/MY_RUN/INTEGRATION_CASES/HPC/FANNY/PYTHON/plot_ICE3_LRED.py
index ac29dd1c5..e269ccbe9 100644
--- a/MY_RUN/INTEGRATION_CASES/HPC/FANNY/PYTHON/plot_ICE3_LRED.py
+++ b/MY_RUN/INTEGRATION_CASES/HPC/FANNY/PYTHON/plot_ICE3_LRED.py
@@ -20,7 +20,7 @@ os.system('rm -f tempgraph*')
# User's parameter / Namelist
#
path="../ICE3_LRED/"
-LnameFiles = ['FANNY.1.WENO5.025.nc']
+LnameFiles = ['FANNY.1.WENO5.024.nc']
Dvar_input = {
'f1':['ZS', 'UT','VT', 'THT', 'ACPRT', 'level', 'longitude','latitude','time','TKET','WT']}
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/FANNY/PYTHON/plot_ICE3_LRED_MOENG.py b/MY_RUN/INTEGRATION_CASES/HPC/FANNY/PYTHON/plot_ICE3_LRED_MOENG.py
index 130ddde7b..b9d9ad619 100644
--- a/MY_RUN/INTEGRATION_CASES/HPC/FANNY/PYTHON/plot_ICE3_LRED_MOENG.py
+++ b/MY_RUN/INTEGRATION_CASES/HPC/FANNY/PYTHON/plot_ICE3_LRED_MOENG.py
@@ -20,7 +20,7 @@ os.system('rm -f tempgraph*')
# User's parameter / Namelist
#
path="../ICE3_LRED_MOENG/"
-LnameFiles = ['FANNY.1.WENO5.025.nc']
+LnameFiles = ['FANNY.1.WENO5.024.nc']
Dvar_input = {
'f1':['ZS', 'UT','VT', 'THT', 'ACPRT', 'level', 'longitude','latitude','time','TKET','WT']}
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/FOG_3D/PYTHON/plot_FOG_3D_ICE3.py b/MY_RUN/INTEGRATION_CASES/HPC/FOG_3D/PYTHON/plot_FOG_3D_ICE3.py
index b73cea11b..25d2335ce 100644
--- a/MY_RUN/INTEGRATION_CASES/HPC/FOG_3D/PYTHON/plot_FOG_3D_ICE3.py
+++ b/MY_RUN/INTEGRATION_CASES/HPC/FOG_3D/PYTHON/plot_FOG_3D_ICE3.py
@@ -22,7 +22,7 @@ os.system('rm -f tempgraph*')
#
path="../ICE3/"
-LnameFiles = ['FOG3D.1.CE_S2.004.nc', 'FOG3D.1.CE_S2.007.nc']
+LnameFiles = ['FOG3D.1.CE_S2.003.nc', 'FOG3D.1.CE_S2.006.nc']
Dvar_input = {
'f1':['ZS', 'UT','VT','RCT', 'CLDFR','level','ZTOP', 'longitude','latitude','time'],
'f2':['ZS', 'UT','VT','RCT', 'CLDFR','level','ZTOP', 'longitude','latitude','time']
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/FOG_3D/PYTHON/plot_FOG_3D_LIMA_ECRAD.py b/MY_RUN/INTEGRATION_CASES/HPC/FOG_3D/PYTHON/plot_FOG_3D_LIMA_ECRAD.py
index 0f72d9360..30be7f834 100644
--- a/MY_RUN/INTEGRATION_CASES/HPC/FOG_3D/PYTHON/plot_FOG_3D_LIMA_ECRAD.py
+++ b/MY_RUN/INTEGRATION_CASES/HPC/FOG_3D/PYTHON/plot_FOG_3D_LIMA_ECRAD.py
@@ -22,7 +22,7 @@ os.system('rm -f tempgraph*')
#
path="../LIMA_ECRAD/"
-LnameFiles = ['FOG3D.1.CE_S2.004.nc', 'FOG3D.1.CE_S2.007.nc']
+LnameFiles = ['FOG3D.1.CE_S2.003.nc', 'FOG3D.1.CE_S2.006.nc']
Dvar_input = {
'f1':['ZS', 'UT','VT','RCT', 'CLDFR','level','ZTOP', 'longitude','latitude','time'],
'f2':['ZS', 'UT','VT','RCT', 'CLDFR','level','ZTOP', 'longitude','latitude','time']
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/FOG_3D/PYTHON/plot_FOG_3D_LIMA_v22222.py b/MY_RUN/INTEGRATION_CASES/HPC/FOG_3D/PYTHON/plot_FOG_3D_LIMA_v22222.py
index 1f48376ef..deccf415f 100644
--- a/MY_RUN/INTEGRATION_CASES/HPC/FOG_3D/PYTHON/plot_FOG_3D_LIMA_v22222.py
+++ b/MY_RUN/INTEGRATION_CASES/HPC/FOG_3D/PYTHON/plot_FOG_3D_LIMA_v22222.py
@@ -22,7 +22,7 @@ os.system('rm -f tempgraph*')
#
path="../LIMA_v22222/"
-LnameFiles = ['FOG3D.1.CE_S2.004.nc', 'FOG3D.1.CE_S2.007.nc']
+LnameFiles = ['FOG3D.1.CE_S2.003.nc', 'FOG3D.1.CE_S2.006.nc']
Dvar_input = {
'f1':['ZS', 'UT','VT','RCT', 'CLDFR','level','ZTOP', 'longitude','latitude','time'],
'f2':['ZS', 'UT','VT','RCT', 'CLDFR','level','ZTOP', 'longitude','latitude','time']
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/IBM/CUBE_FLUME_4/002_mesonh/EXSEG1.nam b/MY_RUN/INTEGRATION_CASES/HPC/IBM/CUBE_FLUME_4/002_mesonh/EXSEG1.nam
index fcf3c5caf..e4c0872b0 100644
--- a/MY_RUN/INTEGRATION_CASES/HPC/IBM/CUBE_FLUME_4/002_mesonh/EXSEG1.nam
+++ b/MY_RUN/INTEGRATION_CASES/HPC/IBM/CUBE_FLUME_4/002_mesonh/EXSEG1.nam
@@ -65,8 +65,8 @@
&NAM_FRC LGEOST_UV_FRC = F /
-&NAM_BACKUP XBAK_TIME_FREQ_FIRST(1) = 500.0,
- XBAK_TIME_FREQ(1) = 500.0 /
+&NAM_BACKUP XBAK_TIME_FREQ_FIRST(1) = 499.975,
+ XBAK_TIME_FREQ(1) = 499.975 /
&NAM_MEAN LMEAN_FIELD=.TRUE./
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/ICART2M/011_ncl/run_ncl b/MY_RUN/INTEGRATION_CASES/HPC/ICART2M/011_ncl/run_ncl
index c9e09c866..cd92a9ed9 100755
--- a/MY_RUN/INTEGRATION_CASES/HPC/ICART2M/011_ncl/run_ncl
+++ b/MY_RUN/INTEGRATION_CASES/HPC/ICART2M/011_ncl/run_ncl
@@ -25,4 +25,5 @@ ln -sf ../010_diag/ICART.1.SEG02.003dg.nc .
ln -sf ../010_diag/ICART.2.SEG02.003dg.nc .
ncl plot_ICARTT.ncl
+mv zsection_1300.eps ICART2M.eps
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/IHOP/PYTHON/plot_IHOP.py b/MY_RUN/INTEGRATION_CASES/HPC/IHOP/PYTHON/plot_IHOP.py
new file mode 100644
index 000000000..eb3a7478c
--- /dev/null
+++ b/MY_RUN/INTEGRATION_CASES/HPC/IHOP/PYTHON/plot_IHOP.py
@@ -0,0 +1,180 @@
+#!/usr/bin/env python3
+"""
+
+@author: Quentin Rodier
+Creation : 07/01/2021
+
+Last modifications
+"""
+import matplotlib as mpl
+mpl.use('Agg')
+from read_MNHfile import read_netcdf
+from Panel_Plot import PanelPlot
+import os
+import numpy as np
+from scipy.signal import savgol_filter
+
+os.system('rm -f tempgraph*')
+#
+# User's parameter / Namelist
+#
+path=""
+
+LnameFiles = ['IHOP1.1.1DBL9.000.nc','IHOP1.1.1DRM7.000.nc','IHOP5.1.RK4DI.000.nc']
+LG_MEAN = '/LES_budgets/Mean/Cartesian/Not_time_averaged/Not_normalized/cart/'
+LG_SBG = '/LES_budgets/Subgrid/Cartesian/Not_time_averaged/Not_normalized/cart/'
+LG_RES = '/LES_budgets/Resolved/Cartesian/Not_time_averaged/Not_normalized/cart/'
+
+Dvar_input = {
+'f1':[(LG_SBG,'SBG_TKE'),(LG_SBG,'SBG_WU'),(LG_SBG,'SBG_WV'),(LG_SBG,'SBG_KM'),(LG_SBG,'SBG_KH'),(LG_SBG,'SBG_WTHL'),(LG_SBG,'SBG_THL2'),
+ (LG_MEAN,'MEAN_U'),(LG_MEAN,'MEAN_V'),(LG_MEAN,'MEAN_TH'),
+ 'time_les','level_les'],
+'f2':[(LG_SBG,'SBG_TKE'),(LG_SBG,'SBG_WU'),(LG_SBG,'SBG_WV'),(LG_SBG,'SBG_KM'),(LG_SBG,'SBG_KH'),(LG_SBG,'SBG_WTHL'),(LG_SBG,'SBG_THL2'),
+ (LG_MEAN,'MEAN_U'),(LG_MEAN,'MEAN_V'),(LG_MEAN,'MEAN_TH'),
+ 'time_les','level_les'],
+'f3':[(LG_SBG,'SBG_TKE'),(LG_SBG,'SBG_WU'),(LG_SBG,'SBG_WV'),(LG_SBG,'SBG_KM'),(LG_SBG,'SBG_KH'),(LG_SBG,'SBG_WTHL'),(LG_SBG,'SBG_THL2'),
+ (LG_RES,'RES_KE'),(LG_RES,'RES_WU'),(LG_RES,'RES_WV'),(LG_RES,'RES_WTH'),(LG_RES,'RES_TH2'),
+ (LG_MEAN,'MEAN_U'),(LG_MEAN,'MEAN_V'),(LG_MEAN,'MEAN_TH'),
+ 'time_les','level_les'],
+}
+
+# Read the variables in the files
+Dvar = {}
+Dvar = read_netcdf(LnameFiles, Dvar_input, path=path, removeHALO=False)
+
+# Averaging time between 9th to 8th hour since beginning of the run
+delta_t_1D = Dvar['f1']['time_les'][1]-Dvar['f1']['time_les'][0] # = 100 seconds
+t_end_1D=int(7*(3600/delta_t_1D))
+t_beg_1D=int(6*(3600/delta_t_1D))
+
+delta_t_les = Dvar['f3']['time_les'][1]-Dvar['f3']['time_les'][0] # = 300 seconds
+t_end_les=int(7*(3600/delta_t_les))
+t_beg_les=int(6*(3600/delta_t_les))
+
+
+# Intermediate computation
+# 1D
+for ifile in ['f1','f2']:
+ Dvar[ifile]['WIND'] = np.sqrt(Dvar[ifile][(LG_MEAN,'MEAN_U')]**2 + Dvar[ifile][(LG_MEAN,'MEAN_V')]**2)
+ Dvar[ifile]['STRESS'] = np.sqrt(Dvar[ifile][(LG_SBG,'SBG_WU')]**2 + Dvar[ifile][(LG_SBG,'SBG_WV')]**2)
+ Dvar[ifile]['SURF_STRESS'] = Dvar[ifile]['STRESS'][0,:]
+
+# LES
+for ifile in ['f3']:
+ Dvar[ifile]['WIND'] = np.sqrt(Dvar[ifile][(LG_MEAN,'MEAN_U')]**2 + Dvar[ifile][(LG_MEAN,'MEAN_V')]**2)
+ Dvar[ifile]['THL2'] = Dvar[ifile][(LG_RES,'RES_TH2')] + Dvar[ifile][(LG_SBG,'SBG_THL2')]
+ Dvar[ifile]['WTHL'] = Dvar[ifile][(LG_RES,'RES_WTH')] + Dvar[ifile][(LG_SBG,'SBG_WTHL')]
+ Dvar[ifile]['TKE'] = Dvar[ifile][(LG_RES,'RES_KE')] + Dvar[ifile][(LG_SBG,'SBG_TKE')]
+ Dvar[ifile]['UW'] = Dvar[ifile][(LG_RES,'RES_WU')] + Dvar[ifile][(LG_SBG,'SBG_WU')]
+ Dvar[ifile]['VW'] = Dvar[ifile][(LG_RES,'RES_WV')] + Dvar[ifile][(LG_SBG,'SBG_WV')]
+ Dvar[ifile]['STRESS'] = np.sqrt((Dvar[ifile]['UW'])**2 + (Dvar[ifile]['VW'])**2)
+ Dvar[ifile]['SURF_STRESS'] = Dvar[ifile]['STRESS'][0,:]
+ Dvar[ifile]['DTHETATZ'] = np.asarray(np.gradient(Dvar[ifile][(LG_MEAN,'MEAN_TH')],tuple(Dvar[ifile]['level_les']),axis=0))
+ Dvar[ifile]['DUDZ'] = np.asarray(np.gradient(Dvar[ifile][(LG_MEAN,'MEAN_U')],tuple(Dvar[ifile]['level_les']),axis=0))
+ Dvar[ifile]['DVDZ'] = np.asarray(np.gradient(Dvar[ifile][(LG_MEAN,'MEAN_V')],tuple(Dvar[ifile]['level_les']),axis=0))
+ Dvar[ifile]['Kh'] = - Dvar[ifile]['WTHL']/Dvar[ifile]['DTHETATZ']
+ Dvar[ifile]['Ku'] = - Dvar[ifile]['UW']/Dvar[ifile]['DUDZ']
+ Dvar[ifile]['Kv'] = - Dvar[ifile]['VW']/Dvar[ifile]['DVDZ']
+
+#SBL Height
+for ifile in ['f1','f2','f3']:
+ # Stable boundary layer height diagnostic based on Cuxart et al. 2006
+ Dvar[ifile]['SBL_H'] = Dvar[ifile]['STRESS'][0,:]
+ for t in range(Dvar[ifile]['time_les'].shape[0]):
+ for z in range(Dvar[ifile]['level_les'].shape[0]):
+ if np.abs(Dvar[ifile]['STRESS'][z,t] < np.abs(0.05*Dvar[ifile]['SURF_STRESS'][t])):
+ Dvar[ifile]['SBL_H'][t] = Dvar[ifile]['level_les'][z]
+ break
+ Dvar[ifile]['SBL_H'] = Dvar[ifile]['SBL_H'] / 0.95
+
+################################################################
+######### PANEL
+###############################################################
+Panel = PanelPlot(3,3, [25,25],'6-7h time averaged vertical profiles', titlepad=15, minmaxpad=1.04, timepad=-0.07, colorbarpad=0.03, labelcolorbarpad = 13, colorbaraspect=40)
+
+
+Lplot = [np.mean(Dvar['f1'][(LG_MEAN,'MEAN_TH')][:,t_beg_1D:t_end_1D],axis=1), np.mean(Dvar['f2'][(LG_MEAN,'MEAN_TH')][:,t_beg_1D:t_end_1D],axis=1),
+ np.mean(Dvar['f3'][(LG_MEAN,'MEAN_TH')][:,t_beg_les:t_end_les],axis=1)]
+LaxeZ = [Dvar['f1']['level_les'], Dvar['f2']['level_les'], Dvar['f3']['level_les']]
+Ltitle = ['MEAN_TH']*len(Lplot)
+Llinelabel = ['1D BL89','1D RM17', 'LES']
+Lxlab = ['theta (K)']*len(Lplot)
+Lylab = ['altitude (m)']*len(Lplot)
+Lylim = [(0,3000.1)]*len(Lplot)
+Lxlim = [(300, 318)]*len(Lplot)
+Llinecolor = ['red','blue','black']
+LaxisColor = ['black']*len(Lplot)
+fig = Panel.pXY_lines(Lxx=Lplot, Lyy=LaxeZ, Lxlab=Lxlab, Lylab=Lylab, Ltitle=Ltitle,
+ Lylim=Lylim, Lxlim=Lxlim, Llinelabel=Llinelabel, Llinecolor=Llinecolor,LaxisColor=LaxisColor)
+
+Lplot = [np.mean(Dvar['f1']['WIND'][:,t_beg_1D:t_end_1D],axis=1), np.mean(Dvar['f2']['WIND'][:,t_beg_1D:t_end_1D],axis=1), np.mean(Dvar['f3']['WIND'][:,t_beg_les:t_end_les],axis=1)]
+Ltitle = ['Wind speed']*len(Lplot)
+Lxlab = ['Wind speed (m/s)']*len(Lplot)
+Lxlim = [(0, 24)]*len(Lplot)
+fig = Panel.pXY_lines(Lxx=Lplot, Lyy=LaxeZ, Lxlab=Lxlab, Lylab=Lylab, Ltitle=Ltitle, ax=fig.axes,
+ Lylim=Lylim, Lxlim=Lxlim, Llinelabel=Llinelabel, Llinecolor=Llinecolor,LaxisColor=LaxisColor)
+
+Lplot = [Dvar['f1']['SBL_H'][:], Dvar['f2']['SBL_H'][:], Dvar['f3']['SBL_H'][:]]
+
+Ltitle = ['Boundary layer height']*len(Lplot)
+LaxeTime = [Dvar['f1']['time_les']/3600.0, Dvar['f2']['time_les']/3600.0, Dvar['f3']['time_les']/3600.0]
+Lxlab = ['Time (h)']*len(Lplot)
+Lxlim = [(12, 19)]*len(Lplot)
+Lylim = [(0, 3000.1)]*len(Lplot)
+fig = Panel.pXY_lines(Lyy=Lplot, Lxx=LaxeTime, Lxlab=Lxlab, Lylab=Lylab, Ltitle=Ltitle, ax=fig.axes,
+ Lylim=Lylim, Lxlim=Lxlim, Llinelabel=Llinelabel, Llinecolor=Llinecolor,LaxisColor=LaxisColor)
+
+Lplot = [np.mean(Dvar['f1'][(LG_SBG,'SBG_TKE')][:,t_beg_1D:t_end_1D],axis=1), np.mean(Dvar['f2'][(LG_SBG,'SBG_TKE')][:,t_beg_1D:t_end_1D],axis=1),
+ np.mean(Dvar['f3']['TKE'][:,t_beg_les:t_end_les],axis=1)]
+Ltitle = ['TKE']*len(Lplot)
+Lxlab = ['TKE (m2/s2)']*len(Lplot)
+Lylim = [(0,1500.1)]*len(Lplot)
+Lxlim = [(0, 2.1)]*len(Lplot)
+fig = Panel.pXY_lines(Lxx=Lplot, Lyy=LaxeZ, Lxlab=Lxlab, Lylab=Lylab, Ltitle=Ltitle, ax=fig.axes,
+ Lylim=Lylim, Lxlim=Lxlim, Llinelabel=Llinelabel, Llinecolor=Llinecolor,LaxisColor=LaxisColor)
+
+Lplot = [np.mean(Dvar['f1'][(LG_SBG,'SBG_KH')][:,t_beg_1D:t_end_1D],axis=1), np.mean(Dvar['f2'][(LG_SBG,'SBG_KH')][:,t_beg_1D:t_end_1D],axis=1),
+ np.mean(Dvar['f3']['Kh'][:,t_beg_les:t_end_les],axis=1)]
+Ltitle = ['Kh coefficient']*len(Lplot)
+Lxlab = ['Kh (m2/s)']*len(Lplot)
+Lxlim = [(0, 250.)]*len(Lplot)
+fig = Panel.pXY_lines(Lxx=Lplot, Lyy=LaxeZ, Lxlab=Lxlab, Lylab=Lylab, Ltitle=Ltitle, ax=fig.axes,
+ Lylim=Lylim, Lxlim=Lxlim, Llinelabel=Llinelabel, Llinecolor=Llinecolor,LaxisColor=LaxisColor)
+
+Lplot = [np.mean(Dvar['f1'][(LG_SBG,'SBG_WTHL')][:,t_beg_1D:t_end_1D],axis=1), np.mean(Dvar['f2'][(LG_SBG,'SBG_WTHL')][:,t_beg_1D:t_end_1D],axis=1),
+ np.mean(Dvar['f3']['WTHL'][:,t_beg_les:t_end_les],axis=1)]
+Ltitle = [r"Flux $w' \theta_l'$"]*len(Lplot)
+Lxlab = [r"$w' \theta_l'(K.m/s)$"]*len(Lplot)
+Lxlim = [(-0.1, 0.2)]*len(Lplot)
+fig = Panel.pXY_lines(Lxx=Lplot, Lyy=LaxeZ, Lxlab=Lxlab, Lylab=Lylab, Ltitle=Ltitle, ax=fig.axes,
+ Lylim=Lylim, Lxlim=Lxlim, Llinelabel=Llinelabel, Llinecolor=Llinecolor,LaxisColor=LaxisColor)
+
+Lplot = [np.mean(Dvar['f1']['STRESS'][:,t_beg_1D:t_end_1D],axis=1), np.mean(Dvar['f2']['STRESS'][:,t_beg_1D:t_end_1D],axis=1), np.mean(Dvar['f3']['STRESS'][:,t_beg_les:t_end_les],axis=1)]
+Ltitle = ['Stress']*len(Lplot)
+Lxlab = [r"$\tau (m^2/s^2)$"]*len(Lplot)
+Lxlim = [(0, 0.12)]*len(Lplot)
+fig = Panel.pXY_lines(Lxx=Lplot, Lyy=LaxeZ, Lxlab=Lxlab, Lylab=Lylab, Ltitle=Ltitle, ax=fig.axes,
+ Lylim=Lylim, Lxlim=Lxlim, Llinelabel=Llinelabel, Llinecolor=Llinecolor,LaxisColor=LaxisColor)
+
+Lplot = [np.mean(Dvar['f1'][(LG_SBG,'SBG_THL2')][:,t_beg_1D:t_end_1D],axis=1), np.mean(Dvar['f2'][(LG_SBG,'SBG_THL2')][:,t_beg_1D:t_end_1D],axis=1),
+ np.mean(Dvar['f3']['THL2'][:,t_beg_les:t_end_les],axis=1)]
+Ltitle = [r"Variance $\theta_l'^2$ "]*len(Lplot)
+Lxlab = [r"$\theta_l'^2 (K^2)$"]*len(Lplot)
+Lxlim = [(0, 0.3)]*len(Lplot)
+fig = Panel.pXY_lines(Lxx=Lplot, Lyy=LaxeZ, Lxlab=Lxlab, Lylab=Lylab, Ltitle=Ltitle, ax=fig.axes,
+ Lylim=Lylim, Lxlim=Lxlim, Llinelabel=Llinelabel, Llinecolor=Llinecolor,LaxisColor=LaxisColor)
+
+Lplot = [np.mean(Dvar['f1'][(LG_SBG,'SBG_KM')][:,t_beg_1D:t_end_1D],axis=1), np.mean(Dvar['f2'][(LG_SBG,'SBG_KM')][:,t_beg_1D:t_end_1D],axis=1)]
+Ltitle = ['Km coefficient']*len(Lplot)
+Lxlab = ['Km (m2/s)']*len(Lplot)
+Lxlim = [(0, 250.)]*len(Lplot)
+LaxeZ = [Dvar['f1']['level_les'], Dvar['f2']['level_les']]
+Llinelabel = ['1D BL89','1D RM17']
+Lylab = ['altitude (m)']*len(Lplot)
+Llinecolor = ['red','blue']
+LaxisColor = ['black']*len(Lplot)
+
+fig = Panel.pXY_lines(Lxx=Lplot, Lyy=LaxeZ, Lxlab=Lxlab, Lylab=Lylab, Ltitle=Ltitle, ax=fig.axes,
+ Lylim=Lylim, Lxlim=Lxlim, Llinelabel=Llinelabel, Llinecolor=Llinecolor,LaxisColor=LaxisColor)
+
+Panel.save_graph(1,fig)
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/IHOP/PYTHON/run_python b/MY_RUN/INTEGRATION_CASES/HPC/IHOP/PYTHON/run_python
index 760132f0f..5cfefafed 100755
--- a/MY_RUN/INTEGRATION_CASES/HPC/IHOP/PYTHON/run_python
+++ b/MY_RUN/INTEGRATION_CASES/HPC/IHOP/PYTHON/run_python
@@ -22,6 +22,5 @@ ln -sf ../1D/*.000.nc .
ln -sf ../3D/*.000.nc .
ln -sf ${SRC_MESONH}/src/LIB/Python/* .
-# With LES curve : get the file from Belenos before
-python3 plot_IHOP_1D.py
-convert *.png IHOP_1D.pdf
+python3 plot_IHOP.py
+convert *.png IHOP.pdf
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/KMAP/PYTHON/run_python b/MY_RUN/INTEGRATION_CASES/HPC/KMAP/PYTHON/run_python
index e738eef2d..12a6e5ee4 100755
--- a/MY_RUN/INTEGRATION_CASES/HPC/KMAP/PYTHON/run_python
+++ b/MY_RUN/INTEGRATION_CASES/HPC/KMAP/PYTHON/run_python
@@ -17,6 +17,6 @@ ln -sf ${SRC_MESONH}/src/LIB/Python/* .
module purge
module load python/3.7.6
-ln -sf ../RUN/NETCDF/*diag*.nc .
+ln -sf ../RUN/*diag*.nc .
python3 plot_KMAP.py
convert *.png KMAP.pdf
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/KMAP/RUN/run_diag b/MY_RUN/INTEGRATION_CASES/HPC/KMAP/RUN/run_diag
index 8bfd467c6..2baebac83 100755
--- a/MY_RUN/INTEGRATION_CASES/HPC/KMAP/RUN/run_diag
+++ b/MY_RUN/INTEGRATION_CASES/HPC/KMAP/RUN/run_diag
@@ -39,23 +39,8 @@ rm -f K_MAP.3.WENO5.${ECH}diag.???
time ${MPIRUN} DIAG${XYZ}
mv OUTPUT_LISTING0 OUTPUT_LISTING0_diag.${ECH}
mv OUTPUT_LISTING1 OUTPUT_LISTING1_diag.${ECH}
-ls -lrt
-
done
-mkdir NETCDF
-mv *.nc NETCDF/.
-mkdir OUTPUT
-mv OUTPUT_LISTING* OUTPUT/.
-mkdir LFI
-mv *.lfi LFI/.
-mv *.des LFI/.
-
-rm -f file_for_xtransfer pipe_name
-
-
-ls -lrt
-
ja
cd ../PYTHON
sbatch run_python
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/KW78_ELECTRICITY/003_python/run_python b/MY_RUN/INTEGRATION_CASES/HPC/KW78_ELECTRICITY/003_python/run_python
index 782c57ed1..bf404250c 100755
--- a/MY_RUN/INTEGRATION_CASES/HPC/KW78_ELECTRICITY/003_python/run_python
+++ b/MY_RUN/INTEGRATION_CASES/HPC/KW78_ELECTRICITY/003_python/run_python
@@ -11,10 +11,12 @@ ulimit -s unlimited
# Arrete du job des la premiere erreur
set -e
+. ~rodierq/DEV_57/MNH-git_open_source-lfs-0a57991/conf/profile_mesonh-LXifort-R8I4-MNH-V5-7-0-ECRAD140-MPIAUTO-O2
+ln -sf ${SRC_MESONH}/src/LIB/Python/*.py .
+
module purge
module load python/3.10.12
-ln -sf ${SRC_MESONH}/src/LIB/Python/*.py .
python3 plot_flash.py IC3E4
python3 plot_CV_elec_MNH.py IC3E4 001
@@ -23,7 +25,7 @@ python3 plot_CV_elec_MNH.py IC3E4 003
python3 plot_CV_elec_MNH.py IC3E4 004
python3 plot_CV_elec_MNH.py IC3E4 005
python3 plot_CV_elec_MNH.py IC3E4 006
-convert Fig_*IC3E4*.png ice3.pdf
+convert Fig_*IC3E4*.png KW78_ELECTRICITY_ice3.pdf
python3 plot_flash.py LI1E4
python3 plot_CV_elec_MNH.py LI1E4 001
@@ -32,7 +34,7 @@ python3 plot_CV_elec_MNH.py LI1E4 003
python3 plot_CV_elec_MNH.py LI1E4 004
python3 plot_CV_elec_MNH.py LI1E4 005
python3 plot_CV_elec_MNH.py LI1E4 006
-convert Fig_*LI1E4*.png lima.pdf
+convert Fig_*LI1E4*.png KW78_ELECTRICITY_lima.pdf
python3 plot_flash.py LI2E4
python3 plot_CV_elec_MNH.py LI2E4 001
@@ -41,7 +43,7 @@ python3 plot_CV_elec_MNH.py LI2E4 003
python3 plot_CV_elec_MNH.py LI2E4 004
python3 plot_CV_elec_MNH.py LI2E4 005
python3 plot_CV_elec_MNH.py LI2E4 006
-convert Fig_*LI2E4*.png lima2.pdf
+convert Fig_*LI2E4*.png KW78_ELECTRICITY_lima2.pdf
python3 plot_flash.py IC3E3
python3 plot_CV_elec_MNH.py IC3E3 001
@@ -50,4 +52,4 @@ python3 plot_CV_elec_MNH.py IC3E3 003
python3 plot_CV_elec_MNH.py IC3E3 004
python3 plot_CV_elec_MNH.py IC3E3 005
python3 plot_CV_elec_MNH.py IC3E3 006
-convert Fig_*IC3E3*.png old.pdf
+convert Fig_*IC3E3*.png KW78_ELECTRICITY_ice3old.pdf
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/PANAME/010_run/EXSEG1.nam b/MY_RUN/INTEGRATION_CASES/HPC/PANAME/010_run/EXSEG1.nam
index 139377222..24d2f4048 100644
--- a/MY_RUN/INTEGRATION_CASES/HPC/PANAME/010_run/EXSEG1.nam
+++ b/MY_RUN/INTEGRATION_CASES/HPC/PANAME/010_run/EXSEG1.nam
@@ -63,7 +63,8 @@
NRIMY = 5,
XRIMKMAX = 0.002 /
-NAM_COUPLING_LEVELSn NLEV_COUPLE=16 /
+&NAM_COUPLING_LEVELSn NLEV_COUPLE=16 /
+&NAM_DRAGBLDGn LDRAGBLDG=T, LFLUXBLDG=T /
&NAM_ADVn CUVW_ADV_SCHEME = 'WENO_K',
CMET_ADV_SCHEME = 'PPM_01',
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/PANAME/010_run/EXSEG2.nam b/MY_RUN/INTEGRATION_CASES/HPC/PANAME/010_run/EXSEG2.nam
index bf93ce5c6..b75ed10d9 100644
--- a/MY_RUN/INTEGRATION_CASES/HPC/PANAME/010_run/EXSEG2.nam
+++ b/MY_RUN/INTEGRATION_CASES/HPC/PANAME/010_run/EXSEG2.nam
@@ -20,7 +20,8 @@
&NAM_DYN
LNUMDIFTH=F/ ! conseille a false pour WENO
-&NAM_COUPLING_LEVELSn NLEV_COUPLE=16 / !20 nveaux pour Valery
+&NAM_COUPLING_LEVELSn NLEV_COUPLE=16 /
+&NAM_DRAGBLDGn LDRAGBLDG=T, LFLUXBLDG=T /
&NAM_ADVn CUVW_ADV_SCHEME = 'WENO_K',
CMET_ADV_SCHEME = 'PPM_01',
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/PANAME/010_run/EXSEG3.nam b/MY_RUN/INTEGRATION_CASES/HPC/PANAME/010_run/EXSEG3.nam
index 11b1bd130..a55079555 100644
--- a/MY_RUN/INTEGRATION_CASES/HPC/PANAME/010_run/EXSEG3.nam
+++ b/MY_RUN/INTEGRATION_CASES/HPC/PANAME/010_run/EXSEG3.nam
@@ -21,7 +21,8 @@
LNUMDIFU=T
LNUMDIFTH=F /
-&NAM_COUPLING_LEVELSn NLEV_COUPLE=19 / !20 nveaux pour Valery
+&NAM_COUPLING_LEVELSn NLEV_COUPLE=16 /
+&NAM_DRAGBLDGn LDRAGBLDG=T, LFLUXBLDG=T /
&NAM_ADVn CUVW_ADV_SCHEME = 'CEN4TH', !'WENO_K',
CMET_ADV_SCHEME = 'PPM_01',
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/PANAME/011_python/plot_PANAME_mod1.py b/MY_RUN/INTEGRATION_CASES/HPC/PANAME/011_python/plot_PANAME_mod1.py
index 25742d67e..c905dae09 100644
--- a/MY_RUN/INTEGRATION_CASES/HPC/PANAME/011_python/plot_PANAME_mod1.py
+++ b/MY_RUN/INTEGRATION_CASES/HPC/PANAME/011_python/plot_PANAME_mod1.py
@@ -20,7 +20,7 @@ os.system('rm -f tempgraph*')
# User's parameter / Namelist
#
path="../010_run/"
-LnameFiles = ['PAN.0.1.SEG01.004.nc', 'PAN.0.1.SEG01.008.nc', 'PAN.0.1.SEG01.012.nc', 'PAN.0.1.SEG01.016.nc', 'PAN.0.1.SEG01.020.nc', 'PAN.0.1.SEG01.024.nc']
+LnameFiles = ['PAN_00.1.SEG01.004.nc', 'PAN_00.1.SEG01.008.nc', 'PAN_00.1.SEG01.012.nc', 'PAN_00.1.SEG01.016.nc', 'PAN_00.1.SEG01.020.nc', 'PAN_00.1.SEG01.024.nc']
Dvar_input = {'f'+str(i):['T2M', 'TSRAD', 'HU2M','SWD','LWD','UT', 'CLDFR', 'TKET','WT', 'H','LE','level', 'longitude','latitude','time']
for i in range(1,7)}
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/PANAME/011_python/plot_PANAME_mod2.py b/MY_RUN/INTEGRATION_CASES/HPC/PANAME/011_python/plot_PANAME_mod2.py
index ba3aeb486..356113082 100644
--- a/MY_RUN/INTEGRATION_CASES/HPC/PANAME/011_python/plot_PANAME_mod2.py
+++ b/MY_RUN/INTEGRATION_CASES/HPC/PANAME/011_python/plot_PANAME_mod2.py
@@ -20,7 +20,7 @@ os.system('rm -f tempgraph*')
# User's parameter / Namelist
#
path="../010_run/"
-LnameFiles = ['PAN.0.2.SEG01.004.nc', 'PAN.0.2.SEG01.008.nc', 'PAN.0.2.SEG01.012.nc', 'PAN.0.2.SEG01.016.nc', 'PAN.0.2.SEG01.020.nc', 'PAN.0.2.SEG01.024.nc']
+LnameFiles = ['PAN_00.2.SEG01.004.nc', 'PAN_00.2.SEG01.008.nc', 'PAN_00.2.SEG01.012.nc', 'PAN_00.2.SEG01.016.nc', 'PAN_00.2.SEG01.020.nc', 'PAN_00.2.SEG01.024.nc']
Dvar_input = {'f'+str(i):['T2M', 'TSRAD', 'HU2M','SWD','LWD','UT', 'CLDFR', 'TKET','WT', 'H','LE','level', 'longitude','latitude','time']
for i in range(1,7)}
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/PANAME/011_python/plot_PANAME_mod3.py b/MY_RUN/INTEGRATION_CASES/HPC/PANAME/011_python/plot_PANAME_mod3.py
index 52822cee3..0c03fc6a0 100644
--- a/MY_RUN/INTEGRATION_CASES/HPC/PANAME/011_python/plot_PANAME_mod3.py
+++ b/MY_RUN/INTEGRATION_CASES/HPC/PANAME/011_python/plot_PANAME_mod3.py
@@ -20,7 +20,7 @@ os.system('rm -f tempgraph*')
# User's parameter / Namelist
#
path="../010_run/"
-LnameFiles = ['PAN.0.3.SEG01.004.nc', 'PAN.0.3.SEG01.008.nc', 'PAN.0.3.SEG01.012.nc', 'PAN.0.3.SEG01.016.nc', 'PAN.0.3.SEG01.020.nc', 'PAN.0.3.SEG01.024.nc']
+LnameFiles = ['PAN_00.3.SEG01.004.nc', 'PAN_00.3.SEG01.008.nc', 'PAN_00.3.SEG01.012.nc', 'PAN_00.3.SEG01.016.nc', 'PAN_00.3.SEG01.020.nc', 'PAN_00.3.SEG01.024.nc']
Dvar_input = {'f'+str(i):['T2M', 'TSRAD', 'HU2M','SWD','LWD','UT', 'CLDFR', 'TKET','WT', 'H','LE','level', 'longitude','latitude','time']
for i in range(1,7)}
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/PANAME/011_python/run_python b/MY_RUN/INTEGRATION_CASES/HPC/PANAME/011_python/run_python
index 2697cdded..07f311e8b 100755
--- a/MY_RUN/INTEGRATION_CASES/HPC/PANAME/011_python/run_python
+++ b/MY_RUN/INTEGRATION_CASES/HPC/PANAME/011_python/run_python
@@ -11,7 +11,7 @@ ulimit -s unlimited
# Arrete du job des la premiere erreur
set -e
-. ~rodierq/DEV_57/MNH-PHYEX070-b95d84d7/conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-2-ECRAD140-MPIAUTO-O2
+. ~/DEV_57/MNH-git_open_source-lfs-0a57991/conf/profile_mesonh-LXifort-R8I4-MNH-V5-7-0-ECRAD140-MPIAUTO-O2
ln -sf ${SRC_MESONH}/src/LIB/Python/* .
ln -sf ~rodierq/SAVE/OUTILS/PYTHON/departements-20180101.* .
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/RECYCLING/002_mesonh/EXSEG1.nam b/MY_RUN/INTEGRATION_CASES/HPC/RECYCLING/002_mesonh/EXSEG1.nam
index cf16a1b3d..ac3b7ef5d 100644
--- a/MY_RUN/INTEGRATION_CASES/HPC/RECYCLING/002_mesonh/EXSEG1.nam
+++ b/MY_RUN/INTEGRATION_CASES/HPC/RECYCLING/002_mesonh/EXSEG1.nam
@@ -88,7 +88,7 @@
&NAM_FRC LGEOST_UV_FRC = .T. /
-&NAM_BACKUP XBAK_TIME_FREQ_FIRST(1) = 50000.0,
- XBAK_TIME_FREQ(1) = 50000.0 /
+&NAM_BACKUP XBAK_TIME_FREQ_FIRST(1) = 49999.5,
+ XBAK_TIME_FREQ(1) = 49999.5 /
&NAM_MEAN LMEAN_FIELD=.TRUE./
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/RECYCLING/005_MNHD2/EXSEG1.nam b/MY_RUN/INTEGRATION_CASES/HPC/RECYCLING/005_MNHD2/EXSEG1.nam
index ae7b8380d..d075882f1 100755
--- a/MY_RUN/INTEGRATION_CASES/HPC/RECYCLING/005_MNHD2/EXSEG1.nam
+++ b/MY_RUN/INTEGRATION_CASES/HPC/RECYCLING/005_MNHD2/EXSEG1.nam
@@ -104,10 +104,10 @@
XWAY(4) = 1.,
XWAY(5) = 1. /
-&NAM_BACKUP XBAK_TIME_FREQ_FIRST(1) = 5000.0,
- XBAK_TIME_FREQ(1) = 5000.0,
- XBAK_TIME_FREQ_FIRST(2) = 5000.0,
- XBAK_TIME_FREQ(2) = 5000.0 /
+&NAM_BACKUP XBAK_TIME_FREQ_FIRST(1) = 4999.5,
+ XBAK_TIME_FREQ(1) = 4999.5,
+ XBAK_TIME_FREQ_FIRST(2) = 4999.5,
+ XBAK_TIME_FREQ(2) = 4999.5 /
&NAM_MEAN LMEAN_FIELD=.TRUE./
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/RECYCLING/005_MNHD2_NORECY/EXSEG1.nam b/MY_RUN/INTEGRATION_CASES/HPC/RECYCLING/005_MNHD2_NORECY/EXSEG1.nam
index 048578cc1..dd659fa8b 100755
--- a/MY_RUN/INTEGRATION_CASES/HPC/RECYCLING/005_MNHD2_NORECY/EXSEG1.nam
+++ b/MY_RUN/INTEGRATION_CASES/HPC/RECYCLING/005_MNHD2_NORECY/EXSEG1.nam
@@ -104,10 +104,10 @@
XWAY(4) = 1.,
XWAY(5) = 1. /
-&NAM_BACKUP XBAK_TIME_FREQ_FIRST(1) = 5000.0,
- XBAK_TIME_FREQ(1) = 5000.0,
- XBAK_TIME_FREQ_FIRST(2) = 5000.0,
- XBAK_TIME_FREQ(2) = 5000.0 /
+&NAM_BACKUP XBAK_TIME_FREQ_FIRST(1) = 4999.5,
+ XBAK_TIME_FREQ(1) = 4999.5,
+ XBAK_TIME_FREQ_FIRST(2) = 4999.5,
+ XBAK_TIME_FREQ(2) = 4999.5 /
&NAM_MEAN LMEAN_FIELD=.TRUE./
&NAM_IBM_PARAMn LIBM = .FALSE./
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/SNOW_BLOW/PYTHON/run_python b/MY_RUN/INTEGRATION_CASES/HPC/SNOW_BLOW/PYTHON/run_python
index 6660fdc75..598cf2d6f 100755
--- a/MY_RUN/INTEGRATION_CASES/HPC/SNOW_BLOW/PYTHON/run_python
+++ b/MY_RUN/INTEGRATION_CASES/HPC/SNOW_BLOW/PYTHON/run_python
@@ -1,7 +1,7 @@
#!/bin/sh
module load python/2.7.17
-ln -sf ../RUN/CLB50.1.03_04.008.nc .
-ln -sf ../RUN/CLB50.1.03_04.002.nc .
+ln -sf ../RUN/CLB50.1.03_04.007.nc .
+ln -sf ../RUN/CLB50.1.03_04.001.nc .
python trace_snow.py
convert *.png SNOW_57.pdf
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/SNOW_BLOW/PYTHON/trace_snow.py b/MY_RUN/INTEGRATION_CASES/HPC/SNOW_BLOW/PYTHON/trace_snow.py
index 9c8325565..15f2b0eca 100755
--- a/MY_RUN/INTEGRATION_CASES/HPC/SNOW_BLOW/PYTHON/trace_snow.py
+++ b/MY_RUN/INTEGRATION_CASES/HPC/SNOW_BLOW/PYTHON/trace_snow.py
@@ -47,8 +47,8 @@ class nlcmap(LinearSegmentedColormap):
-fic1='CLB50.1.03_04.008.nc' #chemin vers simu
-fic2='CLB50.1.03_04.002.nc' #chemin vers simu
+fic1='CLB50.1.03_04.007.nc' #chemin vers simu
+fic2='CLB50.1.03_04.001.nc' #chemin vers simu
ncfile1 = Dataset(fic1,'r')
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/STERAO/PYTHON/plot_STERAO.py b/MY_RUN/INTEGRATION_CASES/HPC/STERAO/PYTHON/plot_STERAO.py
index 322710c6d..b603302fc 100644
--- a/MY_RUN/INTEGRATION_CASES/HPC/STERAO/PYTHON/plot_STERAO.py
+++ b/MY_RUN/INTEGRATION_CASES/HPC/STERAO/PYTHON/plot_STERAO.py
@@ -18,7 +18,7 @@ os.system('rm -f tempgraph*')
#
path="../RUN/"
-LnameFiles = ['STERA.1.CEN4T.007.nc', 'STERA.1.CEN4T.013.nc', 'STERA.1.CEN4T.019.nc']
+LnameFiles = ['STERA.1.CEN4T.006.nc', 'STERA.1.CEN4T.012.nc', 'STERA.1.CEN4T.018.nc']
Dvar_input = {'f'+str(i):['UT', 'VT', 'WT', 'INPRT', 'ACPRT', 'RCT', 'RIT', 'RGT',
'EFIELDU', 'EFIELDV', 'EFIELDW', 'EMODULE', 'NI_IAGGS',
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/STERAO/PYTHON/run_python b/MY_RUN/INTEGRATION_CASES/HPC/STERAO/PYTHON/run_python
old mode 100644
new mode 100755
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/XYNTHIA_2.5km/PYTHON/plot_XYNTHIA.py b/MY_RUN/INTEGRATION_CASES/HPC/XYNTHIA_2.5km/PYTHON/plot_XYNTHIA.py
index 569e3f2f4..428665142 100644
--- a/MY_RUN/INTEGRATION_CASES/HPC/XYNTHIA_2.5km/PYTHON/plot_XYNTHIA.py
+++ b/MY_RUN/INTEGRATION_CASES/HPC/XYNTHIA_2.5km/PYTHON/plot_XYNTHIA.py
@@ -24,7 +24,7 @@ os.system('rm -f tempgraph*')
#
path="../RUN/"
-LnameFiles = ['XYNTH.1.CEN4T.010.nc']
+LnameFiles = ['XYNTH.1.CEN4T.009.nc']
Dvar_input = {'f1':['ZS', 'ZTOP', 'TKET', 'THT', 'LSUM', 'LSVM', 'LSWM', 'UT', 'VT', 'WT', 'ni', 'nj', 'ni_u', 'nj_u', 'level', 'level_w', 'latitude', 'longitude', 'time', 'FLALWD']}
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/XYNTHIA_2.5km/PYTHON/plot_XYNTHIA_AGG4.py b/MY_RUN/INTEGRATION_CASES/HPC/XYNTHIA_2.5km/PYTHON/plot_XYNTHIA_AGG4.py
index bc1adc033..a15b93fd4 100644
--- a/MY_RUN/INTEGRATION_CASES/HPC/XYNTHIA_2.5km/PYTHON/plot_XYNTHIA_AGG4.py
+++ b/MY_RUN/INTEGRATION_CASES/HPC/XYNTHIA_2.5km/PYTHON/plot_XYNTHIA_AGG4.py
@@ -24,7 +24,7 @@ os.system('rm -f tempgraph*')
#
path="../RUN_AGG4/"
-LnameFiles = ['XYNTH.1.CEN4T.010.nc']
+LnameFiles = ['XYNTH.1.CEN4T.009.nc']
Dvar_input = {'f1':['ZS', 'ZTOP', 'TKET', 'THT', 'LSUM', 'LSVM', 'LSWM', 'UT', 'VT', 'WT', 'ni', 'nj', 'ni_u', 'nj_u', 'level', 'level_w', 'latitude', 'longitude', 'time', 'FLALWD']}
diff --git a/MY_RUN/INTEGRATION_CASES/HPC/XYNTHIA_2.5km/PYTHON/run_python b/MY_RUN/INTEGRATION_CASES/HPC/XYNTHIA_2.5km/PYTHON/run_python
old mode 100644
new mode 100755
diff --git a/MY_RUN/INTEGRATION_CASES/LOCAL/2Drelief/003_python/run_python b/MY_RUN/INTEGRATION_CASES/LOCAL/2Drelief/003_python/run_python
index 1af82896b..7d866f2c0 100755
--- a/MY_RUN/INTEGRATION_CASES/LOCAL/2Drelief/003_python/run_python
+++ b/MY_RUN/INTEGRATION_CASES/LOCAL/2Drelief/003_python/run_python
@@ -9,4 +9,4 @@ ln -sf ${SRC_MESONH}/src/LIB/Python/* .
python3 plot_2DRelief.py
${POSTRUN} convert *.png 2DRelief.pdf
-${POSTRUN} evince 2DRelief.pdf
+${POSTRUN} okular 2DRelief.pdf
diff --git a/MY_RUN/INTEGRATION_CASES/LOCAL/3Drelief/002_mesonh/EXSEG1.nam b/MY_RUN/INTEGRATION_CASES/LOCAL/3Drelief/002_mesonh/EXSEG1.nam
index 2ad04905e..969617ef8 100644
--- a/MY_RUN/INTEGRATION_CASES/LOCAL/3Drelief/002_mesonh/EXSEG1.nam
+++ b/MY_RUN/INTEGRATION_CASES/LOCAL/3Drelief/002_mesonh/EXSEG1.nam
@@ -12,4 +12,4 @@
&NAM_DYN XSEGLEN = 10000., XASSELIN = 0.2, LCORIO = F,
XALKTOP = 0.005, XALZBOT = 12570.,
LNUMDIFU =.F. /
-&NAM_BACKUP XBAK_TIME(1,1) = 5000., XBAK_TIME(1,2) = 10000. /
+&NAM_BACKUP XBAK_TIME(1,1) = 4960., XBAK_TIME(1,2) = 10000. /
diff --git a/MY_RUN/INTEGRATION_CASES/LOCAL/3Drelief/003_python/run_python b/MY_RUN/INTEGRATION_CASES/LOCAL/3Drelief/003_python/run_python
index bc59beaeb..25b86f94c 100755
--- a/MY_RUN/INTEGRATION_CASES/LOCAL/3Drelief/003_python/run_python
+++ b/MY_RUN/INTEGRATION_CASES/LOCAL/3Drelief/003_python/run_python
@@ -10,4 +10,4 @@ ln -sf ../002_mesonh/REL3D.1.EXP01.002.nc .
python3 plot_3DRelief.py
${POSTRUN} convert *.png 002_3DRelief.pdf
-${POSTRUN} evince 002_3DRelief.pdf
+${POSTRUN} okular 002_3DRelief.pdf
diff --git a/MY_RUN/INTEGRATION_CASES/LOCAL/COLD_BUBBLE/003_python/run_python b/MY_RUN/INTEGRATION_CASES/LOCAL/COLD_BUBBLE/003_python/run_python
index 728777a9b..b185203d2 100755
--- a/MY_RUN/INTEGRATION_CASES/LOCAL/COLD_BUBBLE/003_python/run_python
+++ b/MY_RUN/INTEGRATION_CASES/LOCAL/COLD_BUBBLE/003_python/run_python
@@ -9,8 +9,10 @@ ln -sf ${SRC_MESONH}/src/LIB/Python/*.py .
ln -sf ../002_mesonh/BUBBL.1.CEN4T.0*.nc .
python3 plot_COLD_BUBBLE.py
-convert *.png COLD_BUBBLE1.pdf
+convert *.png COLD_BUBBLE.pdf
+
+#convert *.png COLD_BUBBLE1.pdf
# Le 3e trace n'est pas converti dans le PDF ????? Bypass:
-convert tempgraph3.png COLD_BUBBLE2.pdf
-pdfunite COLD_BUBBLE1.pdf COLD_BUBBLE2.pdf COLD_BUBBLE.pdf
-rm -f COLD_BUBBLE1.pdf COLD_BUBBLE2.pdf
+#convert tempgraph3.png COLD_BUBBLE2.pdf
+#pdfunite COLD_BUBBLE1.pdf COLD_BUBBLE2.pdf COLD_BUBBLE.pdf
+#rm -f COLD_BUBBLE1.pdf COLD_BUBBLE2.pdf
diff --git a/MY_RUN/KTEST/005_ARM/002_mesonh/EXSEG1.nam b/MY_RUN/KTEST/005_ARM/002_mesonh/EXSEG1.nam
index 00831a226..8f5038879 100644
--- a/MY_RUN/KTEST/005_ARM/002_mesonh/EXSEG1.nam
+++ b/MY_RUN/KTEST/005_ARM/002_mesonh/EXSEG1.nam
@@ -20,12 +20,12 @@
&NAM_CONF CCONF = "START", LFLAT = .TRUE., NMODEL = 1,
NVERB = 4, CEQNSYS='DUR', lforcing=.true.,
CEXP = "ARM__", CSEG = "CEN4T" /
-&NAM_DYN XSEGLEN = 36000. , XASSELIN = 0.1, LCORIO = .true.,
+&NAM_DYN XSEGLEN = 54000. , XASSELIN = 0.1, LCORIO = .true.,
LNUMDIFU = .FALSE.,
XALKTOP = 0.01, XALZBOT = 3500. /
&NAM_NESTING NDAD(1) = 1 , NDAD(2) = 1 , NDTRATIO(1) = 1, NDTRATIO(2) = 2 ,
XWAY(1) = 1., XWAY(2) = 2. /
-&NAM_BACKUP XBAK_TIME(1,1)= 36000. /
+&NAM_BACKUP XBAK_TIME(1,1)= 54000. /
&NAM_BUDGET CBUTYPE = 'NONE' /
&NAM_BU_RU LBU_RU = .FALSE. /
&NAM_BU_RV LBU_RV = .FALSE. /
--
GitLab