Index: LMDZ6/trunk/libf/phylmd/Dust/phys_output_write_spl_mod.F90 =================================================================== --- LMDZ6/trunk/libf/phylmd/Dust/phys_output_write_spl_mod.F90 (revision 6125) +++ LMDZ6/trunk/libf/phylmd/Dust/phys_output_write_spl_mod.F90 (revision 6126) @@ -81,8 +81,11 @@ ! ug Routine pour définir (lors du premier passageà) ET sortir les variables SUBROUTINE phys_output_write_spl(itap, pdtphys, paprs, pphis, & - pplay, lmax_th, aerosol_couple, & - ok_ade, ok_aie, ivap, ok_sync, & + pplay, lmax_th, & + !aerosol_couple, & + !ok_ade, ok_aie, + ivap, ok_sync, & ptconv, read_climoz, clevSTD, ptconvth, & - d_t, qx, d_qx, d_tr_dyn, zmasse, flag_aerosol, flag_aerosol_strat, ok_cdnc) + d_t, qx, d_qx, d_tr_dyn, zmasse) + !, flag_aerosol, flag_aerosol_strat, ok_cdnc) ! This subroutine does the actual writing of diagnostics that were @@ -93,4 +96,6 @@ USE dimphy, ONLY: klon, klev, klevp1 USE ocean_slab_mod, ONLY: nslay + USE conf_phys_m, ONLY: aerosol_couple, ok_ade, ok_aie, ok_cdnc, & + flag_aerosol, flag_aerosol_strat USE phys_output_ctrlout_mod, ONLY: o_phis, o_aire, is_ter, is_lic, is_oce, & is_ave, is_sic, o_contfracATM, o_contfracOR, & @@ -406,6 +411,7 @@ INTEGER :: itap, ivap, read_climoz INTEGER, DIMENSION(klon) :: lmax_th - LOGICAL :: aerosol_couple, ok_sync - LOGICAL :: ok_ade, ok_aie + !LOGICAL :: aerosol_couple, ok_sync + LOGICAL :: ok_sync + !LOGICAL :: ok_ade, ok_aie LOGICAL, DIMENSION(klon, klev) :: ptconv, ptconvth REAL :: pdtphys @@ -418,7 +424,7 @@ REAL,DIMENSION(klon,klev,nbtr),INTENT(IN) :: d_tr_dyn REAL, DIMENSION(klon, nbp_lev) :: zmasse - INTEGER :: flag_aerosol_strat - INTEGER :: flag_aerosol - LOGICAL :: ok_cdnc + !INTEGER :: flag_aerosol_strat + !INTEGER :: flag_aerosol + !LOGICAL :: ok_cdnc REAL, DIMENSION(3) :: freq_moyNMC Index: LMDZ6/trunk/libf/phylmd/phys_output_mod.F90 =================================================================== --- LMDZ6/trunk/libf/phylmd/phys_output_mod.F90 (revision 6125) +++ LMDZ6/trunk/libf/phylmd/phys_output_mod.F90 (revision 6126) @@ -31,10 +31,7 @@ SUBROUTINE phys_output_open(rlon,rlat,pim,tabij,ipt,jpt,plon,plat, & - jjmp1,nlevSTD,clevSTD,rlevSTD, dtime, ok_veget, & - type_ocean, iflag_pbl,iflag_pbl_split,ok_mensuel,ok_journe, & - ok_hf,ok_instan,ok_LES,ok_ade,ok_aie, read_climoz, & - phys_out_filestations, & - aerosol_couple, flag_aerosol_strat, & - pdtphys, paprs, pphis, pplay, lmax_th, ptconv, ptconvth, ivap, & + jjmp1,nlevSTD,clevSTD,rlevSTD, dtime, read_climoz, & + phys_out_filestations, pdtphys, paprs, pphis, & + pplay, lmax_th, ptconv, ptconvth, ivap, & d_u, d_t, qx, d_qx, zmasse, ok_sync) @@ -53,7 +50,5 @@ USE vertical_layers_mod, ONLY: ap,bp,preff,presnivs, aps, bps, pseudoalt, presinter USE time_phylmdz_mod, ONLY: day_ini, itau_phy, start_time, annee_ref, day_ref - USE AERO_MOD, ONLY : nbands_lw_rrtm !FC - ! ug Pour les sorties XIOS USE wxios_mod @@ -65,8 +60,12 @@ #endif #endif - USE clesphys_mod_h USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_STRATAER USE yomcst_mod_h + USE surface_data, ONLY : type_ocean, ok_veget + USE conf_phys_m, ONLY : ok_mensuel,ok_journe, & + ok_hf,ok_instan,ok_LES,ok_ade,ok_aie, & + aerosol_couple, flag_aerosol_strat + USE compbl_mod_h, ONLY : iflag_pbl,iflag_pbl_split IMPLICIT NONE @@ -96,8 +95,4 @@ INTEGER :: jjmp1 INTEGER :: nlevSTD, radpas - LOGICAL :: ok_mensuel, ok_journe, ok_hf, ok_instan - LOGICAL :: ok_LES,ok_ade,ok_aie - INTEGER :: flag_aerosol_strat - LOGICAL :: aerosol_couple INTEGER, INTENT(IN):: read_climoz ! read ozone climatology ! Allowed values are 0, 1 and 2 @@ -114,10 +109,6 @@ INTEGER :: nsrf, k, iq, iff, i, j, ilev, itr, itrb, ixt, iiso, izone INTEGER :: naero - LOGICAL :: ok_veget - INTEGER :: iflag_pbl - INTEGER :: iflag_pbl_split CHARACTER(LEN=4) :: bb2 CHARACTER(LEN=2) :: bb3 - CHARACTER(LEN=6) :: type_ocean INTEGER, DIMENSION(nbp_lon*jjmp1) :: ndex2d INTEGER, DIMENSION(nbp_lon*jjmp1*klev) :: ndex3d Index: LMDZ6/trunk/libf/phylmd/phys_output_write_mod.F90 =================================================================== --- LMDZ6/trunk/libf/phylmd/phys_output_write_mod.F90 (revision 6125) +++ LMDZ6/trunk/libf/phylmd/phys_output_write_mod.F90 (revision 6126) @@ -17,8 +17,7 @@ ! ug Routine pour définir (lors du premier passage) ET sortir les variables SUBROUTINE phys_output_write(itap, pdtphys, paprs, pphis, & - pplay, lmax_th, aerosol_couple, & - ok_ade, ok_aie, ok_volcan, ivap, iliq, isol, ibs, ok_sync, & + pplay, lmax_th, ivap, iliq, isol, ibs, ok_sync, & ptconv, read_climoz, clevSTD, ptconvth, & - d_u, d_t, qx, d_qx, zmasse, flag_aerosol, flag_aerosol_strat, ok_cdnc, t, u1, v1) + d_u, d_t, qx, d_qx, zmasse, t, u1, v1) ! This subroutine does the actual writing of diagnostics that were @@ -35,4 +34,6 @@ USE water_int_mod, ONLY: water_int USE lmdz_gwd_ini, ONLY: ok_orodr, ok_orolf, ok_hines, ok_gwd_rando + USE conf_phys_m, ONLY : aerosol_couple, ok_ade, ok_aie, ok_volcan, & + flag_aerosol, flag_aerosol_strat, ok_cdnc USE phys_output_ctrlout_mod, ONLY: o_phis, o_aire, is_ter, is_lic, is_oce, & o_longitude, o_latitude, & @@ -554,6 +555,5 @@ INTEGER :: itap, ivap, iliq, isol, ibs, read_climoz INTEGER, DIMENSION(klon) :: lmax_th - LOGICAL :: aerosol_couple, ok_sync - LOGICAL :: ok_ade, ok_aie, ok_volcan + LOGICAL :: ok_sync LOGICAL, DIMENSION(klon, klev) :: ptconv, ptconvth REAL :: pdtphys @@ -565,7 +565,4 @@ REAL, DIMENSION(klon,klev,nqtot) :: qx, d_qx REAL, DIMENSION(klon, klev) :: zmasse - INTEGER :: flag_aerosol_strat - INTEGER :: flag_aerosol - LOGICAL :: ok_cdnc REAL, DIMENSION(klon,klev) :: t ! output for phystoken - offline flux REAL, DIMENSION(klon) :: u1, v1 ! output for phystoken - offline flux Index: LMDZ6/trunk/libf/phylmd/physiq_mod.F90 =================================================================== --- LMDZ6/trunk/libf/phylmd/physiq_mod.F90 (revision 6125) +++ LMDZ6/trunk/libf/phylmd/physiq_mod.F90 (revision 6126) @@ -1597,10 +1597,6 @@ CALL phys_output_open(longitude_deg,latitude_deg,nCFMIP,tabijGCM, & iGCM,jGCM,lonGCM,latGCM, & - jjmp1,nlevSTD,clevSTD,rlevSTD, phys_tstep,ok_veget, & - type_ocean,iflag_pbl,iflag_pbl_split,ok_mensuel,ok_journe, & - ok_hf,ok_instan,ok_LES,ok_ade,ok_aie, & - read_climoz, phys_out_filestations, & - aerosol_couple, & - flag_aerosol_strat, pdtphys, paprs, pphis, & + jjmp1,nlevSTD,clevSTD,rlevSTD, phys_tstep, read_climoz, & + phys_out_filestations, pdtphys, paprs, pphis, & pplay, lmax_th, ptconv, ptconvth, ivap, & d_u, d_t, qx, d_qx, zmasse, ok_sync_omp) @@ -1774,9 +1770,8 @@ CALL phytracr_spl_out_init() CALL phys_output_write_spl(itap, pdtphys, paprs, pphis, & - pplay, lmax_th, aerosol_couple, & - ok_ade, ok_aie, ivap, ok_sync, & + pplay, lmax_th, & + ivap, ok_sync, & ptconv, read_climoz, clevSTD, & - ptconvth, d_t, qx, d_qx, d_tr_dyn, zmasse, & - flag_aerosol, flag_aerosol_strat, ok_cdnc) + ptconvth, d_t, qx, d_qx, d_tr_dyn, zmasse) ELSE ! phys_output_write écrit des variables traceurs seulement si iflag_phytrac == 1 @@ -1786,9 +1781,9 @@ ENDIF CALL phys_output_write(itap, pdtphys, paprs, pphis, & - pplay, lmax_th, aerosol_couple, & - ok_ade, ok_aie, ok_volcan, ivap, iliq, isol, ibs, ok_sync,& + pplay, lmax_th, & + ivap, iliq, isol, ibs, ok_sync, & ptconv, read_climoz, clevSTD, & ptconvth, d_u, d_t, qx, d_qx, zmasse, & - flag_aerosol, flag_aerosol_strat, ok_cdnc, t, u1, v1) + t, u1, v1) END IF @@ -5333,16 +5328,16 @@ IF (CPPKEY_DUST) THEN CALL phys_output_write_spl(itap, pdtphys, paprs, pphis, & - pplay, lmax_th, aerosol_couple, & - ok_ade, ok_aie, ivap, ok_sync, & + pplay, lmax_th, & + ivap, ok_sync, & ptconv, read_climoz, clevSTD, & - ptconvth, d_t, qx, d_qx, d_tr_dyn, zmasse, & - flag_aerosol, flag_aerosol_strat, ok_cdnc) + ptconvth, d_t, qx, d_qx, d_tr_dyn, zmasse) ELSE CALL phys_output_write(itap, pdtphys, paprs, pphis, & - pplay, lmax_th, aerosol_couple, & - ok_ade, ok_aie, ok_volcan, ivap, iliq, isol, ibs, & - ok_sync, ptconv, read_climoz, clevSTD, & + pplay, lmax_th, & + ivap, iliq, isol, ibs, & + ok_sync, & + ptconv, read_climoz, clevSTD, & ptconvth, d_u, d_t, qx, d_qx, zmasse, & - flag_aerosol, flag_aerosol_strat, ok_cdnc,t, u1, v1) + t, u1, v1) END IF Index: LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90 =================================================================== --- LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90 (revision 6125) +++ LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90 (revision 6126) @@ -1719,12 +1719,9 @@ ok_sync_omp=.FALSE. CALL getin('ok_sync',ok_sync_omp) + CALL phys_output_open(longitude_deg,latitude_deg,nCFMIP,tabijGCM, & iGCM,jGCM,lonGCM,latGCM, & - jjmp1,nlevSTD,clevSTD,rlevSTD, phys_tstep,ok_veget, & - type_ocean,iflag_pbl,iflag_pbl_split,ok_mensuel,ok_journe, & - ok_hf,ok_instan,ok_LES,ok_ade,ok_aie, & - read_climoz, phys_out_filestations, & - aerosol_couple, & - flag_aerosol_strat, pdtphys, paprs, pphis, & + jjmp1,nlevSTD,clevSTD,rlevSTD, phys_tstep, read_climoz, & + phys_out_filestations, pdtphys, paprs, pphis, & pplay, lmax_th, ptconv, ptconvth, ivap, & d_u, d_t, qx, d_qx, zmasse, ok_sync_omp) @@ -1902,9 +1899,8 @@ CALL phytracr_spl_out_init() CALL phys_output_write_spl(itap, pdtphys, paprs, pphis, & - pplay, lmax_th, aerosol_couple, & - ok_ade, ok_aie, ivap, ok_sync, & - ptconv, read_climoz, clevSTD, & - ptconvth, d_t, qx, d_qx, d_tr_dyn, zmasse, & - flag_aerosol, flag_aerosol_strat, ok_cdnc) + pplay, lmax_th, & + ivap, ok_sync, & + ptconv, read_climoz, clevSTD, & + ptconvth, d_t, qx, d_qx, d_tr_dyn, zmasse) ELSE ! phys_output_write écrit des variables traceurs seulement si iflag_phytrac == 1 @@ -1913,12 +1909,12 @@ CALL phytrac_init() ENDIF - CALL phys_output_write(itap, pdtphys, paprs, pphis, & - pplay, lmax_th, aerosol_couple, & - ok_ade, ok_aie, ok_volcan, ivap, iliq, isol, ibs, ok_sync,& - ptconv, read_climoz, clevSTD, & - ptconvth, d_u, d_t, qx, d_qx, zmasse, & - flag_aerosol, flag_aerosol_strat, ok_cdnc, t, u1, v1) + CALL phys_output_write(itap, pdtphys, paprs, pphis, & + pplay, lmax_th, & + ivap, iliq, isol, ibs, & + ok_sync, & + ptconv, read_climoz, clevSTD, & + ptconvth, d_u, d_t, qx, d_qx, zmasse, & + t, u1, v1) END IF - IF (using_xios) THEN @@ -6407,26 +6403,4 @@ END IF -IF (CPPKEY_COSP2) THEN - IF (itap.eq.1.or.MOD(itap,NINT(freq_cosp/phys_tstep)).EQ.0) THEN - - IF (prt_level .GE.10) THEN - print*,'freq_cosp',freq_cosp - ENDIF - mr_ozone=wo(:, :, 1) * dobson_u * 1e3 / zmasse - print*,'Dans physiq.F avant appel ' - ! s ref_liq,ref_ice - CALL phys_cosp2(itap,phys_tstep,missing_val, & - klon,klev,longitude_deg,latitude_deg,presnivs,overlap, & - JrNt,ref_liq,ref_ice, & - pctsrf(:,is_ter)+pctsrf(:,is_lic), & - zu10m,zv10m,pphis, & - zphi,paprs(:,1:klev),pplay,zxtsol,t_seri, & - qx(:,:,ivap),zx_rh,cldfra,rnebcon,flwc,fiwc, & - prfl(:,1:klev),psfl(:,1:klev), & - pmflxr(:,1:klev),pmflxs(:,1:klev), & - mr_ozone,cldtau, cldemi) - ENDIF -END IF - IF (CPPKEY_COSPV2) THEN IF (itap.eq.1.or.MOD(itap,NINT(freq_cosp/phys_tstep)).EQ.0) THEN @@ -7045,17 +7019,17 @@ IF (CPPKEY_DUST) THEN - CALL phys_output_write_spl(itap, pdtphys, paprs, pphis, & - pplay, lmax_th, aerosol_couple, & - ok_ade, ok_aie, ivap, ok_sync, & - ptconv, read_climoz, clevSTD, & - ptconvth, d_t, qx, d_qx, d_tr_dyn, zmasse, & - flag_aerosol, flag_aerosol_strat, ok_cdnc) + CALL phys_output_write_spl(itap, pdtphys, paprs, pphis, & + pplay, lmax_th, & + ivap, ok_sync, & + ptconv, read_climoz, clevSTD, & + ptconvth, d_t, qx, d_qx, d_tr_dyn, zmasse) ELSE - CALL phys_output_write(itap, pdtphys, paprs, pphis, & - pplay, lmax_th, aerosol_couple, & - ok_ade, ok_aie, ok_volcan, ivap, iliq, isol, ibs, & - ok_sync, ptconv, read_climoz, clevSTD, & - ptconvth, d_u, d_t, qx, d_qx, zmasse, & - flag_aerosol, flag_aerosol_strat, ok_cdnc,t, u1, v1) + CALL phys_output_write(itap, pdtphys, paprs, pphis, & + pplay, lmax_th, & + ivap, iliq, isol, ibs, & + ok_sync, & + ptconv, read_climoz, clevSTD, & + ptconvth, d_u, d_t, qx, d_qx, zmasse, & + t, u1, v1) END IF