Index: LMDZ5/trunk/libf/cosp/cosp_constants.F90 =================================================================== --- LMDZ5/trunk/libf/cosp/cosp_constants.F90 (revision 1986) +++ LMDZ5/trunk/libf/cosp/cosp_constants.F90 (revision 2080) @@ -31,5 +31,5 @@ ! MODULE MOD_COSP_CONSTANTS -! use netcdf, only: nf90_fill_rea + use netcdf, only: nf90_fill_real IMPLICIT NONE @@ -47,6 +47,7 @@ ! Missing value !! real,parameter :: R_UNDEF = -1.0E30 - real,parameter :: R_UNDEF = 9.96921e+36 -! real,parameter :: R_UNDEF = nf90_fill_rea +! real,parameter :: R_UNDEF = 9.96921e+36 + real,parameter :: R_UNDEF = nf90_fill_real + ! Number of possible output variables integer,parameter :: N_OUT_LIST = 27 Index: LMDZ5/trunk/libf/cosp/cosp_output_mod.F90 =================================================================== --- LMDZ5/trunk/libf/cosp/cosp_output_mod.F90 (revision 1986) +++ LMDZ5/trunk/libf/cosp/cosp_output_mod.F90 (revision 2080) @@ -80,6 +80,4 @@ ! LOGICAL, SAVE :: cosp_varsdefined = .FALSE. ! ug PAS THREADPRIVATE ET C'EST NORMAL LOGICAL, SAVE :: cosp_varsdefined - INTEGER, save :: Nlevout,Ncolout -!$OMP THREADPRIVATE(Nlevout) CONTAINS @@ -130,6 +128,4 @@ WRITE(lunout,*) 'Debut cosp_output_mod.F90' ! Initialisations (Valeurs par defaut) - Nlevout = vgrid%Nlvgrid - Ncolout = Ncolumns do ii=1,Ncolumns @@ -188,8 +184,8 @@ if (use_vgrid) then ! Axe vertical Cosp 40 niveaux (en m) - CALL histvert(cosp_nidfiles(iff),"height","height","m",Nlevout,vgrid%z,nvert(iff)) + CALL histvert(cosp_nidfiles(iff),"height","height","m",vgrid%Nlvgrid,vgrid%z,nvert(iff)) else ! Axe vertical modele LMDZ presnivs - CALL histvert(cosp_nidfiles(iff),"presnivs","Vertical levels","Pa",Nlevout,presnivs,nvert(iff),"down") + CALL histvert(cosp_nidfiles(iff),"presnivs","Vertical levels","Pa",vgrid%Nlvgrid,presnivs,nvert(iff),"down") endif ! Axe vertical niveaux modele (en m) @@ -205,7 +201,7 @@ ! ug déclaration des axes verticaux de chaque fichier: if (use_vgrid) then - CALL wxios_add_vaxis("height", cosp_outfilenames(iff), Nlevout, vgrid%z) + CALL wxios_add_vaxis("height", cosp_outfilenames(iff), vgrid%Nlvgrid, vgrid%z) else - CALL wxios_add_vaxis("presnivs", cosp_outfilenames(iff), Nlevout, presnivs) + CALL wxios_add_vaxis("presnivs", cosp_outfilenames(iff), vgrid%Nlvgrid, presnivs) endif CALL wxios_add_vaxis("height_mlev", cosp_outfilenames(iff), Nlevlmdz, vgrid%mz) Index: LMDZ5/trunk/libf/cosp/cosp_output_write_mod.F90 =================================================================== --- LMDZ5/trunk/libf/cosp/cosp_output_write_mod.F90 (revision 1986) +++ LMDZ5/trunk/libf/cosp/cosp_output_write_mod.F90 (revision 2080) @@ -8,4 +8,6 @@ INTEGER, SAVE :: itau_iocosp !$OMP THREADPRIVATE(itau_iocosp) + INTEGER, save :: Nlevout, Ncolout +!$OMP THREADPRIVATE(Nlevout, Ncolout) ! INTERFACE histwrite_cosp @@ -15,5 +17,5 @@ CONTAINS - SUBROUTINE cosp_output_write(Nlevlmdz, Npoints, Ncolumns, itap, dtime, freq_COSP, cfg, gbx, sglidar, stlidar, isccp) + SUBROUTINE cosp_output_write(Nlevlmdz, Npoints, Ncolumns, itap, dtime, freq_COSP, cfg, gbx, vgrid, sglidar, stlidar, isccp) USE ioipsl @@ -33,4 +35,5 @@ type(cosp_isccp) :: isccp ! Output from ISCCP simulator type(cosp_lidarstats) :: stlidar ! Summary statistics from lidar simulator + type(cosp_vgrid) :: vgrid ! Information on vertical grid of stats !!! Variables locales @@ -41,4 +44,7 @@ include "temps.h" + + Nlevout = vgrid%Nlvgrid + Ncolout = Ncolumns IF (MOD(itap,NINT(freq_COSP/dtime)).EQ.0) THEN @@ -67,5 +73,6 @@ if (cfg%Llidar_sim) then - +! print*,'cfg%Llidar_sim dans output_write',cfg%Llidar_sim +! print*,'Nlevout Npoints dans output_write, R_UNDEF =',Nlevout,Npoints,R_UNDEF ! Pb des valeurs indefinies, on les met a 0 ! A refaire proprement Index: LMDZ5/trunk/libf/cosp/phys_cosp.F90 =================================================================== --- LMDZ5/trunk/libf/cosp/phys_cosp.F90 (revision 1986) +++ LMDZ5/trunk/libf/cosp/phys_cosp.F90 (revision 2080) @@ -84,6 +84,4 @@ character(len=64),PARAMETER :: cosp_input_nl='cosp_input_nl.txt' character(len=64),PARAMETER :: cosp_output_nl='cosp_output_nl.txt' - character(len=512), save :: finput ! Input file name - character(len=512), save :: cmor_nl integer, save :: isccp_topheight,isccp_topheight_direction,overlap integer,save :: Ncolumns ! Number of subcolumns in SCOPS @@ -140,6 +138,6 @@ ! - namelist/COSP_INPUT/cmor_nl,overlap,isccp_topheight,isccp_topheight_direction, & - npoints_it,ncolumns,nlevels,use_vgrid,nlr,csat_vgrid,finput, & + namelist/COSP_INPUT/overlap,isccp_topheight,isccp_topheight_direction, & + npoints_it,ncolumns,use_vgrid,nlr,csat_vgrid, & radar_freq,surface_radar,use_mie_tables, & use_gas_abs,do_ray,melt_lay,k2,Nprmts_max_hydro,Naero,Nprmts_max_aero, & @@ -297,9 +295,11 @@ if (debut_cosp) then + !$OMP MASTER print *, ' Open outpts files and define axis' call cosp_output_open(Nlevlmdz, Ncolumns, presnivs, dtime, freq_cosp, & ok_mensuelCOSP, ok_journeCOSP, ok_hfCOSP, & ecrit_mth, ecrit_day, ecrit_hf, use_vgrid, vgrid) - + !$OMP END MASTER + !$OMP BARRIER debut_cosp=.false. endif ! debut_cosp @@ -313,5 +313,5 @@ !!!!!!!!!!!!!!!!!! Ecreture des sorties Cosp !!!!!!!!!!!!!!r!!!!!!:!!!!! print *, 'Calling write output' - call cosp_output_write(Nlevlmdz, Npoints, Ncolumns, itap, dtime, freq_COSP, cfg, gbx, sglidar, stlidar, isccp) + call cosp_output_write(Nlevlmdz, Npoints, Ncolumns, itap, dtime, freq_COSP, cfg, gbx, vgrid, sglidar, stlidar, isccp) !+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -343,5 +343,4 @@ CLOSE(10) ENDIF - CALL bcast(cmor_nl) CALL bcast(overlap) CALL bcast(isccp_topheight) @@ -349,9 +348,7 @@ CALL bcast(npoints_it) CALL bcast(ncolumns) - CALL bcast(nlevels) CALL bcast(use_vgrid) CALL bcast(nlr) CALL bcast(csat_vgrid) - CALL bcast(finput) CALL bcast(radar_freq) CALL bcast(surface_radar)