Changeset 395 for LMDZ.3.3/branches/rel-LF

Timestamp:

Jul 19, 2002, 11:59:46 AM (22 years ago)

Author:

lmdzadmin

Message:

Changement dans les sorties histoires (rain devient precip pour eviter toute
confusion) + unites, commentaires des fichiers histoire
LF

Location:

LMDZ.3.3/branches/rel-LF/libf/phylmd

Files:

• conf_phys.F90 (modified) (4 diffs)
• physiq.F (modified) (19 diffs)

LMDZ.3.3/branches/rel-LF/libf/phylmd/conf_phys.F90

@@ -5 +5 @@
   subroutine conf_phys(ocean, ok_veget, ok_journe, ok_mensuel, ok_instan, &
  &                     fact_cldcon, facttemps,ok_newmicro,iflag_cldcon, &
- &                     ratqsbas,ratqshaut)
+ &                     ratqsbas,ratqshaut,if_ebil)
 
    use IOIPSL
@@ -34 +34 @@
   logical              :: ok_journe, ok_mensuel, ok_instan
   real                 :: fact_cldcon, facttemps,ratqsbas,ratqshaut
-  integer              :: iflag_cldcon
+  integer              :: iflag_cldcon, if_ebil
 ! Local
   integer              :: numout = 6
@@ -85 +85 @@
   ok_instan = .false.
   call getin('OK_instan', ok_instan)
+!
+!Config Key  = if_ebil
+!Config Desc = Niveau de sortie pour les diags bilan d'energie 
+!Config Def  = 0
+!Config Help = 
+!               
+!
+  if_ebil = 0
+  call getin('if_ebil', if_ebil)
 !!
 !! KE
@@ -282 +291 @@
   write(numout,*)' Sortie mensuelle = ', ok_mensuel
   write(numout,*)' Sortie instantanee = ', ok_instan
+  write(numout,*)' Sortie bilan d''energie, if_ebil =', if_ebil
   write(numout,*)' epmax = ', epmax
   write(numout,*)' ok_adj_ema = ', ok_adj_ema

LMDZ.3.3/branches/rel-LF/libf/phylmd/physiq.F

@@ -645 +645 @@
 c======================================================================
       modname = 'physiq'
-      if_ebil = 2
       IF (if_ebil.ge.1) THEN
         DO i=1,klon
@@ -675 +674 @@
          call conf_phys(ocean, ok_veget, ok_journe, ok_mensuel,
      .                  ok_instan, fact_cldcon, facttemps,ok_newmicro,
-     .                  iflag_cldcon,ratqsbas,ratqshaut)
+     .                  iflag_cldcon,ratqsbas,ratqshaut, if_ebil)
 
          DO k = 2, nvm          ! pas de vegetation
@@ -881 +880 @@
      .                "ave(X)", zsto,zout)
 c
-         CALL histdef(nid_day, "rain","Precipitation Totale liq+sol"
+         CALL histdef(nid_day, "precip","Precipitation Totale liq+sol"
      .                , "kg/s",
      .                iim,jjmp1,nhori, 1,1,1, -99, 32, 
@@ -890 +889 @@
      .                "ave(X)", zsto,zout)
 c
-         CALL histdef(nid_day, "snow_cov", "Snow cover", "mm",
+         CALL histdef(nid_day, "snow_mass", "Snow Mass", "kg/m2",
      .                iim,jjmp1,nhori, 1,1,1, -99, 32, 
      .                "ave(X)", zsto,zout)
@@ -1095 +1094 @@
      .                "ave(X)", zsto,zout)
 c
-         CALL histdef(nid_mth, "rain", "Precipitation Totale liq+sol", 
+         CALL histdef(nid_mth, "precip", "Precipitation Totale liq+sol", 
      .                "kg/s",
      .                iim,jjmp1,nhori, 1,1,1, -99, 32, 
@@ -1112 +1111 @@
      .                "ave(X)", zsto,zout)
 c
-         CALL histdef(nid_mth, "snow_cov", "Snow cover", "mm",
+         CALL histdef(nid_mth, "snow_mass", "Snow Mass", "kg/m2",
      .                iim,jjmp1,nhori, 1,1,1, -99, 32, 
      .                "ave(X)", zsto,zout)
@@ -1336 +1335 @@
 c
          CALL histdef(nid_mth, "rhum", "Relative humidity", "-",
+     .                iim,jjmp1,nhori, klev,1,klev,nvert, 32,
+     .                "ave(X)", zsto,zout)
+c
+         CALL histdef(nid_mth, "clwcon", "Cloud Liquid water content"
+     .                , "kg/kg",
      .                iim,jjmp1,nhori, klev,1,klev,nvert, 32,
      .                "ave(X)", zsto,zout)
@@ -1562 +1566 @@
      .                "inst(X)", zsto,zout)
 c
-         CALL histdef(nid_ins, "rain", "Precipitation Totale liq+sol", 
+         CALL histdef(nid_ins, "precip", "Precipitation Totale liq+sol", 
      .                "kg/s",
      .                iim,jjmp1,nhori, 1,1,1, -99, 32, 
@@ -1571 +1575 @@
      .                "inst(X)", zsto,zout)
 c
-         CALL histdef(nid_ins, "snow_cov", "Snow cover", "mm",
+         CALL histdef(nid_ins, "snow_mass", "Snow Mass", "kg/m2",
      .                iim,jjmp1,nhori, 1,1,1, -99, 32, 
      .                "inst(X)", zsto,zout)
@@ -1901 +1905 @@
       DO nsrf = 1, nbsrf
       DO i = 1, klon
-c$$$         frugs(i,nsrf) = MAX(frugs(i,nsrf),0.001
-        frugs(i,nsrf) = MAX(frugs(i,nsrf),0.000015)
+         frugs(i,nsrf) = MAX(frugs(i,nsrf),0.001)
+cccc        frugs(i,nsrf) = MAX(frugs(i,nsrf),0.000015)
       ENDDO
       ENDDO
@@ -2110 +2114 @@
      .        ,bbase,dtvpdt1,dtvpdq1,dplcldt,dplcldr
      .        ,clwcon0)
-c          print*,'Apres conema3 '
+          print*,'Apres conema3 '
 
 c Calculer l'humidite relative pour diagnostique
@@ -2770 +2774 @@
       ENDDO
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d,zx_tmp_2d)
-      CALL histwrite(nid_day,"rain",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_day,"precip",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c     call writephy(fid_day,prof2d_av,'rain',zx_tmp_fi2d,
 c    .              'Precipitation','mm/day')
@@ -2782 +2786 @@
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, zxsnow,zx_tmp_2d)
-      CALL histwrite(nid_day,"snow_cov",itau_w,zx_tmp_2d,iim*jjmp1,
+      CALL histwrite(nid_day,"snow_mass",itau_w,zx_tmp_2d,iim*jjmp1,
      .               ndex2d)
-c     call writephy(fid_day,prof2d_av,'snow_cov',zxsnow,
+c     call writephy(fid_day,prof2d_av,'snow_mass',zxsnow,
 c    .              'Snow cover','mm')
 c
@@ -3025 +3029 @@
       ENDDO
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d,zx_tmp_2d)
-      CALL histwrite(nid_mth,"rain",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_mth,"precip",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       DO i = 1, klon
@@ -3043 +3047 @@
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, zxsnow,zx_tmp_2d)
-      CALL histwrite(nid_mth,"snow_cov",itau_w,zx_tmp_2d,iim*jjmp1,
+      CALL histwrite(nid_mth,"snow_mass",itau_w,zx_tmp_2d,iim*jjmp1,
      .               ndex2d)
 c
@@ -3251 +3255 @@
      .                                   iim*jjmp1*klev,ndex3d)
 c
+      CALL gr_fi_ecrit(klev,klon,iim,jjmp1, clwcon0, zx_tmp_3d)
+      CALL histwrite(nid_mth,"clwcon",itau_w,zx_tmp_3d,
+     .                                   iim*jjmp1*klev,ndex3d)
+c
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, d_t_dyn, zx_tmp_3d)
       CALL histwrite(nid_mth,"dtdyn",itau_w,zx_tmp_3d,
@@ -3291 +3299 @@
      .                                   iim*jjmp1*klev,ndex3d)
 c
+      zpt_conv = 0.
+      where (ptconv) zpt_conv = 1.
       CALL gr_fi_ecrit(klev,klon,iim,jjmp1, zpt_conv, zx_tmp_3d)
       CALL histwrite(nid_mth,"ptconv",itau_w,zx_tmp_3d,
@@ -3426 +3436 @@
       ENDDO
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, zx_tmp_fi2d,zx_tmp_2d)
-      CALL histwrite(nid_ins,"rain",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
+      CALL histwrite(nid_ins,"precip",itau_w,zx_tmp_2d,iim*jjmp1,ndex2d)
 c
       DO i = 1, klon
@@ -3542 +3552 @@
 c
       CALL gr_fi_ecrit(1, klon,iim,jjmp1, zxsnow,zx_tmp_2d)
-      CALL histwrite(nid_ins,"snow_cov",itau_w,zx_tmp_2d,iim*jjmp1,
+      CALL histwrite(nid_ins,"snow_mass",itau_w,zx_tmp_2d,iim*jjmp1,
      .               ndex2d)
 c