From 18cd0f66e24170fbf1030dc059fe84ecde85068e Mon Sep 17 00:00:00 2001
From: Christine Lac <christine.lac@meteo.fr>
Date: Fri, 13 Dec 2013 17:06:20 +0000
Subject: [PATCH] adaptation WENO

---
 .../007_16janvier/008_run2/EXSEG1.nam.src     |  2 +-
 .../008_run2/EXSEG1.nam.src_CEN4TH            | 33 +++++++++++++++++++
 .../008_run2/EXSEG1.nam.src_WENO              | 33 +++++++++++++++++++
 .../007_16janvier/008_run2/EXSEG2.nam.src     |  2 +-
 .../008_run2/EXSEG2.nam.src_CEN4TH            | 23 +++++++++++++
 .../008_run2/EXSEG2.nam.src_WENO              | 23 +++++++++++++
 .../007_16janvier/011_diaprog/dir_16janv      | 16 ++++-----
 .../011_ncl_extractdia/dir_exnetcdf           | 14 ++++----
 .../011_ncl_extractdia/mnh_Cloud1.ncl         |  8 ++---
 .../011_ncl_extractdia/mnh_CrossSection1.ncl  |  6 ++--
 .../011_ncl_extractdia/mnh_ModelLevels1.ncl   |  8 ++---
 .../011_ncl_extractdia/mnh_PressureLevel1.ncl | 10 +++---
 12 files changed, 145 insertions(+), 33 deletions(-)
 create mode 100644 MY_RUN/KTEST/007_16janvier/008_run2/EXSEG1.nam.src_CEN4TH
 create mode 100644 MY_RUN/KTEST/007_16janvier/008_run2/EXSEG1.nam.src_WENO
 create mode 100644 MY_RUN/KTEST/007_16janvier/008_run2/EXSEG2.nam.src_CEN4TH
 create mode 100644 MY_RUN/KTEST/007_16janvier/008_run2/EXSEG2.nam.src_WENO

diff --git a/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG1.nam.src b/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG1.nam.src
index 88fffcb0d..4494e9b09 100644
--- a/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG1.nam.src
+++ b/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG1.nam.src
@@ -8,7 +8,7 @@
            NITR = 8,
            LHORELAX_UVWTH = T, LHORELAX_RV = T, LVE_RELAX = T,
            NRIMX = 5, NRIMY = 5, XRIMKMAX = 0.0083, XT4DIFU = 5000. /
-&NAM_ADVn  CMET_ADV_SCHEME = "FCT2ND", CSV_ADV_SCHEME = "FCT2ND" /
+&NAM_ADVn  CUVW_ADV_SCHEME="CEN4TH",CMET_ADV_SCHEME = "PPM_01", CSV_ADV_SCHEME = "PPM_01" /
 &NAM_PARAMn  CCLOUD = "KESS", CTURB = "TKEL", CRAD = "ECMW",
              CDCONV = "KAFR",CSCONV="KAFR" /
 &NAM_PARAM_RADn  XDTRAD = 3600., XDTRAD_CLONLY = 3600., NRAD_COLNBR = 400 /
diff --git a/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG1.nam.src_CEN4TH b/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG1.nam.src_CEN4TH
new file mode 100644
index 000000000..4494e9b09
--- /dev/null
+++ b/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG1.nam.src_CEN4TH
@@ -0,0 +1,33 @@
+&NAM_CONFZ
+ NZ_VERB=5
+ ! NZ_VERB=5 , NZ_PROC=0 , NB_PROCIO_R=1 , NB_PROCIO_W=8 
+/
+&NAM_LUNITn  CINIFILE = "16JAN_06_MNH",CINIFILEPGD="16JAN98_36km.neste1"  /
+&NAM_DYNn  XTSTEP = 60.,  
+           ! CPRESOPT = "ZRESI", 
+           NITR = 8,
+           LHORELAX_UVWTH = T, LHORELAX_RV = T, LVE_RELAX = T,
+           NRIMX = 5, NRIMY = 5, XRIMKMAX = 0.0083, XT4DIFU = 5000. /
+&NAM_ADVn  CUVW_ADV_SCHEME="CEN4TH",CMET_ADV_SCHEME = "PPM_01", CSV_ADV_SCHEME = "PPM_01" /
+&NAM_PARAMn  CCLOUD = "KESS", CTURB = "TKEL", CRAD = "ECMW",
+             CDCONV = "KAFR",CSCONV="KAFR" /
+&NAM_PARAM_RADn  XDTRAD = 3600., XDTRAD_CLONLY = 3600., NRAD_COLNBR = 400 /
+&NAM_PARAM_KAFRn XDTCONV = 300., NICE = 1 LREFRESH_ALL = T,LDOWN = T /
+&NAM_LBCn  CLBCX = 2*"OPEN", CLBCY = 2*"OPEN" /
+&NAM_TURBn  CTURBLEN = "BL89", CTURBDIM = "1DIM", LSUBG_COND = F /
+&NAM_CH_MNHCn LUSECHEM = F /
+&NAM_CONF  CCONF = "START", NVERB=5, NMODEL = 2,
+            CEXP = "16JAN", CSEG = "12B18" ,
+            CSPLIT='BSPLITTING' /
+&NAM_DYN  XSEGLEN = 300., LCORIO = T, LNUMDIFU = T,
+           XALKTOP = 0.001, XALZBOT = 14500. /
+&NAM_NESTING NDAD(2) = 1, NDTRATIO(2) = 4, XWAY(2) = 2. /
+&NAM_FMOUT XFMOUT(1,1) = 300. /
+&NAM_DIAG_SURFn  /
+&NAM_ISBAn CSCOND="NP89", CALBEDO="DRY",CROUGH='NONE', 
+       CC1DRY='DEF', CSOILFRZ='DEF', CDIFSFCOND='DEF', CSNOWRES='DEF' /
+&NAM_SSOn CROUGH='Z01D' /
+&NAM_DIAG_ISBAn /
+&NAM_SEAFLUXn CSEA_ALB="UNIF" /
+&NAM_BLANK /
+
diff --git a/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG1.nam.src_WENO b/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG1.nam.src_WENO
new file mode 100644
index 000000000..68efa21b5
--- /dev/null
+++ b/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG1.nam.src_WENO
@@ -0,0 +1,33 @@
+&NAM_CONFZ
+ NZ_VERB=5
+ ! NZ_VERB=5 , NZ_PROC=0 , NB_PROCIO_R=1 , NB_PROCIO_W=8 
+/
+&NAM_LUNITn  CINIFILE = "16JAN_06_MNH",CINIFILEPGD="16JAN98_36km.neste1"  /
+&NAM_DYNn  XTSTEP = 150.,  
+           ! CPRESOPT = "ZRESI", 
+           NITR = 8,
+           LHORELAX_UVWTH = T, LHORELAX_RV = T, LVE_RELAX = T,
+           NRIMX = 5, NRIMY = 5, XRIMKMAX = 0.0083, XT4DIFU = 5000. /
+&NAM_ADVn  CUVW_ADV_SCHEME="WENO_K",CMET_ADV_SCHEME = "PPM_01", CSV_ADV_SCHEME = "PPM_01" /
+&NAM_PARAMn  CCLOUD = "KESS", CTURB = "TKEL", CRAD = "ECMW",
+             CDCONV = "KAFR",CSCONV="KAFR" /
+&NAM_PARAM_RADn  XDTRAD = 3600., XDTRAD_CLONLY = 3600., NRAD_COLNBR = 400 /
+&NAM_PARAM_KAFRn XDTCONV = 300., NICE = 1 LREFRESH_ALL = T,LDOWN = T /
+&NAM_LBCn  CLBCX = 2*"OPEN", CLBCY = 2*"OPEN" /
+&NAM_TURBn  CTURBLEN = "BL89", CTURBDIM = "1DIM", LSUBG_COND = F /
+&NAM_CH_MNHCn LUSECHEM = F /
+&NAM_CONF  CCONF = "START", NVERB=5, NMODEL = 2,
+            CEXP = "16JAN", CSEG = "12B18" ,
+            CSPLIT='BSPLITTING' /
+&NAM_DYN  XSEGLEN = 300., LCORIO = T, LNUMDIFU = F,
+           XALKTOP = 0.001, XALZBOT = 14500. /
+&NAM_NESTING NDAD(2) = 1, NDTRATIO(2) = 3, XWAY(2) = 2. /
+&NAM_FMOUT XFMOUT(1,1) = 300. /
+&NAM_DIAG_SURFn  /
+&NAM_ISBAn CSCOND="NP89", CALBEDO="DRY",CROUGH='NONE', 
+       CC1DRY='DEF', CSOILFRZ='DEF', CDIFSFCOND='DEF', CSNOWRES='DEF' /
+&NAM_SSOn CROUGH='Z01D' /
+&NAM_DIAG_ISBAn /
+&NAM_SEAFLUXn CSEA_ALB="UNIF" /
+&NAM_BLANK /
+
diff --git a/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG2.nam.src b/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG2.nam.src
index 31c90a553..659074c68 100644
--- a/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG2.nam.src
+++ b/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG2.nam.src
@@ -3,7 +3,7 @@
            LHORELAX_UVWTH = F, LHORELAX_RV = F, LHORELAX_RC= F, LHORELAX_RR= F,
            LHORELAX_RS= F, LHORELAX_RI= F, LHORELAX_RG= F, LHORELAX_TKE= F,
            NRIMX = 0, NRIMY = 0, LVE_RELAX = T, XT4DIFU = 1500. /
-&NAM_ADVn CMET_ADV_SCHEME = "FCT2ND", CSV_ADV_SCHEME = "FCT2ND" /
+&NAM_ADVn CUVW_ADV_SCHEME="CEN4TH",CMET_ADV_SCHEME = "PPM_01", CSV_ADV_SCHEME = "PPM_01" /
 &NAM_PARAMn  CCLOUD = "KESS", CTURB = "TKEL", CRAD = "ECMW", CDCONV = "KAFR" /
 &NAM_PARAM_RADn  XDTRAD = 1800., XDTRAD_CLONLY = 1800., LCLEAR_SKY = F,
              NRAD_COLNBR = 400 /
diff --git a/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG2.nam.src_CEN4TH b/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG2.nam.src_CEN4TH
new file mode 100644
index 000000000..659074c68
--- /dev/null
+++ b/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG2.nam.src_CEN4TH
@@ -0,0 +1,23 @@
+&NAM_LUNITn  CINIFILE = "16JAN_06_MNH2" ,CINIFILEPGD="16JAN98_9km.neste1" /
+&NAM_DYNn CPRESOPT = "RICHA", NITR = 8, XRELAX = 1.,
+           LHORELAX_UVWTH = F, LHORELAX_RV = F, LHORELAX_RC= F, LHORELAX_RR= F,
+           LHORELAX_RS= F, LHORELAX_RI= F, LHORELAX_RG= F, LHORELAX_TKE= F,
+           NRIMX = 0, NRIMY = 0, LVE_RELAX = T, XT4DIFU = 1500. /
+&NAM_ADVn CUVW_ADV_SCHEME="CEN4TH",CMET_ADV_SCHEME = "PPM_01", CSV_ADV_SCHEME = "PPM_01" /
+&NAM_PARAMn  CCLOUD = "KESS", CTURB = "TKEL", CRAD = "ECMW", CDCONV = "KAFR" /
+&NAM_PARAM_RADn  XDTRAD = 1800., XDTRAD_CLONLY = 1800., LCLEAR_SKY = F,
+             NRAD_COLNBR = 400 /
+&NAM_PARAM_KAFRn XDTCONV = 300., NICE = 1, LREFRESH_ALL = T,
+              LDOWN = T /
+&NAM_LBCn  CLBCX = 2*"OPEN", CLBCY = 2*"OPEN", XCPHASE = 20. /
+&NAM_TURBn  XIMPL = 1., CTURBLEN = "BL89", CTURBDIM = "1DIM" ,
+            LTURB_FLX = F, LTURB_DIAG = F, LSUBG_COND = F /
+&NAM_CH_MNHCn LUSECHEM = F /
+&NAM_DIAG_SURFn  /
+&NAM_SSOn CROUGH='Z01D' /
+&NAM_ISBAn CSCOND  = "NP89", CALBEDO = "DRY",CROUGH='NONE',
+       CC1DRY = 'DEF', CSOILFRZ = 'DEF', CDIFSFCOND = 'DEF', CSNOWRES = 'DEF'  /
+&NAM_DIAG_ISBAn /
+&NAM_SEAFLUXn CSEA_ALB="UNIF" /
+&NAM_BLANK /
+
diff --git a/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG2.nam.src_WENO b/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG2.nam.src_WENO
new file mode 100644
index 000000000..7c439630f
--- /dev/null
+++ b/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG2.nam.src_WENO
@@ -0,0 +1,23 @@
+&NAM_LUNITn  CINIFILE = "16JAN_06_MNH2" ,CINIFILEPGD="16JAN98_9km.neste1" /
+&NAM_DYNn CPRESOPT = "RICHA", NITR = 8, XRELAX = 1.,
+           LHORELAX_UVWTH = F, LHORELAX_RV = F, LHORELAX_RC= F, LHORELAX_RR= F,
+           LHORELAX_RS= F, LHORELAX_RI= F, LHORELAX_RG= F, LHORELAX_TKE= F,
+           NRIMX = 0, NRIMY = 0, LVE_RELAX = T, XT4DIFU = 1500. /
+&NAM_ADVn CUVW_ADV_SCHEME="WENO_K",CMET_ADV_SCHEME = "PPM_01", CSV_ADV_SCHEME = "PPM_01" /
+&NAM_PARAMn  CCLOUD = "KESS", CTURB = "TKEL", CRAD = "ECMW", CDCONV = "KAFR" /
+&NAM_PARAM_RADn  XDTRAD = 1800., XDTRAD_CLONLY = 1800., LCLEAR_SKY = F,
+             NRAD_COLNBR = 400 /
+&NAM_PARAM_KAFRn XDTCONV = 300., NICE = 1, LREFRESH_ALL = T,
+              LDOWN = T /
+&NAM_LBCn  CLBCX = 2*"OPEN", CLBCY = 2*"OPEN", XCPHASE = 20. /
+&NAM_TURBn  XIMPL = 1., CTURBLEN = "BL89", CTURBDIM = "1DIM" ,
+            LTURB_FLX = F, LTURB_DIAG = F, LSUBG_COND = F /
+&NAM_CH_MNHCn LUSECHEM = F /
+&NAM_DIAG_SURFn  /
+&NAM_SSOn CROUGH='Z01D' /
+&NAM_ISBAn CSCOND  = "NP89", CALBEDO = "DRY",CROUGH='NONE',
+       CC1DRY = 'DEF', CSOILFRZ = 'DEF', CDIFSFCOND = 'DEF', CSNOWRES = 'DEF'  /
+&NAM_DIAG_ISBAn /
+&NAM_SEAFLUXn CSEA_ALB="UNIF" /
+&NAM_BLANK /
+
diff --git a/MY_RUN/KTEST/007_16janvier/011_diaprog/dir_16janv b/MY_RUN/KTEST/007_16janvier/011_diaprog/dir_16janv
index ecff3965b..8c12e7a0c 100644
--- a/MY_RUN/KTEST/007_16janvier/011_diaprog/dir_16janv
+++ b/MY_RUN/KTEST/007_16janvier/011_diaprog/dir_16janv
@@ -10,15 +10,15 @@ ZS
 LCOLAREA=T LISO=F                                                               
 LCOLZERO=T NCOLZERO=1                                                           
 LCOLZERO=F
-NIMNMX=0 XDIAINT_THM=1.                                                         
-THM_PR_850_ON_UMVM_PR_850                                                       
+NIMNMX=0 XDIAINT_THT=1.                                                         
+THT_PR_850_ON_UTVT_PR_850                                                       
 NIMNMX=-1                                                                       
-RVM(*1000)_PR_700                                                               
-PABSM_Z_9000_ON_UMVM_Z_9000                                                     
+RVT(*1000)_PR_700                                                               
+PABST_Z_9000_ON_UTVT_Z_9000                                                     
 _file2_
-NIMNMX=0 XDIAINT_THM=1.                                                         
-THM_PR_850_ON_UMVM_PR_850                                                       
+NIMNMX=0 XDIAINT_THT=1.                                                         
+THT_PR_850_ON_UTVT_PR_850                                                       
 NIMNMX=-1                                                                       
-RVM(*1000)_PR_700                                                               
-PABSM_Z_9000_ON_UMVM_Z_9000                                                     
+RVT(*1000)_PR_700                                                               
+PABST_Z_9000_ON_UTVT_Z_9000                                                     
 quit                           
diff --git a/MY_RUN/KTEST/007_16janvier/011_ncl_extractdia/dir_exnetcdf b/MY_RUN/KTEST/007_16janvier/011_ncl_extractdia/dir_exnetcdf
index 5b1b61101..8f095894b 100644
--- a/MY_RUN/KTEST/007_16janvier/011_ncl_extractdia/dir_exnetcdf
+++ b/MY_RUN/KTEST/007_16janvier/011_ncl_extractdia/dir_exnetcdf
@@ -14,16 +14,16 @@ KCDL
   0
   0
 CONF
- UM
- VM
- WM
+ UT
+ VT
+ WT
 ALT
-THM
-PABSM
-RVM
+THT
+PABST
+RVT
 MRC
 MRR
-RIM
+RIT
 ACPRR
 ZSBIS
 END
diff --git a/MY_RUN/KTEST/007_16janvier/011_ncl_extractdia/mnh_Cloud1.ncl b/MY_RUN/KTEST/007_16janvier/011_ncl_extractdia/mnh_Cloud1.ncl
index a994dfcbb..bacb0c30b 100644
--- a/MY_RUN/KTEST/007_16janvier/011_ncl_extractdia/mnh_Cloud1.ncl
+++ b/MY_RUN/KTEST/007_16janvier/011_ncl_extractdia/mnh_Cloud1.ncl
@@ -43,8 +43,8 @@ begin
 ;=================================================;
 ; Read water wapor mixing ratio if it exists
 ; -----------------------------------------
-    if(isfilevar(a,"RVM"))
-      qv = a->RVM(0,:,:,:)
+    if(isfilevar(a,"RVT"))
+      qv = a->RVT(0,:,:,:)
       qv = qv*1000.
       qv@units = "g/kg"   
       qv@description="Water vapor mixing ratio"
@@ -70,8 +70,8 @@ begin
 
 ; Read ice mixing ratio if it exists
 ; -----------------------------------------
-    if(isfilevar(a,"RIM"))
-      qi = a->RIM(0,:,:,:)
+    if(isfilevar(a,"RIT"))
+      qi = a->RIT(0,:,:,:)
       qi = qi*1000.
       qi@units = "g/kg"   
       qi@description="Ice mixing ratio"
diff --git a/MY_RUN/KTEST/007_16janvier/011_ncl_extractdia/mnh_CrossSection1.ncl b/MY_RUN/KTEST/007_16janvier/011_ncl_extractdia/mnh_CrossSection1.ncl
index ddac950ce..296df7bfd 100644
--- a/MY_RUN/KTEST/007_16janvier/011_ncl_extractdia/mnh_CrossSection1.ncl
+++ b/MY_RUN/KTEST/007_16janvier/011_ncl_extractdia/mnh_CrossSection1.ncl
@@ -36,7 +36,7 @@ begin
 ;=================================================;
 ; Get informations on variable sizes
 ;=================================================;
-  mdims = getfilevardimsizes(a,"UM") ; get some dimension sizes for the file
+  mdims = getfilevardimsizes(a,"UT") ; get some dimension sizes for the file
   nd = dimsizes(mdims)
 
 ;=================================================;
@@ -44,11 +44,11 @@ begin
 ;=================================================;
   ZS =a->ZSBIS(0,:,:)
 
-  th = a->THM(0,:,:,:)
+  th = a->THT(0,:,:,:)
   th@long_name="Potential Temperature"
   th@description="TH"
 
-  um = a->UM(0,:,:,:)
+  um = a->UT(0,:,:,:)
   um@description="U"
 
   z= a->ALT(0,:,:,:)
diff --git a/MY_RUN/KTEST/007_16janvier/011_ncl_extractdia/mnh_ModelLevels1.ncl b/MY_RUN/KTEST/007_16janvier/011_ncl_extractdia/mnh_ModelLevels1.ncl
index 80d60924c..33f908fbf 100644
--- a/MY_RUN/KTEST/007_16janvier/011_ncl_extractdia/mnh_ModelLevels1.ncl
+++ b/MY_RUN/KTEST/007_16janvier/011_ncl_extractdia/mnh_ModelLevels1.ncl
@@ -24,18 +24,18 @@ begin
 ;=================================================;
 ; Read the variables we need
 ;=================================================;
-  th  = a->THM(0,:,:,:)   ; theta
+  th  = a->THT(0,:,:,:)   ; theta
   th@description="Potential Temperature"
 
-  qv  = a->RVM(0,:,:,:)   ; Qv
+  qv  = a->RVT(0,:,:,:)   ; Qv
   qv = qv*1000.
   qv@units = "g/kg"
   qv@description="Water vapor mixing ratio"
 
-  u   = a->UM(0,:,:,:)        ; u 
+  u   = a->UT(0,:,:,:)        ; u 
   u@description="U"
 
-  v   = a->VM(0,:,:,:)        ; v 
+  v   = a->VT(0,:,:,:)        ; v 
   v@description="V"
 
 ; Calculate wind speed
diff --git a/MY_RUN/KTEST/007_16janvier/011_ncl_extractdia/mnh_PressureLevel1.ncl b/MY_RUN/KTEST/007_16janvier/011_ncl_extractdia/mnh_PressureLevel1.ncl
index 9109180c2..6cb84caef 100644
--- a/MY_RUN/KTEST/007_16janvier/011_ncl_extractdia/mnh_PressureLevel1.ncl
+++ b/MY_RUN/KTEST/007_16janvier/011_ncl_extractdia/mnh_PressureLevel1.ncl
@@ -34,17 +34,17 @@ begin
 ;=================================================;
 ; Read the variables we need
 ;=================================================;
-    tk = a->THM(0,:,:,:)	          ; potential temperature
+    tk = a->THT(0,:,:,:)	          ; potential temperature
     tk@description="Potential Temperature"
 
-    u = a->UM(0,:,:,:)               ; u
+    u = a->UT(0,:,:,:)               ; u
 
-    v = a->VM(0,:,:,:)               ; v
+    v = a->VT(0,:,:,:)               ; v
 
-    p = a->PABSM(0,:,:,:)            ; pressure
+    p = a->PABST(0,:,:,:)            ; pressure
     p@description="Pressure"
 
-    rv = a->RVM(0,:,:,:)*1000        ; water vapor mixing ratio
+    rv = a->RVT(0,:,:,:)*1000        ; water vapor mixing ratio
     rv@description="Water vapor mixing ratio"
 
     ZS = a->ZSBIS(0,:,:) 	     ; terrain
-- 
GitLab