Index: LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/ini_histISCCP.h =================================================================== --- LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/ini_histISCCP.h (revision 917) +++ LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/ini_histISCCP.h (revision 918) @@ -146,4 +146,13 @@ . "ave(X)", zcals(n),zout_isccp(n)) c + CALL histdef(nid_isccp, "ptop", + . "Cld top pressure (cf ISCCP simulator)","Pa", + . iim,jj_nb,nhori, 1,1,1,-99,32, + . "ave(X)", zcals(n),zout_isccp(n)) +c + CALL histdef(nid_isccp,"meantaucld", + . "ISCCP mean cloud optical thickness","1", + . iim,jj_nb,nhori, 1,1,1, -99, 32, + . "ave(X)", zcals(n),zout_isccp(n)) ENDDO c @@ -169,4 +178,14 @@ . "Nb of calls with sunlit ", "%", . iim, jj_nb,nhori,1,1,1,-99,32, + . "ave(X)", zcals(n),zout_isccp(n)) +c + CALL histdef(nid_isccp, "ptop", + . "Cld top pressure (cf ISCCP simulator)","Pa", + . iim,jj_nb,nhori, 1,1,1,-99,32, + . "ave(X)", zcals(n),zout_isccp(n)) +c + CALL histdef(nid_isccp,"meantaucld", + . "ISCCP mean cloud optical thickness","1", + . iim,jj_nb,nhori, 1,1,1, -99, 32, . "ave(X)", zcals(n),zout_isccp(n)) c Index: LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/ini_histday.h =================================================================== --- LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/ini_histday.h (revision 917) +++ LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/ini_histday.h (revision 918) @@ -39,13 +39,13 @@ . "once", zstophy,zout) c - CALL histdef(nid_day, "aire", "Grid area", "-", + CALL histdef(nid_day, "aire", "Grid area", "m2", . iim,jj_nb,nhori, 1,1,1, -99, 32, . "once", zstophy,zout) c - CALL histdef(nid_day, "contfracATM","% sfce ter+lic ","-", + CALL histdef(nid_day, "contfracATM","% sfce ter+lic ","1", . iim,jj_nb,nhori, 1,1,1, -99, 32, . "once", zstophy,zout) c - CALL histdef(nid_day, "contfracOR","% sfce terre OR", "-", + CALL histdef(nid_day, "contfracOR","% sfce terre OR", "1", . iim,jj_nb,nhori, 1,1,1, -99, 32, . "once", zstophy,zout) @@ -100,5 +100,5 @@ . "ave(X)", zstophy,zout) c - CALL histdef(nid_day, "sicf", "Sea-ice fraction", "-", + CALL histdef(nid_day, "sicf", "Sea-ice fraction", "1", . iim,jj_nb,nhori, 1,1,1, -99, 32, . "inst(X)", zstoday,zout) @@ -167,17 +167,17 @@ . "ave(X)", zstophy,zout) c - CALL histdef(nid_day, "cldl", "Low-level cloudiness", "-", - . iim,jj_nb,nhori, 1,1,1, -99, 32, - . "ave(X)", zstophy,zout) -c - CALL histdef(nid_day, "cldm", "Mid-level cloudiness", "-", - . iim,jj_nb,nhori, 1,1,1, -99, 32, - . "ave(X)", zstophy,zout) -c - CALL histdef(nid_day, "cldh", "High-level cloudiness", "-", - . iim,jj_nb,nhori, 1,1,1, -99, 32, - . "ave(X)", zstophy,zout) -c - CALL histdef(nid_day, "cldt", "Total cloudiness", "-", + CALL histdef(nid_day, "cldl", "Low-level cloudiness", "1", + . iim,jj_nb,nhori, 1,1,1, -99, 32, + . "ave(X)", zstophy,zout) +c + CALL histdef(nid_day, "cldm", "Mid-level cloudiness", "1", + . iim,jj_nb,nhori, 1,1,1, -99, 32, + . "ave(X)", zstophy,zout) +c + CALL histdef(nid_day, "cldh", "High-level cloudiness", "1", + . iim,jj_nb,nhori, 1,1,1, -99, 32, + . "ave(X)", zstophy,zout) +c + CALL histdef(nid_day, "cldt", "Total cloudiness", "1", . iim,jj_nb,nhori, 1,1,1, -99, 32, . "ave(X)", zstophy,zout) @@ -375,14 +375,4 @@ . "ave(X)", zstophy,zout) c -cIM IF (iflag_con.GE.3) THEN - IF (ok_isccp) THEN - CALL histdef(nid_day, "ptop", -c . "Cld top pressure","mb", - . "Cld top pressure (cf ISCCP simulator)","Pa", - . iim,jj_nb,nhori, 1,1,1,-99, - . 32, "ave(X)", zstophy,zout) - ENDIF -cIM ENDIF !(iflag_con.GE.3) THEN -c ENDIF !lev_histday.GE.2 c================================================================= @@ -390,6 +380,4 @@ c================================================================= c INITIALISATION DES CHAMPS 3D -c================================================================= -c================================================================= c================================================================= c Champs 3D: @@ -586,10 +574,10 @@ . "ave(X)", zstophy,zout) c - CALL histdef(nid_day, "rneb", "Cloud fraction", "-", + CALL histdef(nid_day, "rneb", "Cloud fraction", "1", . iim,jj_nb,nhori, klev,1,klev,nvert, 32, . "ave(X)", zstophy,zout) c CALL histdef(nid_day, "rnebcon", "Convective Cloud Fraction" - . , "-", + . , "1", . iim,jj_nb,nhori, klev,1,klev,nvert, 32, . "ave(X)", zstophy,zout) @@ -604,11 +592,4 @@ . "ave(X)", zstophy,zout) c - IF (ok_isccp) THEN - CALL histdef(nid_day,"meantaucld", - . "ISCCP mean cloud optical thickness","1", - . iim,jj_nb,nhori, 1,1,1, -99, 32, - . "ave(X)", zstophy,zout) - ENDIF -c CALL histdef(nid_day,"cldtau","Cloud optical thickness","1", . iim,jj_nb,nhori, klev,1,klev, nvert, 32, Index: LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/ini_histhf.h =================================================================== --- LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/ini_histhf.h (revision 917) +++ LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/ini_histhf.h (revision 918) @@ -39,13 +39,13 @@ IF(lev_histhf.GE.1) THEN c - CALL histdef(nid_hf, "aireTER","Grid area CONT","-", + CALL histdef(nid_hf, "aireTER","Grid area CONT","m2", . iim,jj_nb,nhori, 1,1,1, -99, 32, . "once", zstohf,zout) c - CALL histdef(nid_hf, "contfracATM","% sfce ter+lic ","-", + CALL histdef(nid_hf, "contfracATM","% sfce ter+lic ","1", . iim,jj_nb,nhori, 1,1,1, -99, 32, . "once", zstohf,zout) c - CALL histdef(nid_hf, "contfracOR","% sfce terre OR", "-", + CALL histdef(nid_hf, "contfracOR","% sfce terre OR", "1", . iim,jj_nb,nhori, 1,1,1, -99, 32, . "once", zstohf,zout) @@ -93,11 +93,5 @@ c bb2=clevSTD(k) -c -c IF(k.GE.2) THEN -c aa=clevSTD(k) -c bb=aa(1:lnblnk1(aa)) -c ENDIF -c - bb2=clevSTD(k) + IF(bb2.EQ."500") THEN CALL histdef(nid_hf, "phi"//bb2, @@ -112,5 +106,5 @@ IF(lev_histhf.GE.2) THEN c - CALL histdef(nid_hf, "cldt", "Total cloudiness", "%", + CALL histdef(nid_hf, "cldt", "Total cloudiness", "1", . iim,jj_nb,nhori, 1,1,1, -99, 32, . "ave(X)", zstophy,zout) @@ -137,14 +131,4 @@ c DO k=1, nlevSTD -c -c bb=clevSTD(k) -c -c IF(k.GE.2) THEN -c IF(k.GE.1.AND.k.LE.10) bb2=clevSTD(k) -c IF(k.GE.11.AND.k.LE.17) bb3=clevSTD(k) -c aa=clevSTD(k) -c bb=aa(1:lnblnk1(aa)) -c ENDIF -c bb2=clevSTD(k) IF(bb2.EQ."1000".OR.bb2.EQ."925".OR. @@ -335,5 +319,5 @@ . "inst(X)", zstohf,zout) c - CALL histdef(nid_hf, "cldt", "Total cloudiness", "%", + CALL histdef(nid_hf, "cldt", "Total cloudiness", "1", . iim,jj_nb,nhori, 1,1,1, -99, 32, . "ave(X)", zstohf,zout) Index: LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/ini_histmth.h =================================================================== --- LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/ini_histmth.h (revision 917) +++ LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/ini_histmth.h (revision 918) @@ -43,5 +43,5 @@ . "once", zstophy,zout) c - CALL histdef(nid_mth, "aire", "Grid area", "-", + CALL histdef(nid_mth, "aire", "Grid area", "m2", . iim,jj_nb,nhori, 1,1,1, -99, 32, . "once", zstophy,zout) @@ -91,5 +91,5 @@ . "ave(X)", zstophy,zout) c - CALL histdef(nid_mth, "sicf", "Sea-ice fraction", "-", + CALL histdef(nid_mth, "sicf", "Sea-ice fraction", "1", . iim,jj_nb,nhori, 1,1,1, -99, 32, . "ave(X)", zstophy,zout) @@ -123,5 +123,5 @@ c CALL histdef(nid_mth, "ndayrain", - . "Number of day with rain (liq+sol)", "-", + . "Number of day with rain (liq+sol)", "days", . iim,jj_nb,nhori, 1,1,1, -99, 32, . "inst(X)", zstomth,zout) @@ -294,21 +294,21 @@ c Effets des aerosols c -c IF (ok_ade.OR.ok_aie) THEN - CALL histdef(nid_mth, "topsad", "ADE at TOA", "W/m2", - . iim,jj_nb,nhori, 1,1,1, -99, 32, - . "ave(X)", zstophy,zout) -c - CALL histdef(nid_mth, "solsad", "ADE at sfc", "W/m2", - . iim,jj_nb,nhori, 1,1,1, -99, 32, - . "ave(X)", zstophy,zout) -c - CALL histdef(nid_mth, "topsai", "AIE at TOA", "W/m2", - . iim,jj_nb,nhori, 1,1,1, -99, 32, - . "ave(X)", zstophy,zout) -c - CALL histdef(nid_mth, "solsai", "AIE at sfc", "W/m2", - . iim,jj_nb,nhori, 1,1,1, -99, 32, - . "ave(X)", zstophy,zout) -c endif + IF (ok_ade.OR.ok_aie) THEN + CALL histdef(nid_mth, "topsad", "ADE at TOA", "W/m2", + . iim,jj_nb,nhori, 1,1,1, -99, 32, + . "ave(X)", zstophy,zout) +c + CALL histdef(nid_mth, "solsad", "ADE at sfc", "W/m2", + . iim,jj_nb,nhori, 1,1,1, -99, 32, + . "ave(X)", zstophy,zout) +c + CALL histdef(nid_mth, "topsai", "AIE at TOA", "W/m2", + . iim,jj_nb,nhori, 1,1,1, -99, 32, + . "ave(X)", zstophy,zout) +c + CALL histdef(nid_mth, "solsai", "AIE at sfc", "W/m2", + . iim,jj_nb,nhori, 1,1,1, -99, 32, + . "ave(X)", zstophy,zout) + ENDIF c c CALL histdef(nid_mth, "frtu", "Zonal wind stress", "Pa", @@ -419,17 +419,17 @@ . "ave(X)", zstophy,zout) c - CALL histdef(nid_mth, "cldl", "Low-level cloudiness", "-", - . iim,jj_nb,nhori, 1,1,1, -99, 32, - . "ave(X)", zstophy,zout) -c - CALL histdef(nid_mth, "cldm", "Mid-level cloudiness", "-", - . iim,jj_nb,nhori, 1,1,1, -99, 32, - . "ave(X)", zstophy,zout) -c - CALL histdef(nid_mth, "cldh", "High-level cloudiness", "-", - . iim,jj_nb,nhori, 1,1,1, -99, 32, - . "ave(X)", zstophy,zout) -c - CALL histdef(nid_mth, "cldt", "Total cloudiness", "-", + CALL histdef(nid_mth, "cldl", "Low-level cloudiness", "1", + . iim,jj_nb,nhori, 1,1,1, -99, 32, + . "ave(X)", zstophy,zout) +c + CALL histdef(nid_mth, "cldm", "Mid-level cloudiness", "1", + . iim,jj_nb,nhori, 1,1,1, -99, 32, + . "ave(X)", zstophy,zout) +c + CALL histdef(nid_mth, "cldh", "High-level cloudiness", "1", + . iim,jj_nb,nhori, 1,1,1, -99, 32, + . "ave(X)", zstophy,zout) +c + CALL histdef(nid_mth, "cldt", "Total cloudiness", "1", . iim,jj_nb,nhori, 1,1,1, -99, 32, . "ave(X)", zstophy,zout) @@ -658,14 +658,14 @@ . "ave(X)", zstophy,zout) c - CALL histdef(nid_mth, "rneb", "Cloud fraction", "-", + CALL histdef(nid_mth, "rneb", "Cloud fraction", "1", . iim,jj_nb,nhori, klev,1,klev,nvert, 32, . "ave(X)", zstophy,zout) c CALL histdef(nid_mth, "rnebcon", "Convective Cloud Fraction" - . , "-", - . iim,jj_nb,nhori, klev,1,klev,nvert, 32, - . "ave(X)", zstophy,zout) -c - CALL histdef(nid_mth, "rhum", "Relative humidity", "-", + . , "1", + . iim,jj_nb,nhori, klev,1,klev,nvert, 32, + . "ave(X)", zstophy,zout) +c + CALL histdef(nid_mth, "rhum", "Relative humidity", "1", . iim,jj_nb,nhori, klev,1,klev,nvert, 32, . "ave(X)", zstophy,zout) @@ -917,5 +917,5 @@ . "once", zstophy,zout) c - CALL histdef(nid_mth, "aire", "Grid area", "-", + CALL histdef(nid_mth, "aire", "Grid area", "m2", . iim,jj_nb,nhori, 1,1,1, -99, 32, . "once", zstophy,zout) @@ -1083,5 +1083,5 @@ . "ave(X)", zstorad,zout) c - CALL histdef(nid_mth, "sicf", "Sea-ice fraction", "-", + CALL histdef(nid_mth, "sicf", "Sea-ice fraction", "1", . iim,jj_nb,nhori, 1,1,1, -99, 32, . "ave(X)", zstophy,zout) @@ -1115,5 +1115,5 @@ c CALL histdef(nid_mth, "ndayrain", - . "Number of day with rain (liq+sol)", "-", + . "Number of day with rain (liq+sol)", "days", . iim,jj_nb,nhori, 1,1,1, -99, 32, . "inst(X)", zstomth,zout) @@ -1406,17 +1406,17 @@ . "ave(X)", zstophy,zout) c - CALL histdef(nid_mth, "cldl", "Low-level cloudiness", "-", - . iim,jj_nb,nhori, 1,1,1, -99, 32, - . "ave(X)", zstophy,zout) -c - CALL histdef(nid_mth, "cldm", "Mid-level cloudiness", "-", - . iim,jj_nb,nhori, 1,1,1, -99, 32, - . "ave(X)", zstophy,zout) -c - CALL histdef(nid_mth, "cldh", "High-level cloudiness", "-", - . iim,jj_nb,nhori, 1,1,1, -99, 32, - . "ave(X)", zstophy,zout) -c - CALL histdef(nid_mth, "cldt", "Total cloudiness", "%", + CALL histdef(nid_mth, "cldl", "Low-level cloudiness", "1", + . iim,jj_nb,nhori, 1,1,1, -99, 32, + . "ave(X)", zstophy,zout) +c + CALL histdef(nid_mth, "cldm", "Mid-level cloudiness", "1", + . iim,jj_nb,nhori, 1,1,1, -99, 32, + . "ave(X)", zstophy,zout) +c + CALL histdef(nid_mth, "cldh", "High-level cloudiness", "1", + . iim,jj_nb,nhori, 1,1,1, -99, 32, + . "ave(X)", zstophy,zout) +c + CALL histdef(nid_mth, "cldt", "Total cloudiness", "1", . iim,jj_nb,nhori, 1,1,1, -99, 32, . "ave(X)", zstophy,zout) @@ -1650,14 +1650,14 @@ . "ave(X)", zstophy,zout) c - CALL histdef(nid_mth, "rneb", "Cloud fraction", "%", + CALL histdef(nid_mth, "rneb", "Cloud fraction", "1", . iim,jj_nb,nhori, klev,1,klev,nvert, 32, . "ave(X)", zstophy,zout) c CALL histdef(nid_mth, "rnebcon", "Convective Cloud Fraction" - . , "-", - . iim,jj_nb,nhori, klev,1,klev,nvert, 32, - . "ave(X)", zstophy,zout) -c - CALL histdef(nid_mth, "rhum", "Relative humidity", "-", + . , "1", + . iim,jj_nb,nhori, klev,1,klev,nvert, 32, + . "ave(X)", zstophy,zout) +c + CALL histdef(nid_mth, "rhum", "Relative humidity", "1", . iim,jj_nb,nhori, klev,1,klev,nvert, 32, . "ave(X)", zstophy,zout) Index: LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/isccp_cloud_types.F =================================================================== --- LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/isccp_cloud_types.F (revision 917) +++ LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/isccp_cloud_types.F (revision 918) @@ -530,6 +530,6 @@ ! Initialised frac_out to zero - do ibox=1,ncol - do ilev=1,nlev + do ilev=1,nlev + do ibox=1,ncol do j=1,npoints frac_out(j,ibox,ilev)=0.0 @@ -1219,5 +1219,5 @@ enddo do 29 ilev=1,nlev-1 - !cdir nodep +!cdir nodep do j=1,npoints if ((at(j,ilev) .ge. tb(j,ibox) .and. Index: LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/pbl_surface_mod.F90 =================================================================== --- LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/pbl_surface_mod.F90 (revision 917) +++ LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/pbl_surface_mod.F90 (revision 918) @@ -962,6 +962,7 @@ patm(j)=ypplay(j,1) qairsol(j) = yqsurf(j) - END DO - +! Blindage provisoire + rugo1(j)=MAX(rugo1(j),1.E-5) + END DO ! Calculate the temperature et relative humidity at 2m and the wind at 10m Index: LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/physiq.F =================================================================== --- LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/physiq.F (revision 917) +++ LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/physiq.F (revision 918) @@ -47,10 +47,10 @@ c CLEFS CPP POUR LES IO c ===================== -c#define histhf +#define histhf #define histday #define histmth c#define histins -c#define histmthNMC -c#define histISCCP +#define histmthNMC +#define histISCCP c====================================================================== c modif ( P. Le Van , 12/10/98 ) @@ -1487,5 +1487,4 @@ cym Attention pbase pas initialise dans concvl !!!! pbase(:)=0 - first=.false. endif @@ -1675,4 +1674,20 @@ rugoro(i) = MAX(1.0e-05, zstd(i)*zsig(i)/2.0) ENDDO + +cFRED WRITE(lunout,*)'FRED rugoro ...' +cFRED WRITE(lunout,*) rugoro (416), rugoro (417), rugoro(418) +cFRED . , rugoro(419) +cFRED WRITE(lunout,*) rugoro (421), rugoro (422), rugoro(423) +cFRED WRITE(lunout,*) rugoro (424), rugoro (425), rugoro(426) +cFRED WRITE(lunout,*) rugoro (427), rugoro (428), rugoro(429) +cFRED WRITE(lunout,*) rugoro (430), rugoro (431), rugoro(567) +cFRED . , rugoro(568) +cFRED WRITE(lunout,*) rugoro (574), rugoro (575), rugoro(576) +cFRED WRITE(lunout,*) rugoro (577), rugoro (698), rugoro(699) +cFRED WRITE(lunout,*) rugoro (711), rugoro (712), rugoro(713) + + WRITE(lunout,*)'FRED rugoro =0.' + rugoro=0. + CALL SUGWD(klon,klev,paprs,pplay) DO i=1,klon @@ -2594,8 +2609,15 @@ #ifdef histISCCP IF (ok_isccp) THEN +c SD initialisation + fq_isccp(:,:,:,:)= 0. + totalcldarea(:,:)= 0. + meanptop(:,:) = 0. + meantaucld(:,:) = 0. + nbsunlit(:,:,:) = 0. +c cIM appel simulateur toutes les NINT(freq_ISCCP/dtime) heures IF (MOD(itap,NINT(freq_ISCCP/dtime)).EQ.0) THEN #include "calcul_simulISCCP.h" - ENDIF !(MOD(itap,NINT(freq_ISCCP/dtime)) + ENDIF !(MOD(itap,NINT(freq_ISCCP/dtime))) ENDIF !ok_isccp #endif Index: LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/phytrac.F =================================================================== --- LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/phytrac.F (revision 917) +++ LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/phytrac.F (revision 918) @@ -445,7 +445,7 @@ c============================================================= -#ifdef CPP_IOIPSL -#include "ini_histrac.h" -#endif +c#ifdef CPP_IOIPSL +c#include "ini_histrac.h" +c#endif c====================================================================== @@ -929,7 +929,7 @@ c============================================================= -#ifdef CPP_IOIPSL -#include "write_histrac.h" -#endif +c#ifdef CPP_IOIPSL +c#include "write_histrac.h" +c#endif c============================================================= Index: LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/surf_landice_mod.F90 =================================================================== --- LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/surf_landice_mod.F90 (revision 917) +++ LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/surf_landice_mod.F90 (revision 918) @@ -141,5 +141,6 @@ ! !**************************************************************************************** - z0_new(:) = rugoro(:) +! z0_new(:) = rugoro(:) + z0_new(:) = MAX(1.E-3,rugoro(:)) Index: LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/write_histISCCP.h =================================================================== --- LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/write_histISCCP.h (revision 917) +++ LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/write_histISCCP.h (revision 918) @@ -12,21 +12,32 @@ c DO n=1, napisccp -c - DO k=1,kmaxm1 - zx_tmp_fi3d(1:klon, 1:lmaxm1)=fq_isccp(1:klon,k,1:lmaxm1,n)*100. -cym CALL gr_fi_ecrit(lmaxm1,klon,iim,jjmp1,zx_tmp_fi3d, -cym . zx_tmp_3d) -c -cIM: champ 3d : (lon,lat,pres) pour un tau fixe -c + DO k=1, kmaxm1 + DO l=1, lmaxm1 + IF(top_height.LE.2) THEN + DO i=1, klon + IF(nbsunlit(1,i,n).NE.0.) THEN + zx_tmp_fi3d(i,l)= + $ fq_isccp(i,k,l,n)*100./nbsunlit(1,i,n) + ELSE + zx_tmp_fi3d(i,l)=0. + ENDIF + ENDDO + ELSE IF(top_height.EQ.3) THEN + DO i=1, klon + zx_tmp_fi3d(i,l) = fq_isccp(i,k,l,n)*100. + ENDDO ! klon + ENDIF + ENDDO !l CALL histwrite_phy(nid_isccp,"cldISCCP_"//taulev(k)//verticaxe(n) . ,itau_w,zx_tmp_fi3d) - ENDDO !k -c -cym CALL gr_fi_ecrit(1, klon,iim,jjmp1,nbsunlit(1,:,n),zx_tmp_2d) - CALL histwrite_phy(nid_isccp,"nsunlit"//verticaxe(n),itau_w, - . nbsunlit(1,:,n)) -c + ENDDO !k + CALL histwrite_phy(nid_isccp,"nsunlit"//verticaxe(n),itau_w, + . nbsunlit(1,:,n)) ENDDO ! n=1, napisccp +c + CALL histwrite_phy(nid_isccp,"ptop",itau_w,meanptop(:,1)) +c + CALL histwrite_phy(nid_isccp,"meantaucld",itau_w,meantaucld) +c ELSE IF(type_run.EQ."AMIP".OR.type_run.EQ."CFMI") THEN c @@ -42,5 +53,5 @@ $ fq_isccp(i,k,l,n)*100./nbsunlit(1,i,n) ELSE - fq_is_true(i,k,l,n)=0 + fq_is_true(i,k,l,n)=0. ENDIF ENDDO @@ -64,4 +75,8 @@ CALL histwrite_phy(nid_isccp,"nsunlit"//verticaxe(n), . itau_w,nbsunlit(1,:,n)) +c + CALL histwrite_phy(nid_isccp,"ptop",itau_w,meanptop(:,1)) +c + CALL histwrite_phy(nid_isccp,"meantaucld",itau_w,meantaucld) c zx_tmp_fi2d(1:klon)=float(seed(1:klon,n)) Index: LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/write_histday.h =================================================================== --- LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/write_histday.h (revision 917) +++ LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/write_histday.h (revision 918) @@ -342,12 +342,4 @@ CALL histwrite_phy(nid_day,"tauy",itau_w,zx_tmp_fi2d) c -cIM IF (iflag_con.GE.3) THEN -cIM ema_pct= 0. CALL gr_fi_ecrit(1, klon,iim,jjmp1, ema_pct,zx_tmp_2d) -cym CALL gr_fi_ecrit(1, klon,iim,jjmp1, meanptop(:,1),zx_tmp_2d) - IF (ok_isccp) THEN - CALL histwrite_phy(nid_day,"ptop",itau_w,meanptop(:,1)) - ENDIF -cIM ENDIF -c ENDIF !lev_histday.GE.2 c @@ -542,9 +534,4 @@ cym CALL gr_fi_ecrit(klev,klon,iim,jjmp1, fiwc,zx_tmp_3d) CALL histwrite_phy(nid_day,"iwcon",itau_w,fiwc) -c -cym CALL gr_fi_ecrit(1,klon,iim,jjmp1, meantaucld,zx_tmp_2d) - IF (ok_isccp) THEN - CALL histwrite_phy(nid_day,"meantaucld",itau_w,meantaucld) - ENDIF c cym CALL gr_fi_ecrit(klev,klon,iim,jjmp1, cldtau,zx_tmp_3d) Index: LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/write_histhf.h =================================================================== --- LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/write_histhf.h (revision 917) +++ LMDZ4/branches/LMDZ4_V3_patches/libf/phylmd/write_histhf.h (revision 918) @@ -67,13 +67,5 @@ DO k=1, nlevSTD c -c bb=clevSTD(k) -c -c IF(k.GE.2) THEN - IF(k.GE.2.AND.k.LE.12) bb2=clevSTD(k) - IF(k.GE.13.AND.k.LE.17) bb3=clevSTD(k) -c aa=clevSTD(k) -c bb=aa(1:lnblnk1(aa)) -c ENDIF -c + bb2=clevSTD(k) IF(bb2.EQ."500") THEN c @@ -113,13 +105,4 @@ c DO k=1, nlevSTD -c -c bb=clevSTD(k) -c -c IF(k.GE.2) THEN -c IF(k.GE.1.AND.k.LE.10) bb2=clevSTD(k) -c IF(k.GE.11.AND.k.LE.17) bb3=clevSTD(k) -c aa=clevSTD(k) -c bb=aa(1:lnblnk1(aa)) -c ENDIF c bb2=clevSTD(k)