- Timestamp:
- Mar 27, 2026, 3:09:52 PM (2 weeks ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
LMDZ6/branches/LMDZISOdevSN/libf/phylmdiso/physiq_mod.F90
r5927 r6141 64 64 USE orografi_strato_mod, ONLY: drag_noro_strato, lift_noro_strato, sugwd_strato 65 65 USE ozonecm_m, ONLY: ozonecm ! ozone of J.-F. Royer 66 USE pbl_surface_mod, ONLY : pbl_surface 66 USE pbl_surface_mod, ONLY : pbl_surface_main 67 67 USE phyaqua_mod, ONLY: zenang_an 68 68 USE phyetat0_mod, ONLY: phyetat0 … … 1110 1110 LOGICAL, SAVE :: ok_bug_ajs_cv = .TRUE. 1111 1111 !$OMP THREADPRIVATE(ok_bug_ajs_cv) 1112 1112 1113 ! 1113 1114 !******************************************************** … … 1779 1780 #ifdef ISO 1780 1781 WRITE(*,*) 'physiq 1846a: ok_isotopes,ntraciso,niso=',niso>0,ntraciso,niso 1781 IF (niso <= 0) CALL abort_physic('physiq 17 56','options iso incompatibles',1)1782 IF (niso <= 0) CALL abort_physic('physiq 1782','options iso incompatibles',1) 1782 1783 #ifdef ISOTRAC 1783 IF (nzone <= 0) CALL abort_physic('physiq 17 58','options isotrac incompatibles',1)1784 IF (nzone <= 0) CALL abort_physic('physiq 1784','options isotrac incompatibles',1) 1784 1785 #else 1785 IF (nzone > 0) CALL abort_physic('physiq 17 62','options isotrac incompatibles',1)1786 IF (nzone > 0) CALL abort_physic('physiq 1786','options isotrac incompatibles',1) 1786 1787 #endif 1787 1788 #else 1788 IF (niso > 0) CALL abort_physic('physiq 17 72','options iso incompatibles',1)1789 IF (niso > 0) CALL abort_physic('physiq 1789','options iso incompatibles',1) 1789 1790 #endif 1790 1791 … … 1792 1793 ! initialisations isotopiques 1793 1794 #ifdef ISOVERIF 1794 WRITE(*,*) 'physiq 1 366: call iso_init'1795 WRITE(*,*) 'physiq 1795: call iso_init' 1795 1796 WRITE(*,*) 'ok_isotopes=',niso > 0 1796 1797 #endif … … 1798 1799 #ifdef ISOTRAC 1799 1800 IF (nzone > 0) THEN 1800 WRITE(*,*) 'physiq 1 416: call iso_traceurs_init'1801 WRITE(*,*) 'physiq 1801: call iso_traceurs_init' 1801 1802 CALL iso_traceurs_init() 1802 1803 ENDIF … … 1804 1805 !write(*,*) 'gcm 265: ntraciso=',ntraciso 1805 1806 #ifdef ISOVERIF 1806 WRITE(*,*) 'physiq 1 421: call iso_verif_init'1807 WRITE(*,*) 'physiq 1807: call iso_verif_init' 1807 1808 CALL iso_verif_init() 1808 1809 #endif … … 2654 2655 u_seri(i,k) = u(i,k) 2655 2656 v_seri(i,k) = v(i,k) 2656 qx_seri(i,k,:) = qx(i,k,:) 2657 qx_seri(i,k,:) = qx(i,k,:) ! Changement ISO et reevap ! 2657 2658 q_seri(i,k) = qx(i,k,ivap) 2658 2659 ql_seri(i,k) = qx(i,k,iliq) … … 3380 3381 ENDIF 3381 3382 3382 CALL pbl_surface( & 3383 ! CALL pbl_surface( & 3384 CALL pbl_surface_main( & 3383 3385 phys_tstep, date0, itap, days_elapsed+1, & 3384 3386 debut, lafin, & … … 3412 3414 kh,kh_x,kh_w, & 3413 3415 !>nrlmd 3414 coefh(1:klon,1:klev,1:nbsrf+1), coefm(1:klon,1:klev,1:nbsrf+1), & 3416 !SN coefh(1:klon,1:klev,1:nbsrf+1), coefm(1:klon,1:klev,1:nbsrf+1), & 3417 coefh, coefm, & 3415 3418 slab_wfbils, & 3416 3419 qsol, zq2m, s_pblh, s_lcl, & … … 3447 3450 & d_xt_vdf,d_xt_vdf_w,d_xt_vdf_x, & 3448 3451 & xtsol,dxtevap,zxxtsnow,zxfluxxt,fluxxt, & 3449 & h1_diag,runoff_diag,xtrunoff_diag, & 3452 & h1_diag,runoff_diag,xtrunoff_diag, & ! SN supprimer les runoff_diag ? 3450 3453 & xtriverflow,xtcoastalflow & 3451 3454 #endif … … 3454 3457 3455 3458 #ifdef ISO 3456 ! write(*,*) 'physiq 2402: apres pbl_surface'3459 ! write(*,*) 'physiq 3459: apres pbl_surface' 3457 3460 #ifdef ISOVERIF 3458 3461 do i=1,klon 3459 3462 do k=1,klev 3460 3463 do ixt=1,ntraciso 3461 call iso_verif_noNaN(d_xt_vdf(ixt,i,k),'physiq 1993a')3462 call iso_verif_noNaN(xt_seri(ixt,i,k),'physiq 1993b')3464 call iso_verif_noNaN(d_xt_vdf(ixt,i,k),'physiq 3461a') 3465 call iso_verif_noNaN(xt_seri(ixt,i,k),'physiq 3461b') 3463 3466 enddo !do ixt=1,ntraciso 3464 3467 enddo … … 3469 3472 do k=1,klev 3470 3473 #ifdef ISOTRAC 3471 call iso_verif_traceur_justmass(d_xt_vdf(1,i,k),'physiq 2443')3474 call iso_verif_traceur_justmass(d_xt_vdf(1,i,k),'physiq 3471') 3472 3475 #endif 3473 3476 enddo … … 3531 3534 d_deltat_vdf(:,:) = d_t_vdf_w(:,:)-d_t_vdf_x(:,:) 3532 3535 d_deltaq_vdf(:,:) = d_q_vdf_w(:,:)-d_q_vdf_x(:,:) 3536 !SN pourquoi il n'y a pas la meme chose pour "d_deltaxt_vdf" ? 3533 3537 CALL add_wake_tend & 3534 3538 (d_deltat_vdf, d_deltaq_vdf, dsig0, dsig0, ddens0, ddens0, wkoccur1, 'vdf', abortphy & … … 3756 3760 ELSE IF (iflag_con.EQ.2) THEN 3757 3761 #ifdef ISO 3758 CALL abort_physic('physiq 2770','isos pas prevus ici',1)3762 CALL abort_physic('physiq 3760','isos pas prevus ici',1) 3759 3763 #endif 3760 3764 CALL conflx(phys_tstep, paprs, pplay, t_seri, q_seri, & … … 3871 3875 ENDDO 3872 3876 ELSE 3873 3874 3875 3876 3877 #ifdef ISO 3878 3879 3880 3881 3877 t_w(:,:) = t_seri(:,:) 3878 q_w(:,:) = q_seri(:,:) 3879 t_x(:,:) = t_seri(:,:) 3880 q_x(:,:) = q_seri(:,:) 3881 #ifdef ISO 3882 DO ixt=1,ntraciso 3883 xt_w(ixt,:,:) = xt_seri(ixt,:,:) 3884 xt_x(ixt,:,:) = xt_seri(ixt,:,:) 3885 ENDDO 3882 3886 #endif 3883 3887 ENDIF !IF (iflag_wake>=1) THEN … … 5084 5088 d_q_ajs(:,:)=d_q_ajs(:,:)+d_q_ajsb(:,:) 5085 5089 #ifdef ISO 5086 d_xt_ajs(:,:,:)=d_xt_ajs(:,:,:)+d_xt_ajsb(:,:,:)5090 d_xt_ajs(:,:,:)=d_xt_ajs(:,:,:)+d_xt_ajsb(:,:,:) 5087 5091 #endif 5088 5092 … … 5101 5105 CALL surf_wind(klon,nsurfwind,zu10m,zv10m,wake_s,wake_Cstar,zustar,ale_bl,surf_wind_value,surf_wind_proba) 5102 5106 5103 !5104 5107 !=================================================================== 5105 5108 ! Computation of ratqs, the width (normalized) of the subrid scale … … 5938 5941 #endif 5939 5942 ENDIF 5943 5940 5944 ELSE !--flag_aerosol = 0 5941 5945 tausum_aero(:,:,:) = 0. … … 7220 7224 IF (ok_water_mass_fixer) THEN 7221 7225 #ifdef ISO 7222 CALL abort_physic('physiq 6936','isos pas prevus dans le mass fixer',1)7226 CALL abort_physic('physiq 7226','isos pas prevus dans le mass fixer',1) 7223 7227 ! Camille Risi mai 2024: on attend d'avoir la 4e dimension qui rendra tout plus simple. 7224 7228 #endif
Note: See TracChangeset
for help on using the changeset viewer.
