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 f232cb54a044a8ea8c6be3bc9ce560af710089f0..6878792dd3dfe3e2aa1e7d1f88351f877bf511aa 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 f2fb39e082ad3fcb95f7d277269488cd348733b5..1e65126ddb73f69ab34e789dad99682942fde412 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 387479cc1f4e2870b1167c75e382967eaad29e09..dbe95af3e7afbad98472511bae3d439c887e33fe 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 4a936109a358d12962bc65a0de7a03f0a3deda08..9588726762cf86482c3cb54750d16a6f7111dd1e 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 a1ef65ab960140be8e0341b4dab354c8ebf2e5fd..46d89895e125636a926cef831095aaa8c728039e 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 aa3d2c502ecb37fdd6fa0f9a2592a3bb316d36ca..4dea95d5aa9b2d3397c0bd34b0d0b9a13f29d424 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 08ee5bd77b50a9abb9617be16336788c3ba53f22..355cf5afcceb252104c582b52c0706d9f3fbb770 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 d0669e403bf521fce3302e2f902f3246b47a6226..5da9cc76b00b49d61e24db3d0607e50fc92c1fe1 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 a5ea42e7dc2e086508821e74bd54877d95d781f6..36189d8c1b2b3354e2823db7e9e1b07f8dbe9356 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 d448666692762a70f9115868af58e739a30971c7..b39780143d3b89eaa0890998c9e1dbb101387ff5 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',