Changeset 1724

Timestamp:

Feb 7, 2013, 3:56:38 PM (11 years ago)

Author:

musat

Message:

Ajout coefficient beta (=Evap/Evap? potentielle) fonction de la latitude
et de la saison (voir these AbdulKhadre? Traore).

Frederic Hourdin
IM

Location:

LMDZ5/trunk/libf/phylmd

Files:

• calbeta_clim.F90 (added)
• conf_phys_m.F90 (modified) (6 diffs)
• evappot.F90 (added)
• phys_output_mod.F90 (modified) (2 diffs)
• phys_output_write.h (modified) (1 diff)
• physiq.F (modified) (3 diffs)
• surf_land_bucket_mod.F90 (modified) (2 diffs)
• surface_data.F90 (modified) (1 diff)

LMDZ5/trunk/libf/phylmd/conf_phys_m.F90

@@ -1 @@
-
 !
 ! $Id: conf_phys.F90 1668 2012-10-12 10:47:37Z idelkadi $
@@ -80 +79 @@
 
   character (len = 6),SAVE  :: type_ocean_omp, version_ocean_omp, ocean_omp
+  character (len = 10),SAVE  :: type_veget_omp
   CHARACTER(len = 8),SAVE   :: aer_type_omp
-  logical,SAVE              :: ok_veget_omp, ok_newmicro_omp
+  logical,SAVE              :: ok_newmicro_omp
   logical,SAVE        :: ok_journe_omp, ok_mensuel_omp, ok_instan_omp, ok_hf_omp        
   logical,SAVE        :: ok_LES_omp   
@@ -217 +217 @@
 !Config Help = Type de modele de vegetation utilise
 !
-  ok_veget_omp = .false.
-  call getin('VEGET', ok_veget_omp)
+  type_veget_omp ='orchidee'
+  call getin('VEGET', type_veget_omp)
 !
 !Config Key  = OK_journe
@@ -289 +289 @@
   aerosol_couple_omp = .false.
   CALL getin('aerosol_couple',aerosol_couple_omp)
-
 !
 !Config Key  = flag_aerosol
@@ -1675 +1674 @@
     type_ocean = type_ocean_omp
     version_ocean = version_ocean_omp
-    ok_veget = ok_veget_omp
+
+    ok_veget=.true.
+    type_veget=type_veget_omp
+    if (type_veget=='n' .or. type_veget=='bucket' .or. type_veget=='betaclim' ) &
+         & then
+         ok_veget=.false.
+    endif
+
     ok_newmicro = ok_newmicro_omp
     ok_journe = ok_journe_omp
@@ -1796 +1802 @@
   write(lunout,*)' Type ocean = ', type_ocean
   write(lunout,*)' Version ocean = ', version_ocean
-  write(lunout,*)' Config veget = ', ok_veget
+  write(lunout,*)' Config veget = ', ok_veget,type_veget
   write(lunout,*)' Sortie journaliere = ', ok_journe
   write(lunout,*)' Sortie haute frequence = ', ok_hf

LMDZ5/trunk/libf/phylmd/phys_output_mod.F90

@@ -189 +189 @@
        ctrl_out((/ 1, 6, 10, 10, 10, 10 /),'tsol_oce'), &
        ctrl_out((/ 1, 6, 10, 10, 10, 10 /),'tsol_sic') /)
+
+  type(ctrl_out),save,dimension(4) :: o_evappot_srf     = (/ ctrl_out((/ 1, 6, 10, 10, 10, 10 /),'evappot_ter'), &
+       ctrl_out((/ 4, 6, 10, 10, 10, 10 /),'evappot_lic'), &
+       ctrl_out((/ 4, 6, 10, 10, 10, 10 /),'evappot_oce'), &
+       ctrl_out((/ 4, 6, 10, 10, 10, 10 /),'evappot_sic') /)
 
   type(ctrl_out),save,dimension(4) :: o_sens_srf     = (/ ctrl_out((/ 1, 6, 10, 7, 10, 10 /),'sens_ter'), &
@@ -1042 +1047 @@
                   o_tsol_srf(nsrf)%flag,o_tsol_srf(nsrf)%name,"Temperature "//clnsurf(nsrf),"K")
              CALL histdef2d(iff,clef_stations(iff), &
+                  o_evappot_srf(nsrf)%flag,o_evappot_srf(nsrf)%name,"Temperature "//clnsurf(nsrf),"K")
+             CALL histdef2d(iff,clef_stations(iff), &
                   o_ustar_srf(nsrf)%flag,o_ustar_srf(nsrf)%name,"Friction velocity "//clnsurf(nsrf),"m/s")
              CALL histdef2d(iff,clef_stations(iff), &

LMDZ5/trunk/libf/phylmd/phys_output_write.h

@@ -440 +440 @@
         CALL histwrite_phy(nid_files(iff),clef_stations(iff),
      $                   o_tsol_srf(nsrf)%name,itau_w,
+     $      zx_tmp_fi2d)
+        ENDIF
+
+        IF (o_evappot_srf(nsrf)%flag(iff)<=lev_files(iff)) THEN
+        zx_tmp_fi2d(1 : klon) = evap_pot( 1 : klon, nsrf)
+        CALL histwrite_phy(nid_files(iff),clef_stations(iff),
+     $                   o_evappot_srf(nsrf)%name,itau_w,
      $      zx_tmp_fi2d)
         ENDIF

LMDZ5/trunk/libf/phylmd/physiq.F

@@ -285 +285 @@
       REAL flwp_s(klon), fiwp_s(klon)
       REAL flwc_s(klon,klev), fiwc_s(klon,klev)
+
+      REAL evap_pot(klon,nbsrf)
 
 cIM ISCCP simulator v3.4
@@ -1998 +2000 @@
 c
 
+c Calcul de l'humidite de saturation au niveau du sol
+
+
+
       if (iflag_pbl/=0) then
 
@@ -2036 +2042 @@
         call writefield_phy('q_seri',q_seri,llm)
       endif
+
+         CALL evappot(klon,nbsrf,ftsol,pplay(:,1),cdragh,
+     e      t_seri(:,1),q_seri(:,1),u_seri(:,1),v_seri(:,1),evap_pot)
 
 

LMDZ5/trunk/libf/phylmd/surf_land_bucket_mod.F90

@@ -24 +24 @@
     USE cpl_mod
     USE dimphy
+    USE comgeomphy
     USE mod_grid_phy_lmdz
     USE mod_phys_lmdz_para
@@ -97 +98 @@
 ! calculate constants
     CALL calbeta(dtime, is_ter, knon, snow, qsol, beta, capsol, dif_grnd)
+    if (type_veget=='betaclim') then
+       CALL calbeta_clim(knon,jour,rlatd(knindex(:)),beta)
+    endif
+
        
 ! calculate temperature, heat capacity and conduction flux in soil

LMDZ5/trunk/libf/phylmd/surface_data.F90

@@ -9 +9 @@
   
   LOGICAL, SAVE          :: ok_veget      ! true for use of vegetation model ORCHIDEE
+  CHARACTER(len=10), SAVE :: type_veget    ! orchidee/y/bucket/n/betaclim
   !$OMP THREADPRIVATE(ok_veget)