Changeset 2594 for LMDZ5/branches/testing/libf/phylmd/physiq_mod.F90

Timestamp:

Jul 18, 2016, 9:41:10 PM (8 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2545:2589 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/physiq_mod.F90 (modified) (6 diffs)

LMDZ5/branches/testing/libf/phylmd/physiq_mod.F90

@@ -1077 +1077 @@
        !RC
        ustar(:,:)=0.
-       u10m(:,:)=0.
-       v10m(:,:)=0.
+!       u10m(:,:)=0.
+!       v10m(:,:)=0.
        rain_con(:)=0.
        snow_con(:)=0.
@@ -1165 +1165 @@
 
        CALL phyetat0 ("startphy.nc",clesphy0,tabcntr0)
+!jyg<
        IF (klon_glo==1) THEN
-          coefh=0. ; coefm=0. ; pbl_tke=0.
-          coefh(:,2,:)=1.e-2 ; coefm(:,2,:)=1.e-2 ; pbl_tke(:,2,:)=1.e-2
-          PRINT*,'FH WARNING : lignes a supprimer'
+          pbl_tke(:,:,is_ave) = 0.
+          DO nsrf=1,nbsrf
+            DO k = 1,klev+1
+                 pbl_tke(:,k,is_ave) = pbl_tke(:,k,is_ave) &
+                     +pctsrf(:,nsrf)*pbl_tke(:,k,nsrf)
+            ENDDO
+          ENDDO
+!>jyg
        ENDIF
        !IM begin
@@ -1424 +1430 @@
                klon, &
                nqtot, &
+               nqo, &
                pdtphys, &
                annee_ref, &
@@ -2294 +2301 @@
                     wake_pe, wake_fip,  &
                     Ale_bl, Ale_bl_trig, Alp_bl, &
-                    Ale, Alp )
+                    Ale, Alp , Ale_wake, Alp_wake)
 !>jyg
 !
@@ -2776 +2783 @@
 !jyg<
 !
-          CALL alpale_th( dtime, lmax_th, t_seri, &
+          CALL alpale_th( dtime, lmax_th, t_seri, cell_area,  &
                           cin, s2, n2,  &
                           ale_bl_trig, ale_bl_stat, ale_bl,  &
-                          alp_bl, alp_bl_stat )
+                          alp_bl, alp_bl_stat, &
+                          proba_notrig, random_notrig)
+
+          ! ------------------------------------------------------------------
+          ! Transport de la TKE par les panaches thermiques.
+          ! FH : 2010/02/01
+          !     if (iflag_pbl.eq.10) then
+          !     call thermcell_dtke(klon,klev,nbsrf,pdtphys,fm_therm,entr_therm,
+          !    s           rg,paprs,pbl_tke)
+          !     endif
+          ! -------------------------------------------------------------------
 
           do i=1,klon
@@ -3931 +3948 @@
 #endif
     ENDIF  !ok_cosp
+
+
+! Marine
+
+  IF (ok_airs) then
+
+  IF (itap.eq.1.or.MOD(itap,NINT(freq_airs/dtime)).EQ.0) THEN
+  write(*,*) 'je vais appeler simu_airs, ok_airs, freq_airs=', &
+     & ok_airs, freq_airs
+  call simu_airs(itap,rneb, t_seri, cldemi, fiwc, ref_ice, pphi, pplay, paprs,&
+     & map_prop_hc,map_prop_hist,&
+     & map_emis_hc,map_iwp_hc,map_deltaz_hc,map_pcld_hc,map_tcld_hc,&
+     & map_emis_Cb,map_pcld_Cb,map_tcld_Cb,&
+     & map_emis_ThCi,map_pcld_ThCi,map_tcld_ThCi,&
+     & map_emis_Anv,map_pcld_Anv,map_tcld_Anv,&
+     & map_emis_hist,map_iwp_hist,map_deltaz_hist,map_rad_hist,&
+     & map_ntot,map_hc,map_hist,&
+     & map_Cb,map_ThCi,map_Anv,&
+     & alt_tropo )
+  ENDIF
+
+  ENDIF  ! ok_airs
+
+
     ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
     !AA