Index: LMDZ4/trunk/libf/phylmd/phys_output_mod.F90 =================================================================== --- LMDZ4/trunk/libf/phylmd/phys_output_mod.F90 (revision 1389) +++ LMDZ4/trunk/libf/phylmd/phys_output_mod.F90 (revision 1390) @@ -60,8 +60,8 @@ !!! 2D - type(ctrl_out),save :: o_flat = ctrl_out((/ 5, 1, 10, 5, 1 /),'flat') - type(ctrl_out),save :: o_slp = ctrl_out((/ 1, 1, 1, 10, 1 /),'slp') - type(ctrl_out),save :: o_tsol = ctrl_out((/ 1, 1, 1, 5, 1 /),'tsol') - type(ctrl_out),save :: o_t2m = ctrl_out((/ 1, 1, 1, 5, 1 /),'t2m') + type(ctrl_out),save :: o_flat = ctrl_out((/ 5, 1, 10, 10, 5 /),'flat') + type(ctrl_out),save :: o_slp = ctrl_out((/ 1, 1, 1, 10, 10 /),'slp') + type(ctrl_out),save :: o_tsol = ctrl_out((/ 1, 1, 1, 5, 10 /),'tsol') + type(ctrl_out),save :: o_t2m = ctrl_out((/ 1, 1, 1, 5, 10 /),'t2m') type(ctrl_out),save :: o_t2m_min = ctrl_out((/ 1, 1, 10, 10, 10 /),'t2m_min') type(ctrl_out),save :: o_t2m_max = ctrl_out((/ 1, 1, 10, 10, 10 /),'t2m_max') @@ -74,8 +74,8 @@ type(ctrl_out),save :: o_wind10max = ctrl_out((/ 10, 1, 10, 10, 10 /),'wind10max') type(ctrl_out),save :: o_sicf = ctrl_out((/ 1, 1, 10, 10, 10 /),'sicf') - type(ctrl_out),save :: o_q2m = ctrl_out((/ 1, 1, 1, 5, 1 /),'q2m') - type(ctrl_out),save :: o_u10m = ctrl_out((/ 1, 1, 1, 5, 1 /),'u10m') - type(ctrl_out),save :: o_v10m = ctrl_out((/ 1, 1, 1, 5, 1 /),'v10m') - type(ctrl_out),save :: o_psol = ctrl_out((/ 1, 1, 1, 5, 1 /),'psol') + type(ctrl_out),save :: o_q2m = ctrl_out((/ 1, 1, 1, 5, 10 /),'q2m') + type(ctrl_out),save :: o_u10m = ctrl_out((/ 1, 1, 1, 5, 10 /),'u10m') + type(ctrl_out),save :: o_v10m = ctrl_out((/ 1, 1, 1, 5, 10 /),'v10m') + type(ctrl_out),save :: o_psol = ctrl_out((/ 1, 1, 1, 5, 10 /),'psol') type(ctrl_out),save :: o_qsurf = ctrl_out((/ 1, 10, 10, 10, 10 /),'qsurf') @@ -93,9 +93,9 @@ type(ctrl_out),save :: o_ndayrain = ctrl_out((/ 1, 10, 10, 10, 10 /),'ndayrain') - type(ctrl_out),save :: o_precip = ctrl_out((/ 1, 1, 1, 5, 10 /),'precip') + type(ctrl_out),save :: o_precip = ctrl_out((/ 1, 1, 1, 10, 5 /),'precip') type(ctrl_out),save :: o_plul = ctrl_out((/ 1, 1, 1, 10, 10 /),'plul') - type(ctrl_out),save :: o_pluc = ctrl_out((/ 1, 1, 1, 5, 10 /),'pluc') - type(ctrl_out),save :: o_snow = ctrl_out((/ 1, 1, 10, 5, 10 /),'snow') + type(ctrl_out),save :: o_pluc = ctrl_out((/ 1, 1, 1, 10, 5 /),'pluc') + type(ctrl_out),save :: o_snow = ctrl_out((/ 1, 1, 10, 10, 5 /),'snow') type(ctrl_out),save :: o_evap = ctrl_out((/ 1, 1, 10, 10, 10 /),'evap') type(ctrl_out),save,dimension(4) :: o_evap_srf = (/ ctrl_out((/ 1, 1, 10, 10, 10 /),'evap_ter'), & @@ -136,14 +136,14 @@ type(ctrl_out),save :: o_soll0 = ctrl_out((/ 1, 5, 10, 10, 10 /),'soll0') type(ctrl_out),save :: o_radsol = ctrl_out((/ 1, 1, 10, 10, 10 /),'radsol') - type(ctrl_out),save :: o_SWupSFC = ctrl_out((/ 1, 4, 10, 5, 10 /),'SWupSFC') - type(ctrl_out),save :: o_SWupSFCclr = ctrl_out((/ 1, 4, 10, 10, 10 /),'SWupSFCclr') - type(ctrl_out),save :: o_SWdnSFC = ctrl_out((/ 1, 1, 10, 5, 10 /),'SWdnSFC') - type(ctrl_out),save :: o_SWdnSFCclr = ctrl_out((/ 1, 4, 10, 5, 10 /),'SWdnSFCclr') - type(ctrl_out),save :: o_LWupSFC = ctrl_out((/ 1, 4, 10, 10, 10 /),'LWupSFC') - type(ctrl_out),save :: o_LWupSFCclr = ctrl_out((/ 1, 4, 10, 5, 10 /),'LWupSFCclr') - type(ctrl_out),save :: o_LWdnSFC = ctrl_out((/ 1, 4, 10, 5, 10 /),'LWdnSFC') - type(ctrl_out),save :: o_LWdnSFCclr = ctrl_out((/ 1, 4, 10, 5, 10 /),'LWdnSFCclr') + type(ctrl_out),save :: o_SWupSFC = ctrl_out((/ 1, 4, 10, 10, 5 /),'SWupSFC') + type(ctrl_out),save :: o_SWupSFCclr = ctrl_out((/ 1, 4, 10, 10, 5 /),'SWupSFCclr') + type(ctrl_out),save :: o_SWdnSFC = ctrl_out((/ 1, 1, 10, 10, 5 /),'SWdnSFC') + type(ctrl_out),save :: o_SWdnSFCclr = ctrl_out((/ 1, 4, 10, 10, 5 /),'SWdnSFCclr') + type(ctrl_out),save :: o_LWupSFC = ctrl_out((/ 1, 4, 10, 10, 5 /),'LWupSFC') + type(ctrl_out),save :: o_LWupSFCclr = ctrl_out((/ 1, 4, 10, 10, 5 /),'LWupSFCclr') + type(ctrl_out),save :: o_LWdnSFC = ctrl_out((/ 1, 4, 10, 10, 5 /),'LWdnSFC') + type(ctrl_out),save :: o_LWdnSFCclr = ctrl_out((/ 1, 4, 10, 10, 5 /),'LWdnSFCclr') type(ctrl_out),save :: o_bils = ctrl_out((/ 1, 2, 10, 5, 10 /),'bils') - type(ctrl_out),save :: o_sens = ctrl_out((/ 1, 1, 10, 5, 10 /),'sens') + type(ctrl_out),save :: o_sens = ctrl_out((/ 1, 1, 10, 10, 5 /),'sens') type(ctrl_out),save :: o_fder = ctrl_out((/ 1, 2, 10, 10, 10 /),'fder') type(ctrl_out),save :: o_ffonte = ctrl_out((/ 1, 10, 10, 10, 10 /),'ffonte') @@ -215,5 +215,5 @@ type(ctrl_out),save :: o_cldm = ctrl_out((/ 1, 1, 10, 10, 10 /),'cldm') type(ctrl_out),save :: o_cldh = ctrl_out((/ 1, 1, 10, 10, 10 /),'cldh') - type(ctrl_out),save :: o_cldt = ctrl_out((/ 1, 1, 2, 5, 10 /),'cldt') + type(ctrl_out),save :: o_cldt = ctrl_out((/ 1, 1, 2, 10, 5 /),'cldt') type(ctrl_out),save :: o_cldq = ctrl_out((/ 1, 1, 10, 10, 10 /),'cldq') type(ctrl_out),save :: o_lwp = ctrl_out((/ 1, 5, 10, 10, 10 /),'lwp') @@ -230,11 +230,11 @@ type(ctrl_out),save :: o_prw = ctrl_out((/ 1, 1, 10, 10, 10 /),'prw') - type(ctrl_out),save :: o_s_pblh = ctrl_out((/ 1, 10, 10, 10, 1 /),'s_pblh') - type(ctrl_out),save :: o_s_pblt = ctrl_out((/ 1, 10, 10, 10, 1 /),'s_pblt') + type(ctrl_out),save :: o_s_pblh = ctrl_out((/ 1, 10, 10, 10, 10 /),'s_pblh') + type(ctrl_out),save :: o_s_pblt = ctrl_out((/ 1, 10, 10, 10, 10 /),'s_pblt') type(ctrl_out),save :: o_s_lcl = ctrl_out((/ 1, 10, 10, 10, 10 /),'s_lcl') type(ctrl_out),save :: o_s_capCL = ctrl_out((/ 1, 10, 10, 10, 10 /),'s_capCL') type(ctrl_out),save :: o_s_oliqCL = ctrl_out((/ 1, 10, 10, 10, 10 /),'s_oliqCL') - type(ctrl_out),save :: o_s_cteiCL = ctrl_out((/ 1, 10, 10, 10, 1 /),'s_cteiCL') - type(ctrl_out),save :: o_s_therm = ctrl_out((/ 1, 10, 10, 10, 1 /),'s_therm') + type(ctrl_out),save :: o_s_cteiCL = ctrl_out((/ 1, 10, 10, 10, 10 /),'s_cteiCL') + type(ctrl_out),save :: o_s_therm = ctrl_out((/ 1, 10, 10, 10, 10 /),'s_therm') type(ctrl_out),save :: o_s_trmb1 = ctrl_out((/ 1, 10, 10, 10, 10 /),'s_trmb1') type(ctrl_out),save :: o_s_trmb2 = ctrl_out((/ 1, 10, 10, 10, 10 /),'s_trmb2') @@ -412,26 +412,26 @@ !!!!!!!!!!!!!!!!!!!!!! 3D !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - type(ctrl_out),save :: o_ec550aer = ctrl_out((/ 2, 6, 10, 10, 1 /),'ec550aer') - type(ctrl_out),save :: o_lwcon = ctrl_out((/ 2, 5, 10, 10, 1 /),'lwcon') + type(ctrl_out),save :: o_ec550aer = ctrl_out((/ 2, 6, 10, 10, 10 /),'ec550aer') + type(ctrl_out),save :: o_lwcon = ctrl_out((/ 2, 5, 10, 10, 10 /),'lwcon') type(ctrl_out),save :: o_iwcon = ctrl_out((/ 2, 5, 10, 10, 10 /),'iwcon') - type(ctrl_out),save :: o_temp = ctrl_out((/ 2, 3, 4, 10, 1 /),'temp') - type(ctrl_out),save :: o_theta = ctrl_out((/ 2, 3, 4, 10, 1 /),'theta') - type(ctrl_out),save :: o_ovap = ctrl_out((/ 2, 3, 4, 10, 1 /),'ovap') - type(ctrl_out),save :: o_ovapinit = ctrl_out((/ 2, 3, 10, 10, 1 /),'ovapinit') + type(ctrl_out),save :: o_temp = ctrl_out((/ 2, 3, 4, 10, 10 /),'temp') + type(ctrl_out),save :: o_theta = ctrl_out((/ 2, 3, 4, 10, 10 /),'theta') + type(ctrl_out),save :: o_ovap = ctrl_out((/ 2, 3, 4, 10, 10 /),'ovap') + type(ctrl_out),save :: o_ovapinit = ctrl_out((/ 2, 3, 10, 10, 10 /),'ovapinit') type(ctrl_out),save :: o_wvapp = ctrl_out((/ 2, 10, 10, 10, 10 /),'wvapp') - type(ctrl_out),save :: o_geop = ctrl_out((/ 2, 3, 10, 10, 1 /),'geop') - type(ctrl_out),save :: o_vitu = ctrl_out((/ 2, 3, 4, 6, 1 /),'vitu') - type(ctrl_out),save :: o_vitv = ctrl_out((/ 2, 3, 4, 6, 1 /),'vitv') - type(ctrl_out),save :: o_vitw = ctrl_out((/ 2, 3, 10, 6, 1 /),'vitw') - type(ctrl_out),save :: o_pres = ctrl_out((/ 2, 3, 10, 10, 1 /),'pres') - type(ctrl_out),save :: o_paprs = ctrl_out((/ 2, 3, 10, 10, 1 /),'paprs') - type(ctrl_out),save :: o_rneb = ctrl_out((/ 2, 5, 10, 10, 1 /),'rneb') - type(ctrl_out),save :: o_rnebcon = ctrl_out((/ 2, 5, 10, 10, 1 /),'rnebcon') + type(ctrl_out),save :: o_geop = ctrl_out((/ 2, 3, 10, 10, 10 /),'geop') + type(ctrl_out),save :: o_vitu = ctrl_out((/ 2, 3, 4, 6, 10 /),'vitu') + type(ctrl_out),save :: o_vitv = ctrl_out((/ 2, 3, 4, 6, 10 /),'vitv') + type(ctrl_out),save :: o_vitw = ctrl_out((/ 2, 3, 10, 6, 10 /),'vitw') + type(ctrl_out),save :: o_pres = ctrl_out((/ 2, 3, 10, 10, 10 /),'pres') + type(ctrl_out),save :: o_paprs = ctrl_out((/ 2, 3, 10, 10, 10 /),'paprs') + type(ctrl_out),save :: o_rneb = ctrl_out((/ 2, 5, 10, 10, 10 /),'rneb') + type(ctrl_out),save :: o_rnebcon = ctrl_out((/ 2, 5, 10, 10, 10 /),'rnebcon') type(ctrl_out),save :: o_rhum = ctrl_out((/ 2, 5, 10, 10, 10 /),'rhum') type(ctrl_out),save :: o_ozone = ctrl_out((/ 2, 10, 10, 10, 10 /),'ozone') type(ctrl_out),save :: o_ozone_light = ctrl_out((/ 2, 10, 10, 10, 10 /),'ozone_daylight') type(ctrl_out),save :: o_upwd = ctrl_out((/ 2, 10, 10, 10, 10 /),'upwd') - type(ctrl_out),save :: o_dtphy = ctrl_out((/ 2, 10, 10, 10, 1 /),'dtphy') - type(ctrl_out),save :: o_dqphy = ctrl_out((/ 2, 10, 10, 10, 1 /),'dqphy') + type(ctrl_out),save :: o_dtphy = ctrl_out((/ 2, 10, 10, 10, 10 /),'dtphy') + type(ctrl_out),save :: o_dqphy = ctrl_out((/ 2, 10, 10, 10, 10 /),'dqphy') type(ctrl_out),save :: o_pr_con_l = ctrl_out((/ 2, 10, 10, 10, 10 /),'pr_con_l') type(ctrl_out),save :: o_pr_con_i = ctrl_out((/ 2, 10, 10, 10, 10 /),'pr_con_i') @@ -440,10 +440,10 @@ type(ctrl_out),save :: o_re = ctrl_out((/ 5, 10, 10, 10, 10 /),'re') type(ctrl_out),save :: o_fl = ctrl_out((/ 5, 10, 10, 10, 10 /),'fl') - type(ctrl_out),save :: o_scdnc = ctrl_out((/ 2, 6, 10, 10, 1 /),'scdnc') - type(ctrl_out),save :: o_reffclws = ctrl_out((/ 2, 6, 10, 10, 1 /),'reffclws') - type(ctrl_out),save :: o_reffclwc = ctrl_out((/ 2, 6, 10, 10, 1 /),'reffclwc') - type(ctrl_out),save :: o_lcc3d = ctrl_out((/ 2, 6, 10, 10, 1 /),'lcc3d') - type(ctrl_out),save :: o_lcc3dcon = ctrl_out((/ 2, 6, 10, 10, 1 /),'lcc3dcon') - type(ctrl_out),save :: o_lcc3dstra = ctrl_out((/ 2, 6, 10, 10, 1 /),'lcc3dstra') + type(ctrl_out),save :: o_scdnc = ctrl_out((/ 2, 6, 10, 10, 10 /),'scdnc') + type(ctrl_out),save :: o_reffclws = ctrl_out((/ 2, 6, 10, 10, 10 /),'reffclws') + type(ctrl_out),save :: o_reffclwc = ctrl_out((/ 2, 6, 10, 10, 10 /),'reffclwc') + type(ctrl_out),save :: o_lcc3d = ctrl_out((/ 2, 6, 10, 10, 10 /),'lcc3d') + type(ctrl_out),save :: o_lcc3dcon = ctrl_out((/ 2, 6, 10, 10, 10 /),'lcc3dcon') + type(ctrl_out),save :: o_lcc3dstra = ctrl_out((/ 2, 6, 10, 10, 10 /),'lcc3dstra') !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -472,8 +472,8 @@ type(ctrl_out),save :: o_mc = ctrl_out((/ 4, 5, 10, 10, 10 /),'mc') type(ctrl_out),save :: o_ftime_con = ctrl_out((/ 4, 10, 10, 10, 10 /),'ftime_con') - type(ctrl_out),save :: o_dtdyn = ctrl_out((/ 4, 10, 10, 10, 1 /),'dtdyn') - type(ctrl_out),save :: o_dqdyn = ctrl_out((/ 4, 10, 10, 10, 1 /),'dqdyn') - type(ctrl_out),save :: o_dudyn = ctrl_out((/ 4, 10, 10, 10, 1 /),'dudyn') !AXC - type(ctrl_out),save :: o_dvdyn = ctrl_out((/ 4, 10, 10, 10, 1 /),'dvdyn') !AXC + type(ctrl_out),save :: o_dtdyn = ctrl_out((/ 4, 10, 10, 10, 10 /),'dtdyn') + type(ctrl_out),save :: o_dqdyn = ctrl_out((/ 4, 10, 10, 10, 10 /),'dqdyn') + type(ctrl_out),save :: o_dudyn = ctrl_out((/ 4, 10, 10, 10, 10 /),'dudyn') !AXC + type(ctrl_out),save :: o_dvdyn = ctrl_out((/ 4, 10, 10, 10, 10 /),'dvdyn') !AXC type(ctrl_out),save :: o_dtcon = ctrl_out((/ 4, 5, 10, 10, 10 /),'dtcon') type(ctrl_out),save :: o_ducon = ctrl_out((/ 4, 10, 10, 10, 10 /),'ducon') @@ -503,5 +503,5 @@ type(ctrl_out),save :: o_w_th = ctrl_out((/ 4, 10, 10, 10, 10 /),'w_th') type(ctrl_out),save :: o_lambda_th = ctrl_out((/ 10, 10, 10, 10, 10 /),'lambda_th') - type(ctrl_out),save :: o_ftime_th = ctrl_out((/ 10, 10, 10, 10, 10 /),'ftime_th') + type(ctrl_out),save :: o_ftime_th = ctrl_out((/ 4, 10, 10, 10, 10 /),'ftime_th') type(ctrl_out),save :: o_q_th = ctrl_out((/ 4, 10, 10, 10, 10 /),'q_th') type(ctrl_out),save :: o_a_th = ctrl_out((/ 4, 10, 10, 10, 10 /),'a_th') @@ -509,10 +509,10 @@ type(ctrl_out),save :: o_f0_th = ctrl_out((/ 4, 10, 10, 10, 10 /),'f0_th') type(ctrl_out),save :: o_zmax_th = ctrl_out((/ 4, 10, 10, 10, 10 /),'zmax_th') - type(ctrl_out),save :: o_dqthe = ctrl_out((/ 4, 10, 10, 10, 1 /),'dqthe') + type(ctrl_out),save :: o_dqthe = ctrl_out((/ 4, 10, 10, 10, 10 /),'dqthe') type(ctrl_out),save :: o_dtajs = ctrl_out((/ 4, 10, 10, 10, 10 /),'dtajs') type(ctrl_out),save :: o_dqajs = ctrl_out((/ 4, 10, 10, 10, 10 /),'dqajs') - type(ctrl_out),save :: o_dtswr = ctrl_out((/ 4, 10, 10, 10, 1 /),'dtswr') + type(ctrl_out),save :: o_dtswr = ctrl_out((/ 4, 10, 10, 10, 10 /),'dtswr') type(ctrl_out),save :: o_dtsw0 = ctrl_out((/ 4, 10, 10, 10, 10 /),'dtsw0') - type(ctrl_out),save :: o_dtlwr = ctrl_out((/ 4, 10, 10, 10, 1 /),'dtlwr') + type(ctrl_out),save :: o_dtlwr = ctrl_out((/ 4, 10, 10, 10, 10 /),'dtlwr') type(ctrl_out),save :: o_dtlw0 = ctrl_out((/ 4, 10, 10, 10, 10 /),'dtlw0') type(ctrl_out),save :: o_dtec = ctrl_out((/ 4, 10, 10, 10, 10 /),'dtec') @@ -619,5 +619,5 @@ type_ecri(3) = 'ave(X)' type_ecri(4) = 'inst(X)' - type_ecri(5) = 'inst(X)' + type_ecri(5) = 'ave(X)' clef_files(1) = ok_mensuel