From 3bb4b9fba0ca0adc183fa3ab8a491592beb43944 Mon Sep 17 00:00:00 2001
From: Gaelle DELAUTIER <gaelle.delautier@meteo.fr>
Date: Fri, 26 Jan 2018 10:20:32 +0100
Subject: [PATCH] Gaelle 26/01/2018 SURFEX V8.1
---
MY_RUN/KTEST/007_16janvier/008_run2/EXSEG1.nam.src | 3 ++-
.../007_16janvier/008_run2/EXSEG1.nam.src_CEN4TH | 3 ++-
.../KTEST/007_16janvier/008_run2/EXSEG1.nam.src_WENO | 3 ++-
MY_RUN/KTEST/007_16janvier/008_run2/EXSEG2.nam.src | 5 +++--
.../007_16janvier/008_run2/EXSEG2.nam.src_CEN4TH | 3 ++-
.../KTEST/007_16janvier/008_run2/EXSEG2.nam.src_WENO | 3 ++-
MY_RUN/KTEST/012_dust/006_diaprog/dirdust | 6 +++---
MY_RUN/KTEST/012_dust/007_ncl/plot_dust.ncl | 12 ++++++------
.../1_INPUT_MNH/EXSEG1.nam_OCEAN | 3 +--
.../1_INPUT_MNH/EXSEG1.nam_WAVE | 3 +--
10 files changed, 24 insertions(+), 20 deletions(-)
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 f232cb54a..6878792dd 100644
--- a/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG1.nam.src
+++ b/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 /
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
index f2fb39e08..1e65126dd 100644
--- a/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG1.nam.src_CEN4TH
+++ b/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 /
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
index 387479cc1..dbe95af3e 100644
--- a/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG1.nam.src_WENO
+++ b/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 /
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 4a936109a..958872676 100644
--- a/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG2.nam.src
+++ b/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 /
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
index a1ef65ab9..46d89895e 100644
--- a/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG2.nam.src_CEN4TH
+++ b/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" /
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
index aa3d2c502..4dea95d5a 100644
--- a/MY_RUN/KTEST/007_16janvier/008_run2/EXSEG2.nam.src_WENO
+++ b/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" /
diff --git a/MY_RUN/KTEST/012_dust/006_diaprog/dirdust b/MY_RUN/KTEST/012_dust/006_diaprog/dirdust
index 08ee5bd77..355cf5afc 100644
--- a/MY_RUN/KTEST/012_dust/006_diaprog/dirdust
+++ b/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
diff --git a/MY_RUN/KTEST/012_dust/007_ncl/plot_dust.ncl b/MY_RUN/KTEST/012_dust/007_ncl/plot_dust.ncl
index d0669e403..5da9cc76b 100644
--- a/MY_RUN/KTEST/012_dust/007_ncl/plot_dust.ncl
+++ b/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
diff --git a/MY_RUN/KTEST/013_Iroise_ideal_case_coupling/1_INPUT_MNH/EXSEG1.nam_OCEAN b/MY_RUN/KTEST/013_Iroise_ideal_case_coupling/1_INPUT_MNH/EXSEG1.nam_OCEAN
index a5ea42e7d..36189d8c1 100755
--- a/MY_RUN/KTEST/013_Iroise_ideal_case_coupling/1_INPUT_MNH/EXSEG1.nam_OCEAN
+++ b/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',
diff --git a/MY_RUN/KTEST/013_Iroise_ideal_case_coupling/1_INPUT_MNH/EXSEG1.nam_WAVE b/MY_RUN/KTEST/013_Iroise_ideal_case_coupling/1_INPUT_MNH/EXSEG1.nam_WAVE
index d44866669..b39780143 100755
--- a/MY_RUN/KTEST/013_Iroise_ideal_case_coupling/1_INPUT_MNH/EXSEG1.nam_WAVE
+++ b/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',
--
GitLab