Changeset 2244

Timestamp:

Mar 24, 2015, 3:17:55 PM (9 years ago)

Author:

fhourdin

Message:

Correction pour le 1D + toilettage
Bugfixing for 1D + cleaning

Location:

LMDZ5/trunk/libf/phylmd

Files:

• compar1d.h (modified) (2 diffs)
• dyn1d/lmdz1d.F90 (modified) (3 diffs)
• pbl_surface_mod.F90 (modified) (1 diff)
• surf_seaice_mod.F90 (modified) (2 diffs)

LMDZ5/trunk/libf/phylmd/compar1d.h

@@ -9 +9 @@
       real :: tsurf
       real :: rugos
-      real :: qsol(1:2)
+      real :: xqsol(1:2)
       real :: qsurf
       real :: psurf
@@ -32 +32 @@
       common/com_par1d/                                                 &
      & nat_surf,tsurf,rugos,                                            &
-     & qsol,qsurf,psurf,zsurf,albedo,time,time_ini,xlat,xlon,airefi,    &
+     & xqsol,qsurf,psurf,zsurf,albedo,time,time_ini,xlat,xlon,airefi,   &
      & wtsurf,wqsurf,restart_runoff,xagesno,qsolinp,zpicinp,            &
      & forcing_type,tend_u,tend_v,tend_w,tend_t,tend_q,tend_rayo,       &

LMDZ5/trunk/libf/phylmd/dyn1d/lmdz1d.F90

@@ -188 +188 @@
       real :: run_off_lic_0(1)
       real :: fder(1),snsrf(1,nbsrf),qsurfsrf(1,nbsrf)
-      real :: evap(1,nbsrf),frugs(1,nbsrf)
       real :: tsoil(1,nsoilmx,nbsrf)
-      real :: agesno(1,nbsrf)
+!     real :: agesno(1,nbsrf)
 
 !---------------------------------------------------------------------
@@ -629 +628 @@
         snsrf(1,:)=0.        ! couverture de neige des sous surface
         qsurfsrf(1,:)=qsurf ! humidite de l'air des sous surface
-        evap=0.
-        frugs(1,:)=rugos     ! couverture de neige des sous surface
+        fevap=0.
+        z0m(1,:)=rugos     ! couverture de neige des sous surface
+        z0h(1,:)=rugos     ! couverture de neige des sous surface
         agesno  = xagesno
         tsoil(:,:,:)=tsurf
@@ -646 +646 @@
 !       tsoil(1,11,1)=308.00
 !-----------------------------------------------------------------------
-        call pbl_surface_init(qsol, fder, snsrf, qsurfsrf,                  &
-     &                                    evap, frugs, agesno, tsoil)
+        call pbl_surface_init(fder, snsrf, qsurfsrf, tsoil)
 
 !------------------ prepare limit conditions for limit.nc -----------------

LMDZ5/trunk/libf/phylmd/pbl_surface_mod.F90

@@ -1825 +1825 @@
                AcoefH, AcoefQ, BcoefH, BcoefQ, &
                AcoefU, AcoefV, BcoefU, BcoefV, &
-               ypsref, yu1, yv1, ygustiness, yrugoro, pctsrf, &
+               ypsref, yu1, yv1, ygustiness, pctsrf, &
                ysnow, yqsurf, yqsol, yagesno, ytsoil, &
 !albedo SB >>>

LMDZ5/trunk/libf/phylmd/surf_seaice_mod.F90

@@ -17 +17 @@
        AcoefH, AcoefQ, BcoefH, BcoefQ, &
        AcoefU, AcoefV, BcoefU, BcoefV, &
-       ps, u1, v1, gustiness, rugoro, pctsrf, &
+       ps, u1, v1, gustiness, pctsrf, &
        snow, qsurf, qsol, agesno, tsoil, &
        z0m, z0h, SFRWL, alb_dir_new, alb_dif_new, evap, fluxsens, fluxlat, &  
@@ -58 +58 @@
     REAL, DIMENSION(klon), INTENT(IN)        :: ps
     REAL, DIMENSION(klon), INTENT(IN)        :: u1, v1, gustiness
-    REAL, DIMENSION(klon), INTENT(IN)        :: rugoro
     REAL, DIMENSION(klon,nbsrf), INTENT(IN)  :: pctsrf