Changeset 2529

Timestamp:

May 30, 2016, 10:46:40 PM (9 years ago)

Author:

oboucher

Message:

Reviewing the way swaero_diag is computed to correct an old bug that
makes topswad and co diagnostics wrong for the first timestep...
And introducing swaero_diag in rrtm/recmwf_aero so that double and
triple radiation calls when diagnostics are not needed to save time

Location:

LMDZ5/trunk/libf/phylmd

Files:

• iophy.F90 (modified) (1 diff)
• phys_output_var_mod.F90 (modified) (1 diff)
• physiq_mod.F90 (modified) (1 diff)
• rrtm/recmwf_aero.F90 (modified) (6 diffs)

LMDZ5/trunk/libf/phylmd/iophy.F90

@@ -633 +633 @@
     ENDIF
 
-    ! Set swaero_diag=true if at least one of the concerned variables are defined 
-    IF (var%name=='topswad' .OR. var%name=='topswai' .OR. var%name=='solswad' .OR. var%name=='solswai' ) THEN
+    ! Set swaero_diag=true if at least one of the concerned variables are
+    ! defined
+    !--OB 30/05/2016 use wider set of variables
+    IF ( var%name=='topswad' .OR. var%name=='topswad0' .OR. var%name=='solswad' .OR. var%name=='solswad0' .OR. &
+         var%name=='topswai' .OR. var%name=='solswai'  .OR. ( iflag_rrtm==1 .AND. (                            &
+         var%name=='toplwad' .OR. var%name=='toplwad0' .OR. var%name=='sollwad' .OR. var%name=='sollwad0' .OR. &
+         var%name=='toplwai' .OR. var%name=='sollwai'  ) ) ) THEN
        IF  ( var%flag(iff)<=lev_files(iff) ) THEN
           swaero_diag=.TRUE.

LMDZ5/trunk/libf/phylmd/phys_output_var_mod.F90

@@ -47 +47 @@
 
   ! swaero_diag : flag indicates if it is necessary to do calculation for some aerosol diagnostics
-  LOGICAL, SAVE                                :: swaero_diag=.FALSE.
+  !--OB: this needs to be set to TRUE by default and changed back to FALSE after first radiation call
+  !--    and corrected back to TRUE based on output requests
+  LOGICAL, SAVE                                :: swaero_diag=.TRUE.
   !$OMP THREADPRIVATE(swaero_diag)
 

LMDZ5/trunk/libf/phylmd/physiq_mod.F90

@@ -3513 +3513 @@
                ZSWFT0_i, ZFSDN0, ZFSUP0)
 
+          !--OB 30/05/2016
+          !--here we return swaero_diag to FALSE
+          !--and histdef will switch it back to TRUE if necessary
+          !--this is necessary to get the right swaero at first step
+          IF (debut) swaero_diag = .FALSE.
           !
           !IM 2eme calcul radiatif pour le cas perturbe ou au moins un

LMDZ5/trunk/libf/phylmd/rrtm/recmwf_aero.F90

@@ -161 +161 @@
 IMPLICIT NONE
 INCLUDE "clesphys.h"
-
 
 INTEGER(KIND=JPIM),INTENT(IN)    :: KPROMA 
@@ -306 +305 @@
 ! not ok_ade and not ok_aie = 1 to proceed
 ! therefore the cases have the following corresponding switches
-! 1 = not ok_ade or not ok_aie
-! 2 = ok_aie
-! 3 = ok_ade
+! 1 = not ok_ade and not ok_aie OR not ok_ade and ok_aie and swaero_diag OR ok_ade and not ok_aie and swaero_diag
+! 2 = not ok_ade and ok_aie OR ok_aie and ok_ade and swaero_diag
+! 3 = ok_ade and not ok_aie OR ok_aie and ok_ade and swaero_diag
 ! 4 = ok_ade and ok_aie
 ! 5 = no aerosol feedback wanted or no aerosol at all 
@@ -445 +444 @@
 IF (flag_aerosol .GT. 0 .OR. flag_aerosol_strat) THEN
 
-IF ( .not. ok_ade .or. .not. ok_aie ) THEN
+!--Case 1
+IF ( ( .not. ok_ade .AND. .not. ok_aie ) .OR.             & 
+   & ( .not. ok_ade .AND. ok_aie .AND. swaero_diag ) .OR. & 
+   & ( ok_ade .AND. .not. ok_aie .AND. swaero_diag ) ) THEN
 
 ! natural aerosols for direct and indirect effect 
@@ -483 +485 @@
 ENDIF 
 
-IF (ok_aie) THEN
+!--Case 2
+IF ( ( .not. ok_ade .AND. ok_aie ) .OR. & 
+   & ( ok_ade .AND. ok_aie .AND. swaero_diag ) ) THEN
 
 ! natural aerosols for direct indirect effect 
@@ -521 +525 @@
 ENDIF ! ok_aie      
 
-IF (ok_ade) THEN
+!--Case 3
+IF ( ( ok_ade .AND. .not. ok_aie ) .OR. &
+   & ( ok_ade .AND. ok_aie .AND. swaero_diag ) ) THEN
 
 ! direct effect of total aerosol activated
@@ -559 +565 @@
 ENDIF !-end ok_ade
 
+!--Case 4
 IF (ok_ade .and. ok_aie) THEN