Gaelle 26/01/2018 SURFEX V8.1

MY_RUN/KTEST/007_16janvier/008_run2/EXSEG1.nam.src

@@ -26,7 +26,8 @@
 &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', 
+&NAM_ISBA CALBEDO="DRY" /
+&NAM_ISBAn CSCOND="NP89", 
        CC1DRY='DEF', CSOILFRZ='DEF', CDIFSFCOND='DEF', CSNOWRES='DEF' /
 &NAM_SSOn CROUGH='Z01D' /
 &NAM_DIAG_ISBAn /

MY_RUN/KTEST/007_16janvier/008_run2/EXSEG1.nam.src_CEN4TH

@@ -27,7 +27,8 @@
 &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', 
+&NAM_ISBA  CALBEDO="DRY"/
+&NAM_ISBAn CSCOND="NP89", 
        CC1DRY='DEF', CSOILFRZ='DEF', CDIFSFCOND='DEF', CSNOWRES='DEF' /
 &NAM_SSOn CROUGH='Z01D' /
 &NAM_DIAG_ISBAn /

MY_RUN/KTEST/007_16janvier/008_run2/EXSEG1.nam.src_WENO

@@ -28,7 +28,8 @@
 &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', 
+&NAM_ISBA  CALBEDO="DRY" /
+&NAM_ISBAn CSCOND="NP89",  
        CC1DRY='DEF', CSOILFRZ='DEF', CDIFSFCOND='DEF', CSNOWRES='DEF' /
 &NAM_SSOn CROUGH='Z01D' /
 &NAM_DIAG_ISBAn /

MY_RUN/KTEST/007_16janvier/008_run2/EXSEG2.nam.src

@@ -15,8 +15,9 @@
 &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_ISBA  CALBEDO = "DRY" /
+&NAM_ISBAn CSCOND  = "NP89",
+        CC1DRY = 'DEF', CSOILFRZ = 'DEF', CDIFSFCOND = 'DEF', CSNOWRES = 'DEF'  /
 &NAM_DIAG_ISBAn /
 &NAM_SEAFLUXn CSEA_ALB="UNIF" /
 &NAM_BLANK /

MY_RUN/KTEST/007_16janvier/008_run2/EXSEG2.nam.src_CEN4TH

@@ -15,7 +15,8 @@
 &NAM_CH_MNHCn LUSECHEM = F /
 &NAM_DIAG_SURFn  /
 &NAM_SSOn CROUGH='Z01D' /
-&NAM_ISBAn CSCOND  = "NP89", CALBEDO = "DRY",CROUGH='NONE',
+&NAM_ISBA  CALBEDO = "DRY" /
+&NAM_ISBAn CSCOND  = "NP89", 
        CC1DRY = 'DEF', CSOILFRZ = 'DEF', CDIFSFCOND = 'DEF', CSNOWRES = 'DEF'  /
 &NAM_DIAG_ISBAn /
 &NAM_SEAFLUXn CSEA_ALB="UNIF" /

MY_RUN/KTEST/007_16janvier/008_run2/EXSEG2.nam.src_WENO

@@ -16,7 +16,8 @@
 &NAM_CH_MNHCn LUSECHEM = F /
 &NAM_DIAG_SURFn  /
 &NAM_SSOn CROUGH='Z01D' /
-&NAM_ISBAn CSCOND  = "NP89", CALBEDO = "DRY",CROUGH='NONE',
+&NAM_ISBA CALBEDO = "DRY"/
+&NAM_ISBAn CSCOND  = "NP89", 
        CC1DRY = 'DEF', CSOILFRZ = 'DEF', CDIFSFCOND = 'DEF', CSNOWRES = 'DEF'  /
 &NAM_DIAG_ISBAn /
 &NAM_SEAFLUXn CSEA_ALB="UNIF" /

MY_RUN/KTEST/012_dust/006_diaprog/dirdust

@@ -28,7 +28,7 @@ DSTM02T_K_2
 DSTM32T_K_2
 DSTM01T_K_2
 DSTM31T_K_2
-FLX_DST001
-FLX_DST002
-FLX_DST003
+F_DST001P1
+F_DST002P1
+F_DST003P1
 quit

MY_RUN/KTEST/012_dust/007_ncl/plot_dust.ncl

@@ -159,21 +159,21 @@ dstm31t@units="ppp"
 dstm31t@lat2d = lat2d
 dstm31t@lon2d = lon2d
 
-flx_dst001= fichier1->FLX_DST001(jphext:jmax+jphext-1,jphext:imax+jphext-1)
-flx_dst001@long_name="FLX_DST001"
+flx_dst001= fichier1->F_DST001P1(jphext:jmax+jphext-1,jphext:imax+jphext-1)
+flx_dst001@long_name="F_DST001P1"
 flx_dst001@units="kg/m2/s"
 flx_dst001@lat2d = lat2d
 flx_dst001@lon2d = lon2d
 
 
-flx_dst002= fichier1->FLX_DST002(jphext:jmax+jphext-1,jphext:imax+jphext-1)
-flx_dst002@long_name="FLX_DST002"
+flx_dst002= fichier1->F_DST002P1(jphext:jmax+jphext-1,jphext:imax+jphext-1)
+flx_dst002@long_name="F_DST002P1"
 flx_dst002@units="kg/m2/s"
 flx_dst002@lat2d = lat2d
 flx_dst002@lon2d = lon2d
 
-flx_dst003= fichier1->FLX_DST003(jphext:jmax+jphext-1,jphext:imax+jphext-1)
-flx_dst003@long_name="FLX_DST003"
+flx_dst003= fichier1->F_DST003P1(jphext:jmax+jphext-1,jphext:imax+jphext-1)
+flx_dst003@long_name="F_DST003P1"
 flx_dst003@units="kg/m2/s"
 flx_dst003@lat2d = lat2d
 flx_dst003@lon2d = lon2d

MY_RUN/KTEST/013_Iroise_ideal_case_coupling/1_INPUT_MNH/EXSEG1.nam_OCEAN

@@ -112,9 +112,8 @@
 &NAM_DIAG_SURF_ATMn LFRAC=.TRUE.,
                     LDIAG_GRID=.TRUE. /
 
+&NAM_ISBA CALBEDO="DRY"/
 &NAM_ISBAn CSCOND="NP89",
-           CALBEDO="DRY",
-           CROUGH='NONE', 
            CC1DRY='DEF',
            CSOILFRZ='DEF',
            CDIFSFCOND='DEF',

MY_RUN/KTEST/013_Iroise_ideal_case_coupling/1_INPUT_MNH/EXSEG1.nam_WAVE

@@ -112,9 +112,8 @@
 &NAM_DIAG_SURF_ATMn LFRAC=.TRUE.,
                     LDIAG_GRID=.TRUE. /
 
+&NAM_ISBA CALBEDO="DRY" /
 &NAM_ISBAn CSCOND="NP89",
-           CALBEDO="DRY",
-           CROUGH='NONE', 
            CC1DRY='DEF',
            CSOILFRZ='DEF',
            CDIFSFCOND='DEF',