Changeset 2536 for LMDZ5/trunk

Timestamp:

Jun 3, 2016, 3:04:40 PM (9 years ago)

Author:

oboucher

Message:

Introducing stratomask diagnostic on where the stratosphere is
flag_aerosol_strat = 2 for CMIP6 strat aerosol forcing

Location:

LMDZ5/trunk/libf/phylmd

Files:

• phys_local_var_mod.F90 (modified) (3 diffs)
• phys_output_ctrlout_mod.F90 (modified) (2 diffs)
• phys_output_write_mod.F90 (modified) (3 diffs)
• physiq_mod.F90 (modified) (2 diffs)
• rrtm/readaerosolstrato1_rrtm.F90 (added)
• rrtm/readaerosolstrato2_rrtm.F90 (added)
• stratosphere_mask.F90 (modified) (4 diffs)

LMDZ5/trunk/libf/phylmd/phys_local_var_mod.F90

@@ -137 +137 @@
       !$OMP THREADPRIVATE(ZFSDN0,ZFSUP0)
 !
+      REAL, SAVE, ALLOCATABLE :: stratomask(:,:) 
+      !$OMP THREADPRIVATE(stratomask) 
       REAL, SAVE, ALLOCATABLE :: tausum_aero(:,:,:) 
       !$OMP THREADPRIVATE(tausum_aero) 
@@ -463 +465 @@
 !      allocate(tausum_aero(klon,nwave,naero_spc))
 !      allocate(tau3d_aero(klon,klev,nwave,naero_spc)) 
+      allocate(stratomask(klon,klev))
 !--correction mini bug OB
       allocate(tausum_aero(klon,nwave,naero_tot))
@@ -670 +673 @@
       deallocate(topsw0_aero,solsw0_aero)
       deallocate(topswcf_aero,solswcf_aero)
+      deallocate(stratomask) 
       deallocate(tausum_aero) 
       deallocate(tau3d_aero) 

LMDZ5/trunk/libf/phylmd/phys_output_ctrlout_mod.F90

@@ -850 +850 @@
        ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /),'OD550_'//name_aero_tau(14),       &
        "Aerosol Optical depth at 550 nm "//name_aero_tau(14),"14", (/ ('', i=1, 9) /)) /)
-  
-
-
 !
   TYPE(ctrl_out), SAVE :: o_tausumaero_lw = ctrl_out((/ 2, 6, 10, 10, 10, 10, 11, 11, 11 /), &
@@ -1032 +1029 @@
   TYPE(ctrl_out), SAVE :: o_lcc3dstra = ctrl_out((/ 2,  6, 10, 10, 10, 10, 11, 11, 11 /), &
     'lcc3dstra', 'Stratiform cloud liquid fraction', '1', (/ ('', i=1, 9) /))
+  TYPE(ctrl_out), SAVE :: o_stratomask = ctrl_out((/ 2,  6, 10, 10, 10, 10, 11, 11, 11 /), &
+    'stratomask', 'Stratospheric fraction', '1', (/ ('', i=1, 9) /))
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 

LMDZ5/trunk/libf/phylmd/phys_output_write_mod.F90

@@ -112 +112 @@
          o_swtoacf_zero, o_swsrfcf_zero, &
          o_topswai, o_solswai, o_scdnc, &
-         o_cldncl, o_reffclws, o_reffclwc, &
+         o_cldncl, o_reffclws, o_reffclwc, o_stratomask,&
          o_cldnvi, o_lcc, o_lcc3d, o_lcc3dcon, &
          o_lcc3dstra, o_reffclwtop, o_ec550aer, &
@@ -230 +230 @@
          toplwad_aero, toplwad0_aero, sollwad_aero, &
          sollwad0_aero, toplwai_aero, sollwai_aero, &
-         scdnc, cldncl, reffclws, reffclwc, cldnvi, &
+         scdnc, cldncl, reffclws, reffclwc, cldnvi, stratomask,&
          lcc, lcc3d, lcc3dcon, lcc3dstra, reffclwtop, &
          ec550aer, flwc, fiwc, t_seri, theta, q_seri, &
@@ -1037 +1037 @@
        CALL histwrite_phy(o_zfull,zphi/RG)
 
+       CALL histwrite_phy(o_stratomask, stratomask)
+
        IF (vars_defined)  THEN
         zx_tmp_fi3d(:,1)= pphis(:)/RG

LMDZ5/trunk/libf/phylmd/physiq_mod.F90

@@ -3079 +3079 @@
              CALL readaerosolstrato(debut)
            ELSE
-             abort_message='flag_aerosol_strat must equal 1 for rrtm=0' 
+             abort_message='flag_aerosol_strat must equal 1 for rrtm=0'
              call abort_physic(modname,abort_message,1)
            ENDIF
           ELSE
 #ifdef CPP_RRTM
-             CALL readaerosolstrato_rrtm(debut)
+            IF (flag_aerosol_strat.EQ.1) THEN
+             CALL readaerosolstrato1_rrtm(debut)
+            ELSEIF (flag_aerosol_strat.EQ.2) THEN
+             CALL stratosphere_mask(t_seri, pplay, latitude_deg)
+             CALL readaerosolstrato2_rrtm(debut)
+            ELSE
+             abort_message='flag_aerosol_strat must equal 1 or 2 for rrtm=1'
+             call abort_physic(modname,abort_message,1)
+            ENDIF
 #else
              abort_message='You should compile with -rrtm if running ' &
@@ -3093 +3101 @@
        ENDIF
        !--fin STRAT AEROSOL
-
 
        !   On prend la somme des fractions nuageuses et des contenus en eau

LMDZ5/trunk/libf/phylmd/stratosphere_mask.F90

@@ -1 @@
-SUBROUTINE stratosphere_mask(t_seri, pplay, xlat, is_strato)
+SUBROUTINE stratosphere_mask(t_seri, pplay, xlat)
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -27 +27 @@
 
 USE dimphy
-!!USE phys_local_var_mod, ONLY: p_tropopause
+USE phys_local_var_mod, ONLY: stratomask
 
 IMPLICIT NONE
@@ -34 +34 @@
 REAL,DIMENSION(klon,klev),INTENT(IN)   :: pplay   ! pression pour le mileu de chaque couche (en Pa)
 REAL,DIMENSION(klon),INTENT(IN)        :: xlat    ! latitudes pour chaque point 
-
-LOGICAL,DIMENSION(klon,klev),INTENT(OUT) :: is_strato
 
 REAL, PARAMETER                        :: plimu=45000.
@@ -84 +82 @@
 DO k=1, klev
   IF (pplay(i,k).LT.tp(i)) THEN
-    is_strato(i,k)=.TRUE.
+    stratomask(i,k)=1.0
   ELSE
-    is_strato(i,k)=.FALSE.
+    stratomask(i,k)=0.0
   ENDIF
 ENDDO