diff --git a/MY_RUN/KTEST/009_ICARTT/005_python/plot_009_ICARTT.py b/MY_RUN/KTEST/009_ICARTT/005_python/plot_009_ICARTT.py
index 9ca893ad07f9aa4a9ef2745a2cb31323a52117f0..e779630ea4c2b4bc1a1f9f198dede3a21d301fa2 100644
--- a/MY_RUN/KTEST/009_ICARTT/005_python/plot_009_ICARTT.py
+++ b/MY_RUN/KTEST/009_ICARTT/005_python/plot_009_ICARTT.py
@@ -22,9 +22,9 @@ path=""
LnameFiles = ['ICART.1.SEG01.001dg.nc', 'ICART.1.SEG01.002dg.nc']
Dvar_input = {
-'f1':['MRC','COT','O3T','O3_PROD','O3_LOSS','CO_PROD','CO_LOSS','level','ZTOP', 'longitude','latitude','level_w','time',
+'f1':['MRC','CO','O3','O3_PROD','O3_LOSS','CO_PROD','CO_LOSS','level','ZTOP', 'longitude','latitude','level_w','time',
'CO_BUDGET','O3_BUDGET','O3_CHREACLIST','CO_CHREACLIST'],
-'f2':['MRC','COT','O3T','O3_PROD','O3_LOSS','CO_PROD','CO_LOSS','level','ZTOP', 'longitude','latitude','level_w','time',
+'f2':['MRC','CO','O3','O3_PROD','O3_LOSS','CO_PROD','CO_LOSS','level','ZTOP', 'longitude','latitude','level_w','time',
'CO_BUDGET','O3_BUDGET','O3_CHREACLIST','CO_CHREACLIST']
}
# Read the variables in the files
@@ -36,7 +36,7 @@ Dvar = read_netcdf(LnameFiles, Dvar_input, path=path, removeHALO=True)
###############################################################
Panel1 = PanelPlot(3,3, [25,17],'Horizontal section at 1150m, 19h', titlepad=25, minmaxpad=1.04, timepad=-0.07, colorbarpad=0.01, colorbaraspect=40, labelcolorbarpad = 13)
-Lplot = [ Dvar['f1']['MRC'][:,:,:], Dvar['f1']['COT'][:,:,:], Dvar['f1']['O3T'][:,:,:], Dvar['f1']['O3_PROD'][:,:,:],
+Lplot = [ Dvar['f1']['MRC'][:,:,:], Dvar['f1']['CO'][:,:,:], Dvar['f1']['O3'][:,:,:], Dvar['f1']['O3_PROD'][:,:,:],
Dvar['f1']['O3_LOSS'][:,:,:], Dvar['f1']['CO_PROD'][:,:,:], Dvar['f1']['CO_LOSS'][:,:,:]]
LaxeX = [Dvar['f1']['longitude']]*len(Lplot)
@@ -65,7 +65,7 @@ Panel1.save_graph(1,fig1)
###############################################################
Panel2 = PanelPlot(3,3, [25,17],'Horizontal section at 1150m, 20h', titlepad=25, minmaxpad=1.04, timepad=-0.07, colorbarpad=0.01, colorbaraspect=40, labelcolorbarpad = 13)
-Lplot = [ Dvar['f2']['MRC'][:,:,:], Dvar['f2']['COT'][:,:,:], Dvar['f2']['O3T'][:,:,:], Dvar['f2']['O3_PROD'][:,:,:],
+Lplot = [ Dvar['f2']['MRC'][:,:,:], Dvar['f2']['CO'][:,:,:], Dvar['f2']['O3'][:,:,:], Dvar['f2']['O3_PROD'][:,:,:],
Dvar['f2']['O3_LOSS'][:,:,:], Dvar['f2']['CO_PROD'][:,:,:], Dvar['f2']['CO_LOSS'][:,:,:]]
fig2 = Panel2.psectionH(lon=LaxeX, lat=LaxeY, Lvar=Lplot, Llevel=Llvl,Lylab=Lylab, Ltitle=Ltitle, Lminval=Lminval, Lmaxval=Lmaxval,
diff --git a/MY_RUN/KTEST/011_KW78CHEM/004_python/plot_011_KW78CHEM.py b/MY_RUN/KTEST/011_KW78CHEM/004_python/plot_011_KW78CHEM.py
index 9666ee0c3614aea18c5a55add922bbde82015df1..84b6699599b0e26f123eedb8885a571e75c8b6b2 100644
--- a/MY_RUN/KTEST/011_KW78CHEM/004_python/plot_011_KW78CHEM.py
+++ b/MY_RUN/KTEST/011_KW78CHEM/004_python/plot_011_KW78CHEM.py
@@ -23,8 +23,8 @@ Dvar_input = {
'f1':['ZS', 'UT','VT', 'WT','THT',
'ni_u','nj_u','level','ZTOP', 'ni','nj','level_w','time',
'INPRR','ACPRR','PABST','RCT','RVT','RRT','RGT', 'LSTHM',
- 'COT','O3T','HCHOT','WC_HCHOT','IC_HCHOT', 'WR_HCHOT','SO2T','WC_SO2T','WR_SO2T',
- 'IC_SO2T','HNO3T','WC_HNO3T','WR_HNO3T','IC_HNO3T','PHC','PHR',],
+ 'CO','O3','HCHO','WC_HCHO','IC_HCHO', 'WR_HCHO','SO2','WC_SO2','WR_SO2',
+ 'IC_SO2','HNO3','WC_HNO3','WR_HNO3','IC_HNO3','PHC','PHR',],
'f2':['ALT_CLOUD', 'ALT_U', 'ALT_V', 'ni','nj']
}
@@ -91,12 +91,12 @@ Panel1.save_graph(1,fig2)
###############################################################
Panel2 = PanelPlot(2,2, [20,20],'', titlepad=25, minmaxpad=1.04, timepad=-0.07, colorbarpad=0.01, colorbaraspect=40, labelcolorbarpad = 13)
-# Interpoler COT','O3T Ã 3000 et 5000m avec une moyenne sur 2 niveaux
-Dvar['f1']['COT3000m'] = (Dvar['f1']['COT'][6,:,:] + Dvar['f1']['COT'][5,:,:])/2.0
-Dvar['f1']['O3T3000m'] = (Dvar['f1']['O3T'][6,:,:] + Dvar['f1']['O3T'][5,:,:])/2.0
-Dvar['f1']['COT5000m'] = (Dvar['f1']['COT'][10,:,:] + Dvar['f1']['COT'][9,:,:])/2.0
-Dvar['f1']['O3T5000m'] = (Dvar['f1']['O3T'][10,:,:] + Dvar['f1']['O3T'][9,:,:])/2.0
-Lplot = [Dvar['f1']['COT3000m'], Dvar['f1']['O3T3000m'],Dvar['f1']['COT5000m'], Dvar['f1']['O3T5000m'] ]
+# Interpoler CO','O3 Ã 3000 et 5000m avec une moyenne sur 2 niveaux
+Dvar['f1']['CO3000m'] = (Dvar['f1']['CO'][6,:,:] + Dvar['f1']['CO'][5,:,:])/2.0
+Dvar['f1']['O33000m'] = (Dvar['f1']['O3'][6,:,:] + Dvar['f1']['O3'][5,:,:])/2.0
+Dvar['f1']['CO5000m'] = (Dvar['f1']['CO'][10,:,:] + Dvar['f1']['CO'][9,:,:])/2.0
+Dvar['f1']['O35000m'] = (Dvar['f1']['O3'][10,:,:] + Dvar['f1']['O3'][9,:,:])/2.0
+Lplot = [Dvar['f1']['CO3000m'], Dvar['f1']['O33000m'],Dvar['f1']['CO5000m'], Dvar['f1']['O35000m'] ]
LaxeX = [Dvar['f1']['ni']]*len(Lplot)
LaxeY = [Dvar['f1']['nj']]*len(Lplot)
@@ -200,24 +200,24 @@ Panel3.save_graph(3,fig5)
Panel4 = PanelPlot(2,3, [25,14],'Oblique projection of chemical variables', titlepad=25, minmaxpad=1.04, timepad=-0.07, colorbarpad=0.01, colorbaraspect=40, labelcolorbarpad = 13)
angle_sec1, RGT_sec1, axe_m1 = oblique_proj(Dvar['f1']['RGT'], Dvar['f1']['ni'], Dvar['f1']['nj'], Dvar['f1']['level'], i_beg, j_beg, i_end, j_end)
-angle_sec1, COT_sec1, axe_m1 = oblique_proj(Dvar['f1']['COT'], Dvar['f1']['ni'], Dvar['f1']['nj'], Dvar['f1']['level'], i_beg, j_beg, i_end, j_end)
-angle_sec1, O3T_sec1, axe_m1 = oblique_proj(Dvar['f1']['O3T'], Dvar['f1']['ni'], Dvar['f1']['nj'], Dvar['f1']['level'], i_beg, j_beg, i_end, j_end)
-angle_sec1, HCHOT_sec1, axe_m1 = oblique_proj(Dvar['f1']['HCHOT'], Dvar['f1']['ni'], Dvar['f1']['nj'], Dvar['f1']['level'], i_beg, j_beg, i_end, j_end)
-angle_sec1, WC_HCHOT_sec1, axe_m1 = oblique_proj(Dvar['f1']['WC_HCHOT'], Dvar['f1']['ni'], Dvar['f1']['nj'], Dvar['f1']['level'], i_beg, j_beg, i_end, j_end)
-angle_sec1, WR_HCHOT_sec1, axe_m1 = oblique_proj(Dvar['f1']['WR_HCHOT'], Dvar['f1']['ni'], Dvar['f1']['nj'], Dvar['f1']['level'], i_beg, j_beg, i_end, j_end)
-angle_sec1, SO2T_sec1, axe_m1 = oblique_proj(Dvar['f1']['SO2T'], Dvar['f1']['ni'], Dvar['f1']['nj'], Dvar['f1']['level'], i_beg, j_beg, i_end, j_end)
-angle_sec1, WC_SO2T_sec1, axe_m1 = oblique_proj(Dvar['f1']['WC_SO2T'], Dvar['f1']['ni'], Dvar['f1']['nj'], Dvar['f1']['level'], i_beg, j_beg, i_end, j_end)
-angle_sec1, WR_SO2T_sec1, axe_m1 = oblique_proj(Dvar['f1']['WR_SO2T'], Dvar['f1']['ni'], Dvar['f1']['nj'], Dvar['f1']['level'], i_beg, j_beg, i_end, j_end)
-angle_sec1, IC_SO2T_sec1, axe_m1 = oblique_proj(Dvar['f1']['IC_SO2T'], Dvar['f1']['ni'], Dvar['f1']['nj'], Dvar['f1']['level'], i_beg, j_beg, i_end, j_end)
-angle_sec1, IC_HCHOT_sec1, axe_m1 = oblique_proj(Dvar['f1']['IC_HCHOT'], Dvar['f1']['ni'], Dvar['f1']['nj'], Dvar['f1']['level'], i_beg, j_beg, i_end, j_end)
-angle_sec1, HNO3T_sec1, axe_m1 = oblique_proj(Dvar['f1']['HNO3T'], Dvar['f1']['ni'], Dvar['f1']['nj'], Dvar['f1']['level'], i_beg, j_beg, i_end, j_end)
-angle_sec1, WC_HNO3T_sec1, axe_m1 = oblique_proj(Dvar['f1']['WC_HNO3T'], Dvar['f1']['ni'], Dvar['f1']['nj'], Dvar['f1']['level'], i_beg, j_beg, i_end, j_end)
-angle_sec1, WR_HNO3T_sec1, axe_m1 = oblique_proj(Dvar['f1']['WR_HNO3T'], Dvar['f1']['ni'], Dvar['f1']['nj'], Dvar['f1']['level'], i_beg, j_beg, i_end, j_end)
-angle_sec1, IC_HNO3T_sec1, axe_m1 = oblique_proj(Dvar['f1']['IC_HNO3T'], Dvar['f1']['ni'], Dvar['f1']['nj'], Dvar['f1']['level'], i_beg, j_beg, i_end, j_end)
+angle_sec1, CO_sec1, axe_m1 = oblique_proj(Dvar['f1']['CO'], Dvar['f1']['ni'], Dvar['f1']['nj'], Dvar['f1']['level'], i_beg, j_beg, i_end, j_end)
+angle_sec1, O3_sec1, axe_m1 = oblique_proj(Dvar['f1']['O3'], Dvar['f1']['ni'], Dvar['f1']['nj'], Dvar['f1']['level'], i_beg, j_beg, i_end, j_end)
+angle_sec1, HCHO_sec1, axe_m1 = oblique_proj(Dvar['f1']['HCHO'], Dvar['f1']['ni'], Dvar['f1']['nj'], Dvar['f1']['level'], i_beg, j_beg, i_end, j_end)
+angle_sec1, WC_HCHO_sec1, axe_m1 = oblique_proj(Dvar['f1']['WC_HCHO'], Dvar['f1']['ni'], Dvar['f1']['nj'], Dvar['f1']['level'], i_beg, j_beg, i_end, j_end)
+angle_sec1, WR_HCHO_sec1, axe_m1 = oblique_proj(Dvar['f1']['WR_HCHO'], Dvar['f1']['ni'], Dvar['f1']['nj'], Dvar['f1']['level'], i_beg, j_beg, i_end, j_end)
+angle_sec1, SO2_sec1, axe_m1 = oblique_proj(Dvar['f1']['SO2'], Dvar['f1']['ni'], Dvar['f1']['nj'], Dvar['f1']['level'], i_beg, j_beg, i_end, j_end)
+angle_sec1, WC_SO2_sec1, axe_m1 = oblique_proj(Dvar['f1']['WC_SO2'], Dvar['f1']['ni'], Dvar['f1']['nj'], Dvar['f1']['level'], i_beg, j_beg, i_end, j_end)
+angle_sec1, WR_SO2_sec1, axe_m1 = oblique_proj(Dvar['f1']['WR_SO2'], Dvar['f1']['ni'], Dvar['f1']['nj'], Dvar['f1']['level'], i_beg, j_beg, i_end, j_end)
+angle_sec1, IC_SO2_sec1, axe_m1 = oblique_proj(Dvar['f1']['IC_SO2'], Dvar['f1']['ni'], Dvar['f1']['nj'], Dvar['f1']['level'], i_beg, j_beg, i_end, j_end)
+angle_sec1, IC_HCHO_sec1, axe_m1 = oblique_proj(Dvar['f1']['IC_HCHO'], Dvar['f1']['ni'], Dvar['f1']['nj'], Dvar['f1']['level'], i_beg, j_beg, i_end, j_end)
+angle_sec1, HNO3_sec1, axe_m1 = oblique_proj(Dvar['f1']['HNO3'], Dvar['f1']['ni'], Dvar['f1']['nj'], Dvar['f1']['level'], i_beg, j_beg, i_end, j_end)
+angle_sec1, WC_HNO3_sec1, axe_m1 = oblique_proj(Dvar['f1']['WC_HNO3'], Dvar['f1']['ni'], Dvar['f1']['nj'], Dvar['f1']['level'], i_beg, j_beg, i_end, j_end)
+angle_sec1, WR_HNO3_sec1, axe_m1 = oblique_proj(Dvar['f1']['WR_HNO3'], Dvar['f1']['ni'], Dvar['f1']['nj'], Dvar['f1']['level'], i_beg, j_beg, i_end, j_end)
+angle_sec1, IC_HNO3_sec1, axe_m1 = oblique_proj(Dvar['f1']['IC_HNO3'], Dvar['f1']['ni'], Dvar['f1']['nj'], Dvar['f1']['level'], i_beg, j_beg, i_end, j_end)
angle_sec1, PHC_sec1, axe_m1 = oblique_proj(Dvar['f1']['PHC'], Dvar['f1']['ni'], Dvar['f1']['nj'], Dvar['f1']['level'], i_beg, j_beg, i_end, j_end)
angle_sec1, PHR_sec1, axe_m1 = oblique_proj(Dvar['f1']['PHR'], Dvar['f1']['ni'], Dvar['f1']['nj'], Dvar['f1']['level'], i_beg, j_beg, i_end, j_end)
-Lplot = [COT_sec1, HCHOT_sec1, SO2T_sec1, HNO3T_sec1, PHC_sec1, PHR_sec1 ]
+Lplot = [CO_sec1, HCHO_sec1, SO2_sec1, HNO3_sec1, PHC_sec1, PHR_sec1 ]
LaxeX = [axe_m1]*len(Lplot)
LaxeZ = [Dvar['f1']['level']]*len(Lplot)
@@ -245,7 +245,7 @@ Panel4.save_graph(4,fig6)
###############################################################
Panel5 = PanelPlot(3,3, [25,14],'', titlepad=25, minmaxpad=1.04, timepad=-0.07, colorbarpad=0.01, colorbaraspect=40, labelcolorbarpad = 13)
-Lplot = [WC_HCHOT_sec1, WR_HCHOT_sec1, IC_HCHOT_sec1, WC_SO2T_sec1, WR_SO2T_sec1, IC_SO2T_sec1, WC_HNO3T_sec1, WR_HNO3T_sec1, IC_HNO3T_sec1]
+Lplot = [WC_HCHO_sec1, WR_HCHO_sec1, IC_HCHO_sec1, WC_SO2_sec1, WR_SO2_sec1, IC_SO2_sec1, WC_HNO3_sec1, WR_HNO3_sec1, IC_HNO3_sec1]
LaxeX = [axe_m1]*len(Lplot)
LaxeZ = [Dvar['f1']['level']]*len(Lplot)
diff --git a/MY_RUN/KTEST/012_dust/005_python/plot_012_dust.py b/MY_RUN/KTEST/012_dust/005_python/plot_012_dust.py
index 34819dabe4071852324a264955e5668dc147fe89..3e330d8c67533da8e2895d383dec8eb0a5188ff7 100644
--- a/MY_RUN/KTEST/012_dust/005_python/plot_012_dust.py
+++ b/MY_RUN/KTEST/012_dust/005_python/plot_012_dust.py
@@ -22,7 +22,7 @@ path=""
LnameFiles = ['DUST7.1.SEG02.004.nc']
Dvar_input = {'f1':['ZS', 'UT','VT', 'WT','THT',
- 'DSTM03T','DSTM33T','DSTM02T','DSTM32T','DSTM01T','DSTM31T','F_DST001P1','F_DST002P1','F_DST003P1',
+ 'DSTM03','DSTM33','DSTM02','DSTM32','DSTM01','DSTM31','F_DST001P1','F_DST002P1','F_DST003P1',
'latitude','longitude','level',
'INPRR','ACPRR','PABST','RCT','RVT','RRT','LSTHM']}
@@ -79,10 +79,10 @@ Panel1.save_graph(1,fig2)
######### PANEL 2
###############################################################
Panel2 = PanelPlot(2,3, [25,14],'', titlepad=25, minmaxpad=1.04, timepad=-0.07, colorbarpad=0.03, labelcolorbarpad = 13, colorbaraspect=40)
-Lplot = [ Dvar['f1']['DSTM03T'],Dvar['f1']['DSTM33T'],Dvar['f1']['DSTM02T'],Dvar['f1']['DSTM32T'],Dvar['f1']['DSTM01T'],Dvar['f1']['DSTM31T']]
+Lplot = [ Dvar['f1']['DSTM03'],Dvar['f1']['DSTM33'],Dvar['f1']['DSTM02'],Dvar['f1']['DSTM32'],Dvar['f1']['DSTM01'],Dvar['f1']['DSTM31']]
lon = [Dvar['f1']['longitude']]*len(Lplot)
lat = [Dvar['f1']['latitude']]*len(Lplot)
-Ltitle = ['DSTM03T','DSTM33T','DSTM02T','DSTM32T','DSTM01T','DSTM31T']
+Ltitle = ['DSTM03','DSTM33','DSTM02','DSTM32','DSTM01','DSTM31']
Lcbarlabel = ['kg/kg']*len(Lplot)
Lxlab = ['longitude']*len(Lplot)
Lylab = ['latitude']*len(Lplot)
diff --git a/MY_RUN/KTEST/014_LIMA/002_mesonh/EXSEG1.nam b/MY_RUN/KTEST/014_LIMA/002_mesonh/EXSEG1.nam
index 0d8a9c3402e73d2443109d3ce917aed225aa493b..b0e3ea573c9d4cc7fd8fa9cf151f5272d7d26cd2 100644
--- a/MY_RUN/KTEST/014_LIMA/002_mesonh/EXSEG1.nam
+++ b/MY_RUN/KTEST/014_LIMA/002_mesonh/EXSEG1.nam
@@ -78,13 +78,11 @@
LBU_ICP = .FALSE.,
LBU_JCP = .FALSE. /
-&NAM_PARAM_LIMA LWARM = T,
- LACTI = T,
+&NAM_PARAM_LIMA LACTI = T,
HINI_CCN='AER',
HTYPE_CCN(1)='C',
NMOD_CCN = 1, ! Nombre de modes de CCN
LACTIT=T,
- LRAIN=T,
LSEDC=F,
LBOUND=T,
LSCAV=F, ! Scavenging
@@ -92,11 +90,9 @@
LCCN_HOM=F, ! Concentration en CCN homogène selon z
CCCN_MODES='JUNGFRAU', ! Choix des modes de CCN
XCCN_CONC(1)=250., ! Concentration du mode 1 de CCN (/cm3)
- LCOLD = T,
LNUCL = T,
LSEDI=T,
LHHONI=T,
- LSNOW=T,
NMOD_IFN=1, ! Nombre de modes d'IFN
CPRISTINE_ICE_LIMA = 'PLAT',
CHEVRIMED_ICE_LIMA = 'GRAU',