Changeset 1266 for LMDZ4/branches/LMDZ4-dev/libf/phylmd/phys_output_mod.F90

Timestamp:

Nov 20, 2009, 5:27:40 PM (15 years ago)

Author:

Laurent Fairhead

Message:

Correction d'un bug dans aeropt_5wv.F90 : une variable était utilisée sans
être calculée
Ajout de tests sur l'écriture de variables dans les fichiers de sortie
Changement des arguments d'appels à INCA
ACo

File:

• LMDZ4/branches/LMDZ4-dev/libf/phylmd/phys_output_mod.F90 (modified) (5 diffs)

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

@@ -486 +486 @@
        ctetaSTD,dtime, ok_veget, &
        type_ocean, iflag_pbl,ok_mensuel,ok_journe, &
-       ok_hf,ok_instan,ok_LES,ok_ade,ok_aie, read_climoz)
+       ok_hf,ok_instan,ok_LES,ok_ade,ok_aie, read_climoz, &
+       new_aod, aerosol_couple)   
+
 
   USE iophy 
@@ -507 +509 @@
   logical                               :: ok_mensuel, ok_journe, ok_hf, ok_instan
   logical                               :: ok_LES,ok_ade,ok_aie
-
+  logical                               :: new_aod, aerosol_couple
   integer, intent(in)::  read_climoz ! read ozone climatology
   !     Allowed values are 0, 1 and 2
@@ -833 +835 @@
  CALL histdef2d(iff,o_rugs_srf(nsrf)%flag,o_rugs_srf(nsrf)%name,"Latent heat flux "//clnsurf(nsrf),"W/m2")
  CALL histdef2d(iff,o_ages_srf(nsrf)%flag,o_ages_srf(nsrf)%name,"Snow age", "day")
-     END DO
-
-     DO naero = 1, naero_spc
-CALL histdef2d(iff,o_tausumaero(naero)%flag,o_tausumaero(naero)%name,"Aerosol Optical depth at 550 nm "//name_aero(naero),"1")
-     END DO
+END DO
+
+IF (new_aod .AND. (.NOT. aerosol_couple)) THEN
+  DO naero = 1, naero_spc
+  CALL histdef2d(iff,o_tausumaero(naero)%flag,o_tausumaero(naero)%name,"Aerosol Optical depth at 550 nm "//name_aero(naero),"1")
+  END DO
+ENDIF
 
  IF (ok_ade) THEN
@@ -853 +857 @@
  CALL histdef2d(iff,o_swsrfcs_ant%flag,o_swsrfcs_ant%name, "Anthropogenic aerosol radiative forcing clear-sky at SRF", "W/m2")
 
+ IF (.NOT. aerosol_couple) THEN 
  CALL histdef2d(iff,o_swtoacf_nat%flag,o_swtoacf_nat%name, "Natural aerosol impact on cloud radiative forcing at TOA", "W/m2")
  CALL histdef2d(iff,o_swsrfcf_nat%flag,o_swsrfcf_nat%name, "Natural aerosol impact on cloud radiative forcing  at SRF", "W/m2")
@@ -859 +864 @@
  CALL histdef2d(iff,o_swtoacf_zero%flag,o_swtoacf_zero%name, "Cloud radiative forcing (allsky-clearsky fluxes) at TOA", "W/m2")
  CALL histdef2d(iff,o_swsrfcf_zero%flag,o_swsrfcf_zero%name, "Cloud radiative forcing (allsky-clearsky fluxes) at SRF", "W/m2")
+ ENDIF
 
  ENDIF