Changeset 646

Timestamp:

May 31, 2005, 12:33:46 PM (19 years ago)

Author:

lmdzadmin

Message:

Nouvelles sorties pour INCA_AER. AC
MAF

Location:

LMDZ4/trunk/libf/phylmd

Files:

• ini_histrac.h (modified) (7 diffs)
• write_histrac.h (modified) (3 diffs)

LMDZ4/trunk/libf/phylmd/ini_histrac.h

@@ -83 +83 @@
 
 ! MS info
-! Ajout Anne
 #ifdef INCA_AER
          CALL histdef(nid_tra, "airm", "Air mass", "kg",
@@ -89 +88 @@
      .                "ave(X)", zsto,zout)
 #endif
-! Fin ajout Anne
-
 #ifdef INCA
 #ifdef INCAINFO
@@ -160 +157 @@
      .      "ave(X)", zsto,zout)
 
+        CALL histdef(nid_tra2, "TOTAERH2O", "Total aerosol water",
+     .      "kg/m2", iim,jjm+1,nhori, klev,1,klev, nvert, 32,
+     .      "ave(X)", zsto,zout)
 #endif
 #endif
@@ -174 +174 @@
      .           "ave(X)", zsto,zout)
 #ifdef INCA_AER
+
+         CALL histdef(nid_tra2, "Dry_"//solsym(it), "Dry_"//solsym(it),
+     .           "kg/m2/s", iim,jjm+1,nhori, 1,1,1, -99, 32,
+     .           "ave(X)", zsto,zout)
+          
         IF  ((it .ge. trmx) .and. (it .le. trnx)) then
           CALL histdef(nid_tra2, "Sed_"//solsym(it), "Sed_"//solsym(it),
      .      "kg/m2/s", iim,jjm+1,nhori, 1,1,1, -99, 32,
      .      "ave(X)", zsto,zout)
-          CALL histdef(nid_tra2, "Dry_"//solsym(it), "Dry_"//solsym(it),
-     .      "kg/m2/s", iim,jjm+1,nhori, 1,1,1, -99, 32,
-     .      "ave(X)", zsto,zout)
           CALL histdef(nid_tra2, "Wet_"//solsym(it), "Wet_"//solsym(it),
      .      "kg/m2/s", iim,jjm+1,nhori, 1,1,1, -99, 32,
@@ -200 +202 @@
      .      "ave(X)", zsto,zout)
           do la=1,las
-           CALL histdef(nid_tra2, "OD_"//cla(la)//solsym(it), 
-     .                            "OD_"//cla(la)//solsym(it),
+            CALL histdef(nid_tra2, "OD"//cla(la)//"_"//solsym(it), "OD"//cla(la)//"_"//solsym(it),
      .        "opt. depth", iim,jjm+1,nhori, 1,1,1, -99, 32,
      .        "ave(X)", zsto,zout)
+
+            CALL histdef(nid_tra2, "OD3D"//cla(la)//"_"//solsym(it), "OD3d_"//cla(la)//"_"//solsym(it),
+     .        "opt. depth 3D", iim,jjm+1,nhori, klev,1,klev, nvert, 32,
+     .        "ave(X)", zsto,zout)
           enddo
+
+          CALL histdef(nid_tra2, "CLOAD_"//solsym(it), "3D LOAD_"//solsym(it),
+     .      "kg/m2 resp. #/m2", iim,jjm+1,nhori, klev,1,klev, nvert, 32,
+     .      "ave(X)", zsto,zout)
+
           CALL histdef(nid_tra2, "MD_"//solsym(it), "MD_"//solsym(it),
-     .      "median diameter", iim,jjm+1,nhori, klev,1,klev, nvert, 32,
-     .      "ave(X)", zsto,zout)
-          CALL histdef(nid_tra3, "Inst_Load_"//solsym(it), 
-     .                          "Inst_Load_"//solsym(it),
+     .      "median diameter [m]", iim,jjm+1,nhori, klev,1,klev, nvert, 32,
+     .      "ave(X)", zsto,zout)
+
+          CALL histdef(nid_tra2, "MDW_"//solsym(it), "MDW_"//solsym(it),
+     .      "wet median diameter [m]", iim,jjm+1,nhori, klev,1,klev, nvert, 32,
+     .      "ave(X)", zsto,zout)
+
+
+
+          CALL histdef(nid_tra3, "Inst_Load_"//solsym(it), "Inst_Load_"//solsym(it),
      .      "kg/m2", iim,jjm+1,nhori, 1,1,1, -99, 32,
      .      "inst(X)", zout,zout)
+
         endif
+
 #endif
          CALL histdef(nid_tra, solsym(it), solsym(it), "VMR",
@@ -248 +266 @@
 
 #ifdef INCA
-!#ifdef INCA_CH4
          CALL histdef(nid_tra, "O3_column", "O3_column",
      .           "DU", iim,jjm+1,nhori, 1,1,1, -99, 32,
@@ -279 +296 @@
 !    .                "t_sum(X)", zsto,zout)
 
-!#ENDIF
+
 
 !! Ajout Anne

LMDZ4/trunk/libf/phylmd/write_histrac.h

@@ -58 +58 @@
      .                                   iim*(jjm+1)*klev,ndex)
 #endif
+
 ! Fin ajout Anne
 
@@ -148 +149 @@
        CALL histwrite(nid_tra2,"AngstroemComp",itau_w,zx_tmp_2d,
      .                     iim*(jjm+1),ndex2d)
+
+       CALL gr_fi_ecrit(klev,klon,iim,jjm+1,totaerh2o(1,1), zx_tmp_3d)
+       CALL histwrite(nid_tra2,"TOTAERH2O",itau_w,zx_tmp_3d, 
+     .                     iim*(jjm+1)*klev,ndex3d)
 
 #endif
@@ -164 +169 @@
      .     iim*(jjm+1),ndex2d)
 #ifdef INCA_AER
-      call diag(airephy,tr_seri)
+      call diag(airephy,tr_seri,.false.)
+
+      CALL gr_fi_ecrit(1, klon,iim,jjm+1,dflux(1,it),zx_tmp_2d)
+      CALL histwrite(nid_tra2,"Dry_"//solsym(it),itau_w,zx_tmp_2d,iim*(jjm+1),ndex2d)
 
       IF  ((it .ge. trmx) .and. (it .le. trnx)) then
         CALL gr_fi_ecrit(1, klon,iim,jjm+1,sflux(1,it),zx_tmp_2d)
-        CALL histwrite(nid_tra2,"Sed_"//solsym(it),itau_w,
-     .         zx_tmp_2d,iim*(jjm+1),ndex2d)
-
-        CALL gr_fi_ecrit(1, klon,iim,jjm+1,dflux(1,it),zx_tmp_2d)
-        CALL histwrite(nid_tra2,"Dry_"//solsym(it),itau_w,zx_tmp_2d,
-     .                 iim*(jjm+1),ndex2d)
+        CALL histwrite(nid_tra2,"Sed_"//solsym(it),itau_w,zx_tmp_2d,iim*(jjm+1),ndex2d)
+        
         CALL gr_fi_ecrit(1, klon,iim,jjm+1,wflux(1,it),zx_tmp_2d)
-        CALL histwrite(nid_tra2,"Wet_"//solsym(it),itau_w,zx_tmp_2d,
-     .               iim*(jjm+1),ndex2d)
+        CALL histwrite(nid_tra2,"Wet_"//solsym(it),itau_w,zx_tmp_2d,iim*(jjm+1),ndex2d)
         CALL gr_fi_ecrit(1, klon,iim,jjm+1,wsflux(1,it),zx_tmp_2d)
-        CALL histwrite(nid_tra2,"WetST_"//solsym(it),itau_w,zx_tmp_2d,
-     .            iim*(jjm+1),ndex2d)
+        CALL histwrite(nid_tra2,"WetST_"//solsym(it),itau_w,zx_tmp_2d,iim*(jjm+1),ndex2d)
         CALL gr_fi_ecrit(1, klon,iim,jjm+1,wcflux(1,it),zx_tmp_2d)
-        CALL histwrite(nid_tra2,"WetCV_"//solsym(it),itau_w,zx_tmp_2d,
-     .         iim*(jjm+1),ndex2d)
-
+        CALL histwrite(nid_tra2,"WetCV_"//solsym(it),itau_w,zx_tmp_2d,iim*(jjm+1),ndex2d)
+        
         CALL gr_fi_ecrit(klev, klon,iim,jjm+1,eflux_alt(1,1,it),zx_tmp_3d)
-        CALL histwrite(nid_tra2,"Emi_alt_"//solsym(it),itau_w,zx_tmp_3d,
-     .              iim*(jjm+1)*klev,ndex3d)
-
+        CALL histwrite(nid_tra2,"Emi_alt_"//solsym(it),itau_w,zx_tmp_3d,iim*(jjm+1)*klev,ndex3d)
+        
         CALL gr_fi_ecrit(1, klon,iim,jjm+1,aload(1,it),zx_tmp_2d)
-        CALL histwrite(nid_tra2,"Load_"//solsym(it),itau_w,zx_tmp_2d,
-     .              iim*(jjm+1),ndex2d)
-        CALL histwrite(nid_tra3,"Inst_Load_"//solsym(it),itau_w,zx_tmp_2d,
-     .             iim*(jjm+1),ndex2d)
+        CALL histwrite(nid_tra2,"Load_"//solsym(it),itau_w,zx_tmp_2d,iim*(jjm+1),ndex2d)
+        CALL histwrite(nid_tra3,"Inst_Load_"//solsym(it),itau_w,zx_tmp_2d,iim*(jjm+1),ndex2d)
 
         CALL gr_fi_ecrit(1, klon,iim,jjm+1,sconc(1,it),zx_tmp_2d)
-        CALL histwrite(nid_tra2,"SConc_"//solsym(it),itau_w,zx_tmp_2d,
-     .           iim*(jjm+1),ndex2d)
+        CALL histwrite(nid_tra2,"SConc_"//solsym(it),itau_w,zx_tmp_2d,iim*(jjm+1),ndex2d)
 
         do la=1,las
           CALL gr_fi_ecrit(1, klon,iim,jjm+1,tausum(1,la,it),zx_tmp_2d)
-          CALL histwrite(nid_tra2,"OD_"//cla(la)//solsym(it),itau_w,zx_tmp_2d,
-     .                    iim*(jjm+1),ndex2d)
+          CALL histwrite(nid_tra2,"OD"//cla(la)//"_"//solsym(it),itau_w,zx_tmp_2d,iim*(jjm+1),ndex2d)
+          CALL gr_fi_ecrit(klev, klon,iim,jjm+1,tau(1,1,la,it),zx_tmp_3d)
+          CALL histwrite(nid_tra2,"OD3D"//cla(la)//"_"//solsym(it),itau_w,zx_tmp_3d,iim*(jjm+1)*klev,ndex3d)
         enddo
 
         CALL gr_fi_ecrit(klev, klon,iim,jjm+1,md(1,1,it),zx_tmp_3d)
-        CALL histwrite(nid_tra2,"MD_"//solsym(it),itau_w,zx_tmp_3d,
-     .              iim*(jjm+1)*klev,ndex3d)
+        CALL histwrite(nid_tra2,"MD_"//solsym(it),itau_w,zx_tmp_3d,iim*(jjm+1)*klev,ndex3d)
+
+        CALL gr_fi_ecrit(klev, klon,iim,jjm+1,mdw(1,1,it),zx_tmp_3d)
+        CALL histwrite(nid_tra2,"MDW_"//solsym(it),itau_w,zx_tmp_3d,iim*(jjm+1)*klev,ndex3d)
+
+        CALL gr_fi_ecrit(klev, klon,iim,jjm+1,cload(1,1,it),zx_tmp_3d)
+        CALL histwrite(nid_tra2,"CLOAD_"//solsym(it),itau_w,zx_tmp_3d,iim*(jjm+1)*klev,ndex3d)
+
 
       endif
+
+
 #endif
 C champs 3D