Index: LMDZ6/branches/LMDZISOdevSN/libf/phylmdiso/physiq_mod.F90 =================================================================== --- LMDZ6/branches/LMDZISOdevSN/libf/phylmdiso/physiq_mod.F90 (revision 6108) +++ LMDZ6/branches/LMDZISOdevSN/libf/phylmdiso/physiq_mod.F90 (revision 6141) @@ -64,5 +64,5 @@ USE orografi_strato_mod, ONLY: drag_noro_strato, lift_noro_strato, sugwd_strato USE ozonecm_m, ONLY: ozonecm ! ozone of J.-F. Royer - USE pbl_surface_mod, ONLY : pbl_surface + USE pbl_surface_mod, ONLY : pbl_surface_main USE phyaqua_mod, ONLY: zenang_an USE phyetat0_mod, ONLY: phyetat0 @@ -1110,4 +1110,5 @@ LOGICAL, SAVE :: ok_bug_ajs_cv = .TRUE. !$OMP THREADPRIVATE(ok_bug_ajs_cv) + ! !******************************************************** @@ -1779,12 +1780,12 @@ #ifdef ISO WRITE(*,*) 'physiq 1846a: ok_isotopes,ntraciso,niso=',niso>0,ntraciso,niso - IF (niso <= 0) CALL abort_physic('physiq 1756','options iso incompatibles',1) + IF (niso <= 0) CALL abort_physic('physiq 1782','options iso incompatibles',1) #ifdef ISOTRAC - IF (nzone <= 0) CALL abort_physic('physiq 1758','options isotrac incompatibles',1) + IF (nzone <= 0) CALL abort_physic('physiq 1784','options isotrac incompatibles',1) #else - IF (nzone > 0) CALL abort_physic('physiq 1762','options isotrac incompatibles',1) + IF (nzone > 0) CALL abort_physic('physiq 1786','options isotrac incompatibles',1) #endif #else - IF (niso > 0) CALL abort_physic('physiq 1772','options iso incompatibles',1) + IF (niso > 0) CALL abort_physic('physiq 1789','options iso incompatibles',1) #endif @@ -1792,5 +1793,5 @@ ! initialisations isotopiques #ifdef ISOVERIF - WRITE(*,*) 'physiq 1366: call iso_init' + WRITE(*,*) 'physiq 1795: call iso_init' WRITE(*,*) 'ok_isotopes=',niso > 0 #endif @@ -1798,5 +1799,5 @@ #ifdef ISOTRAC IF (nzone > 0) THEN - WRITE(*,*) 'physiq 1416: call iso_traceurs_init' + WRITE(*,*) 'physiq 1801: call iso_traceurs_init' CALL iso_traceurs_init() ENDIF @@ -1804,5 +1805,5 @@ !write(*,*) 'gcm 265: ntraciso=',ntraciso #ifdef ISOVERIF - WRITE(*,*) 'physiq 1421: call iso_verif_init' + WRITE(*,*) 'physiq 1807: call iso_verif_init' CALL iso_verif_init() #endif @@ -2654,5 +2655,5 @@ u_seri(i,k) = u(i,k) v_seri(i,k) = v(i,k) - qx_seri(i,k,:) = qx(i,k,:) + qx_seri(i,k,:) = qx(i,k,:) ! Changement ISO et reevap ! q_seri(i,k) = qx(i,k,ivap) ql_seri(i,k) = qx(i,k,iliq) @@ -3380,5 +3381,6 @@ ENDIF - CALL pbl_surface( & +! CALL pbl_surface( & + CALL pbl_surface_main( & phys_tstep, date0, itap, days_elapsed+1, & debut, lafin, & @@ -3412,5 +3414,6 @@ kh,kh_x,kh_w, & !>nrlmd - coefh(1:klon,1:klev,1:nbsrf+1), coefm(1:klon,1:klev,1:nbsrf+1), & +!SN coefh(1:klon,1:klev,1:nbsrf+1), coefm(1:klon,1:klev,1:nbsrf+1), & + coefh, coefm, & slab_wfbils, & qsol, zq2m, s_pblh, s_lcl, & @@ -3447,5 +3450,5 @@ & d_xt_vdf,d_xt_vdf_w,d_xt_vdf_x, & & xtsol,dxtevap,zxxtsnow,zxfluxxt,fluxxt, & - & h1_diag,runoff_diag,xtrunoff_diag, & + & h1_diag,runoff_diag,xtrunoff_diag, & ! SN supprimer les runoff_diag ? & xtriverflow,xtcoastalflow & #endif @@ -3454,11 +3457,11 @@ #ifdef ISO - ! write(*,*) 'physiq 2402: apres pbl_surface' + ! write(*,*) 'physiq 3459: apres pbl_surface' #ifdef ISOVERIF do i=1,klon do k=1,klev do ixt=1,ntraciso - call iso_verif_noNaN(d_xt_vdf(ixt,i,k),'physiq 1993a') - call iso_verif_noNaN(xt_seri(ixt,i,k),'physiq 1993b') + call iso_verif_noNaN(d_xt_vdf(ixt,i,k),'physiq 3461a') + call iso_verif_noNaN(xt_seri(ixt,i,k),'physiq 3461b') enddo !do ixt=1,ntraciso enddo @@ -3469,5 +3472,5 @@ do k=1,klev #ifdef ISOTRAC - call iso_verif_traceur_justmass(d_xt_vdf(1,i,k),'physiq 2443') + call iso_verif_traceur_justmass(d_xt_vdf(1,i,k),'physiq 3471') #endif enddo @@ -3531,4 +3534,5 @@ d_deltat_vdf(:,:) = d_t_vdf_w(:,:)-d_t_vdf_x(:,:) d_deltaq_vdf(:,:) = d_q_vdf_w(:,:)-d_q_vdf_x(:,:) +!SN pourquoi il n'y a pas la meme chose pour "d_deltaxt_vdf" ? CALL add_wake_tend & (d_deltat_vdf, d_deltaq_vdf, dsig0, dsig0, ddens0, ddens0, wkoccur1, 'vdf', abortphy & @@ -3756,5 +3760,5 @@ ELSE IF (iflag_con.EQ.2) THEN #ifdef ISO - CALL abort_physic('physiq 2770','isos pas prevus ici',1) + CALL abort_physic('physiq 3760','isos pas prevus ici',1) #endif CALL conflx(phys_tstep, paprs, pplay, t_seri, q_seri, & @@ -3871,13 +3875,13 @@ ENDDO ELSE - t_w(:,:) = t_seri(:,:) - q_w(:,:) = q_seri(:,:) - t_x(:,:) = t_seri(:,:) - q_x(:,:) = q_seri(:,:) -#ifdef ISO - DO ixt=1,ntraciso - xt_w(ixt,:,:) = xt_seri(ixt,:,:) - xt_x(ixt,:,:) = xt_seri(ixt,:,:) - ENDDO + t_w(:,:) = t_seri(:,:) + q_w(:,:) = q_seri(:,:) + t_x(:,:) = t_seri(:,:) + q_x(:,:) = q_seri(:,:) +#ifdef ISO + DO ixt=1,ntraciso + xt_w(ixt,:,:) = xt_seri(ixt,:,:) + xt_x(ixt,:,:) = xt_seri(ixt,:,:) + ENDDO #endif ENDIF !IF (iflag_wake>=1) THEN @@ -5084,5 +5088,5 @@ d_q_ajs(:,:)=d_q_ajs(:,:)+d_q_ajsb(:,:) #ifdef ISO - d_xt_ajs(:,:,:)=d_xt_ajs(:,:,:)+d_xt_ajsb(:,:,:) + d_xt_ajs(:,:,:)=d_xt_ajs(:,:,:)+d_xt_ajsb(:,:,:) #endif @@ -5101,5 +5105,4 @@ CALL surf_wind(klon,nsurfwind,zu10m,zv10m,wake_s,wake_Cstar,zustar,ale_bl,surf_wind_value,surf_wind_proba) - ! !=================================================================== ! Computation of ratqs, the width (normalized) of the subrid scale @@ -5938,4 +5941,5 @@ #endif ENDIF + ELSE !--flag_aerosol = 0 tausum_aero(:,:,:) = 0. @@ -7220,5 +7224,5 @@ IF (ok_water_mass_fixer) THEN #ifdef ISO - CALL abort_physic('physiq 6936','isos pas prevus dans le mass fixer',1) + CALL abort_physic('physiq 7226','isos pas prevus dans le mass fixer',1) ! Camille Risi mai 2024: on attend d'avoir la 4e dimension qui rendra tout plus simple. #endif