Changeset 1095 for LMDZ4/branches/LMDZ4-dev

Timestamp:

Feb 13, 2009, 10:52:29 AM (16 years ago)

Author:

jghattas

Message:

Ajoute des variables de sorties, necessaires à l'evaluation du code radiatif, qui avaient disparu avec la reecriture.
Anne C/ Abderrahmane I

Location:

LMDZ4/branches/LMDZ4-dev/libf/phylmd

Files:

• phys_output_mod.F90 (modified) (4 diffs)
• phys_output_write.h (modified) (1 diff)
• physiq.F (modified) (1 diff)

LMDZ4/branches/LMDZ4-dev/libf/phylmd/phys_output_mod.F90

@@ -318 +318 @@
   type(ctrl_out) :: o_rugs         = ctrl_out((/ 10, 10, 10, 1, 1 /),'rugs')
 
+  type(ctrl_out) :: o_topswad      = ctrl_out((/ 4, 10, 10, 10, 10 /),'topswad')
+  type(ctrl_out) :: o_topswai      = ctrl_out((/ 4, 10, 10, 10, 10 /),'topswai')
+  type(ctrl_out) :: o_solswad      = ctrl_out((/ 4, 10, 10, 10, 10 /),'solswad')
+  type(ctrl_out) :: o_solswai      = ctrl_out((/ 4, 10, 10, 10, 10 /),'solswai')
 !!!!!!!!!!!!!!!!!!!!!! 3D !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 
   type(ctrl_out) :: o_lwcon        = ctrl_out((/ 2, 5, 10, 10, 1 /),'lwcon')
@@ -429 +433 @@
                               ctetaSTD,dtime, presnivs, ok_veget, &
                               ocean, iflag_pbl,ok_mensuel,ok_journe, &
-                              ok_hf,ok_instan,ok_LES)   
+                              ok_hf,ok_instan,ok_LES,ok_ade,ok_aie)   
 
   USE iophy 
@@ -447 +451 @@
   integer                               :: nbteta, nlevSTD, radpas
   logical                               :: ok_mensuel, ok_journe, ok_hf, ok_instan
-  logical                               :: ok_LES
+  logical                               :: ok_LES,ok_ade,ok_aie
   real                                  :: dtime
   integer                               :: idayref
@@ -677 +681 @@
      END DO
 
+ IF (ok_ade) THEN
+  CALL histdef2d(iff,o_topswad%flag,o_topswad%name, "ADE at TOA", "W/m2")
+  CALL histdef2d(iff,o_solswad%flag,o_solswad%name, "ADE at SRF", "W/m2")
+ ENDIF
+
+ IF (ok_aie) THEN
+  CALL histdef2d(iff,o_topswai%flag,o_topswai%name, "AIE at TOA", "W/m2")
+  CALL histdef2d(iff,o_solswai%flag,o_solswai%name, "AIE at SFR", "W/m2")
+ ENDIF
+
+
  CALL histdef2d(iff,o_albs%flag,o_albs%name, "Surface albedo", "-")
  CALL histdef2d(iff,o_albslw%flag,o_albslw%name, "Surface albedo LW", "-")

LMDZ4/branches/LMDZ4-dev/libf/phylmd/phys_output_write.h

@@ -802 +802 @@
        IF (o_rugs%flag(iff)<=lev_files(iff)) THEN
       CALL histwrite_phy(nid_files(iff),o_rugs%name,itau_w,zxrugs)
+       ENDIF
+
+       IF (ok_ade) THEN
+        IF (o_topswad%flag(iff)<=lev_files(iff)) THEN
+      CALL histwrite_phy(nid_files(iff),o_topswad%name,itau_w,topswad)
+        ENDIF
+        IF (o_solswad%flag(iff)<=lev_files(iff)) THEN
+      CALL histwrite_phy(nid_files(iff),o_solswad%name,itau_w,solswad)
+        ENDIF
+       ENDIF
+
+       IF (ok_aie) THEN
+        IF (o_topswai%flag(iff)<=lev_files(iff)) THEN
+      CALL histwrite_phy(nid_files(iff),o_topswai%name,itau_w,topswai)
+        ENDIF
+        IF (o_solswai%flag(iff)<=lev_files(iff)) THEN
+      CALL histwrite_phy(nid_files(iff),o_solswai%name,itau_w,solswai)
+        ENDIF
        ENDIF
 

LMDZ4/branches/LMDZ4-dev/libf/phylmd/physiq.F

@@ -1532 +1532 @@
      &                        ctetaSTD,dtime,presnivs,ok_veget,
      &                        type_ocean,iflag_pbl,ok_mensuel,ok_journe,
-     &                        ok_hf,ok_instan,ok_LES)
+     &                        ok_hf,ok_instan,ok_LES,ok_ade,ok_aie)
 c$OMP END MASTER
 c$OMP BARRIER