Changeset 1641

Timestamp:

Jul 24, 2012, 4:16:30 PM (12 years ago)

Author:

jghattas

Message:

• Corrected bug while using parameter phys_out_filetimestep instead of ecrit_mth : cosp did not write at correct timestep. This correction also corrects timestep in histday_seri.nc file.

• Replaced use of lev_histmth by logical swaero_diag in sw_aeroAR4.f90. swaero_diag is true if at least one of following variables are defined in output file : topswad, topswai, solswad, solswai

Location:

LMDZ5/trunk/libf/phylmd

Files:

• phys_output_mod.F90 (modified) (4 diffs)
• physiq.F (modified) (1 diff)
• sw_aeroAR4.F90 (modified) (6 diffs)

LMDZ5/trunk/libf/phylmd/phys_output_mod.F90

@@ -33 +33 @@
   CHARACTER(len=20), dimension(nfiles), private, save   :: type_ecri
   !$OMP THREADPRIVATE(nhorim, nvertm, zoutm,zdtime,type_ecri)
+ ! swaero_diag : flag indicates if it is necessary to do calculation for some aerosol diagnostics
+  logical, save                                :: swaero_diag=.FALSE.
+
 
   !   integer, save                     :: nid_hf3d 
@@ -826 +829 @@
     DO iff=1,nfiles
 
+       ! Calculate ecrit_files for all files
+       if ( chtimestep(iff).eq.'DefFreq' ) then
+          ! Par defaut ecrit_files = (ecrit_mensuel ecrit_jour ecrit_hf ...)*86400.
+          ecrit_files(iff)=ecrit_files(iff)*86400.
+       else
+          call convers_timesteps(chtimestep(iff),dtime,ecrit_files(iff)) 
+       endif
+       write(lunout,*)'ecrit_files(',iff,')= ',ecrit_files(iff)
+
+       zoutm(iff) = ecrit_files(iff) ! Frequence ou l on ecrit en seconde
+
        IF (clef_files(iff)) THEN
-
-          if ( chtimestep(iff).eq.'DefFreq' ) then
-             ! Par defaut ecrit_files = (ecrit_mensuel ecrit_jour ecrit_hf ...)*86400.
-             ecrit_files(iff)=ecrit_files(iff)*86400.
-          else
-             call convers_timesteps(chtimestep(iff),dtime,ecrit_files(iff)) 
-          endif
-          write(lunout,*)'ecrit_files(',iff,')= ',ecrit_files(iff)
-
-          zoutm(iff) = ecrit_files(iff) ! Frequence ou l on ecrit en seconde
 
           idayref = day_ref
@@ -1775 +1779 @@
 
     ENDDO !  iff
+
+    ! Updated write frequencies due to phys_out_filetimesteps. 
+    ! Write frequencies are now in seconds.  
+    ecrit_mth = ecrit_files(1)
+    ecrit_day = ecrit_files(2)
+    ecrit_hf  = ecrit_files(3)
+    ecrit_ins = ecrit_files(4)
+    ecrit_LES = ecrit_files(5)
+    ecrit_ins = ecrit_files(6)
+
+    write(lunout,*)'swaero_diag=',swaero_diag
     write(lunout,*)'Fin phys_output_mod.F90'
   end subroutine phys_output_open
@@ -1823 +1838 @@
        endif
     endif
+
+    ! Set swaero_diag=true if at least one of the concerned variables are defined 
+    if (nomvar=='topswad' .OR. nomvar=='topswai' .OR. nomvar=='solswad' .OR. nomvar=='solswai' ) THEN
+       if  ( flag_var(iff)<=lev_files(iff) ) then
+          swaero_diag=.TRUE.
+       end if
+    end if
   end subroutine histdef2d
 

LMDZ5/trunk/libf/phylmd/physiq.F

@@ -1661 +1661 @@
 
 #endif
-
-
-         ecrit_hf = ecrit_hf * un_jour
-cIM
-         IF(ecrit_day.LE.1.) THEN
-          ecrit_day = ecrit_day * un_jour !en secondes
-         ENDIF
-cIM
-         ecrit_mth = ecrit_mth * un_jour
-         ecrit_ins = ecrit_ins * un_jour
          ecrit_reg = ecrit_reg * un_jour
          ecrit_tra = ecrit_tra * un_jour
-         ecrit_LES = ecrit_LES * un_jour
-c
-
+       
 cXXXPB Positionner date0 pour initialisation de ORCHIDEE
       date0 = jD_ref 

LMDZ5/trunk/libf/phylmd/sw_aeroAR4.F90

@@ -21 +21 @@
 
   USE dimphy
-
+  USE phys_output_mod, ONLY : swaero_diag
   IMPLICIT NONE
 
@@ -242 +242 @@
 
 ! clear sky is either computed IF no direct effect is asked for, or for extended diag) 
-     IF (( lev_histmth .ge. 4 ) .or. ( .not. ok_ade )) THEN    
+     IF (swaero_diag .or. .not. ok_ade ) THEN    
 
      ! clear-sky: zero aerosol effect
@@ -271 +271 @@
 
 ! cloudy sky is either computed IF no indirect effect is asked for, or for extended diag) 
-     IF (( lev_histmth .ge. 4 ) .or. ( .not. ok_aie )) THEN    
+     IF (swaero_diag .or. .not. ok_aie ) THEN    
      ! cloudy-sky: zero aerosol effect
      flag_aer=0.0
@@ -330 +330 @@
 
 ! cloudy sky is either computed IF no indirect effect is asked for, or for extended diag) 
-        IF (( lev_histmth .ge. 2 ) .or. (.not. ok_aie)) THEN  
+        IF (swaero_diag .or. .not. ok_aie) THEN  
         ! cloudy-sky aerosol direct effect of total aerosol
         flag_aer=1.0
@@ -359 +359 @@
 
 ! natural aeroosl clear sky is  computed  for extended diag) 
-        IF ( lev_histmth .ge. 4 ) THEN            
+        IF ( swaero_diag ) THEN            
         ! clear sky direct effect natural aerosol
         flag_aer=1.0
@@ -388 +388 @@
 
 ! cloud sky natural is for extended diagnostics
-        IF ( lev_histmth .ge. 2 ) THEN
+        IF ( swaero_diag ) THEN
         ! cloudy-sky direct effect natural aerosol
         flag_aer=1.0