Changeset 4737 for LMDZ6/trunk/libf/phylmdiso

Timestamp:

Oct 24, 2023, 12:13:53 PM (16 months ago)

Author:

oboucher

Message:

moving the calculation of wfbilo wfrain and wfsnow inside phys_output_write_mod so that it uses the timestep values of rain and snow instead of the values from the previous timestep as it was the case in pbl_surface. Thus there is exact mass balance in the output.

Location:

LMDZ6/trunk/libf/phylmdiso

Files:

• pbl_surface_mod.F90 (modified) (4 diffs)
• phys_local_var_mod.F90 (modified) (3 diffs)
• physiq_mod.F90 (modified) (3 diffs)

LMDZ6/trunk/libf/phylmdiso/pbl_surface_mod.F90

@@ -303 +303 @@
        z0m, z0h,   agesno,  sollw,    solsw,         &
        d_ts,      evap,    fluxlat,   t2m,           &
-       wfbils,    wfbilo, wfevap, wfrain, wfsnow,   & 
+       wfbils,    wfevap,                           & 
        flux_t,   flux_u, flux_v,                    &
        dflux_t,   dflux_q,   zxsnow,                  &
@@ -609 +609 @@
     REAL, DIMENSION(klon, nbsrf), INTENT(OUT)       :: t2m        ! temperature at 2 meter height
     REAL, DIMENSION(klon, nbsrf), INTENT(OUT)       :: wfbils     ! heat balance at surface
-    REAL, DIMENSION(klon, nbsrf), INTENT(OUT)       :: wfbilo     ! water balance at surface weighted by srf
     REAL, DIMENSION(klon, nbsrf), INTENT(OUT)       :: wfevap     ! water balance (evap) at surface weighted by srf
-    REAL, DIMENSION(klon, nbsrf), INTENT(OUT)       :: wfrain     ! water balance (rain) at surface weighted by srf
-    REAL, DIMENSION(klon, nbsrf), INTENT(OUT)       :: wfsnow     ! water balance (snow) at surface weighted by srf
     REAL, DIMENSION(klon, klev, nbsrf), INTENT(OUT) :: flux_t     ! sensible heat flux (CpT) J/m**2/s (W/m**2)
                                                                   ! positve orientation downwards
@@ -1233 +1230 @@
  snowerosion(:,:)=0. 
  fluxlat(:,:)=0.
- wfbils(:,:)=0. ; wfbilo(:,:)=0.
- wfevap(:,:)=0. ; wfrain(:,:)=0. ; wfsnow(:,:)=0.
+ wfbils(:,:)=0. ; wfevap(:,:)=0.
  flux_t(:,:,:)=0. ; flux_q(:,:,:)=0. ; flux_u(:,:,:)=0. ; flux_v(:,:,:)=0.
  flux_qbs(:,:,:)=0.
@@ -4031 +4027 @@
           wfbils(i,nsrf) = ( solsw(i,nsrf) + sollw(i,nsrf) &
                + flux_t(i,1,nsrf) + fluxlat(i,nsrf) ) * pctsrf(i,nsrf)
-          wfbilo(i,nsrf) = (evap(i,nsrf)-(rain_f(i)+snow_f(i)))*pctsrf(i,nsrf)
           wfevap(i,nsrf) = evap(i,nsrf)*pctsrf(i,nsrf)
-          wfrain(i,nsrf) = rain_f(i)*pctsrf(i,nsrf)
-          wfsnow(i,nsrf) = snow_f(i)*pctsrf(i,nsrf)
 
           zxtsol(i)    = zxtsol(i)    + ts(i,nsrf)      * pctsrf(i,nsrf)

LMDZ6/trunk/libf/phylmdiso/phys_local_var_mod.F90

@@ -455 +455 @@
       REAL,ALLOCATABLE,SAVE,DIMENSION(:) :: proba_notrig, random_notrig
 !$OMP THREADPRIVATE(proba_notrig, random_notrig)
-      REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: fsolsw, wfbils, wfbilo
-!$OMP THREADPRIVATE(fsolsw, wfbils, wfbilo)
-      REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: wfevap, wfrain, wfsnow
-!$OMP THREADPRIVATE(wfevap,wfrain,wfsnow)
+      REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: fsolsw, wfbils
+!$OMP THREADPRIVATE(fsolsw, wfbils)
+      REAL,ALLOCATABLE,SAVE,DIMENSION(:,:) :: wfevap
+!$OMP THREADPRIVATE(wfevap)
       REAL,ALLOCATABLE,SAVE,DIMENSION(:,:)  :: t2m, fluxlat, fsollw,evap_pot
 !$OMP THREADPRIVATE(t2m, fluxlat, fsollw,evap_pot)
@@ -990 +990 @@
       ALLOCATE(t2m(klon, nbsrf), fluxlat(klon, nbsrf))
       ALLOCATE(fsollw(klon, nbsrf))
-      ALLOCATE(fsolsw(klon, nbsrf), wfbils(klon, nbsrf), wfbilo(klon, nbsrf))
-      ALLOCATE(wfevap(klon, nbsrf), wfrain(klon,nbsrf), wfsnow(klon, nbsrf))
+      ALLOCATE(fsolsw(klon, nbsrf), wfbils(klon, nbsrf))
+      ALLOCATE(wfevap(klon, nbsrf))
       ALLOCATE(evap_pot(klon, nbsrf))
 ! FC
@@ -1361 +1361 @@
       DEALLOCATE(t2m, fluxlat)
       DEALLOCATE(fsollw, evap_pot)
-      DEALLOCATE(fsolsw, wfbils, wfbilo)
-      DEALLOCATE(wfevap,wfrain,wfsnow)
+      DEALLOCATE(fsolsw, wfbils)
+      DEALLOCATE(wfevap)
 
       DEALLOCATE(pmflxr, pmflxs)

LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90

@@ -354 +354 @@
        t2m, fluxlat,  &
        fsollw, evap_pot,  &
-       fsolsw, wfbils, wfbilo,  &
-       wfevap, wfrain, wfsnow,  &  
+       fsolsw, wfbils, wfevap,  &
        prfl, psfl,bsfl, fraca, Vprecip,  &
        zw2,  &
@@ -3076 +3075 @@
     !   frugs,     agesno,    fsollw,  fsolsw,
     !   d_ts,      fevap,     fluxlat, t2m,
-    !   wfbils,    wfbilo,    fluxt,   fluxu, fluxv,
+    !   wfbils,    fluxt,   fluxu, fluxv,
     !
     ! Certains ne sont pas utiliser du tout : 
@@ -3175 +3174 @@
             z0m, z0h,     agesno,    fsollw,  fsolsw, &
             d_ts,      fevap,     fluxlat, t2m, &
-            wfbils, wfbilo, wfevap, wfrain, wfsnow, & 
+            wfbils, wfevap, & 
             fluxt,   fluxu,  fluxv, &
             dsens,     devap,     zxsnow, &