Changeset 3117 for LMDZ6/trunk/libf

Timestamp:

Dec 8, 2017, 2:04:01 PM (7 years ago)

Author:

musat

Message:

Back to the 3111 svn for the moment..
Keep 2corrections in CMIP6_ping_atmos.xml
IM

Location:

LMDZ6/trunk/libf/phylmd

Files:

• newmicro.F90 (modified) (4 diffs)
• phys_local_var_mod.F90 (modified) (7 diffs)
• phys_output_ctrlout_mod.F90 (modified) (1 diff)
• phys_output_write_mod.F90 (modified) (5 diffs)
• physiq_mod.F90 (modified) (3 diffs)
• radlwsw_m.F90 (modified) (1 diff)

LMDZ6/trunk/libf/phylmd/newmicro.F90

@@ -10 +10 @@
   USE dimphy
   USE phys_local_var_mod, ONLY: scdnc, cldncl, reffclwtop, lcc, reffclws, &
-    reffclwc, cldnvi, lcc3d, lcc3dcon, lcc3dstra, icc3dcon, icc3dstra, zfice
+    reffclwc, cldnvi, lcc3d, lcc3dcon, lcc3dstra
   USE phys_state_var_mod, ONLY: rnebcon, clwcon
   USE icefrac_lsc_mod ! computes ice fraction (JBM 3/14)
@@ -152 +152 @@
   REAL zrho(klon, klev) !--rho pour la couche
   REAL dh(klon, klev) !--dz pour la couche
+  REAL zfice(klon, klev)
   REAL rad_chaud(klon, klev) !--rayon pour les nuages chauds
   REAL rad_chaud_pi(klon, klev) !--rayon pour les nuages chauds pre-industriels
@@ -585 +586 @@
         lcc3dstra(i, k) = lcc3dstra(i, k) - lcc3dcon(i, k) ! eau liquide stratiforme
         lcc3dstra(i, k) = max(lcc3dstra(i,k), 0.0)
-        !
-        icc3dcon(i, k) = rnebcon(i, k)*(1-phase3d(i, k))*clwcon(i, k) ! glace
-                                                                      ! convective
-        icc3dstra(i, k) = pclc(i, k)*pqlwp(i, k)*(1-phase3d(i, k))
-        icc3dstra(i, k) = icc3dstra(i, k) - icc3dcon(i, k) ! glace stratiforme
-        icc3dstra(i, k) = max( icc3dstra(i, k), 0.0) 
-        !
         ! Compute cloud droplet radius as above in meter
         radius = 1.1*((pqlwp(i,k)*pplay(i,k)/(rd*t(i,k)))/(4./3*rpi*1000.* &
@@ -632 +626 @@
         IF (lcc3dcon(i,k)<=0.0) lcc3dcon(i, k) = 0.0
         IF (lcc3dstra(i,k)<=0.0) lcc3dstra(i, k) = 0.0
-        IF (icc3dcon(i,k)<=0.0) icc3dcon(i, k) = 0.0
-        IF (icc3dstra(i,k)<=0.0) icc3dstra(i, k) = 0.0 
       END DO
       IF (reffclwtop(i)<=0.0) reffclwtop(i) = 0.0

LMDZ6/trunk/libf/phylmd/phys_local_var_mod.F90

@@ -140 +140 @@
       REAL, SAVE, ALLOCATABLE :: ZFSDN0(:,:),  ZFSUP0(:,:)      ! diag
       !$OMP THREADPRIVATE(ZFSDN0,ZFSUP0)
-      REAL, SAVE, ALLOCATABLE :: PSFSWDIR(:,:), PSFSWDIF(:,:)
-      !$OMP THREADPRIVATE(PSFSWDIR, PSFSWDIF)
 !
       REAL, SAVE, ALLOCATABLE :: stratomask(:,:) 
@@ -171 +169 @@
       REAL, SAVE, ALLOCATABLE :: lcc3dstra(:,:)
       !$OMP THREADPRIVATE(lcc3dstra)
-      REAL, SAVE, ALLOCATABLE :: icc3dstra(:,:)
-      !$OMP THREADPRIVATE(icc3dstra)
-      REAL, SAVE, ALLOCATABLE :: icc3dcon(:,:)
-      !$OMP THREADPRIVATE(icc3dcon)
-      REAL, SAVE, ALLOCATABLE :: zfice(:,:)
-      !$OMP THREADPRIVATE(zfice)
       REAL, SAVE, ALLOCATABLE :: od443aer(:) 
       !$OMP THREADPRIVATE(od443aer) 
@@ -524 +516 @@
 USE phys_state_var_mod
 
-      IMPLICIT NONE
-      include "clesphys.h"
+IMPLICIT NONE
       ALLOCATE(t_seri(klon,klev),q_seri(klon,klev),ql_seri(klon,klev),qs_seri(klon,klev))
       ALLOCATE(u_seri(klon,klev),v_seri(klon,klev))
@@ -573 +564 @@
       ALLOCATE(ZLWFT0_i(klon,klev+1),ZSWFT0_i(klon,klev+1),ZFLDN0(klon,klev+1))
       ALLOCATE(ZFLUP0(klon,klev+1),ZFSDN0(klon,klev+1),ZFSUP0(klon,klev+1))
-      ALLOCATE(PSFSWDIR(klon,NSW), PSFSWDIF(klon,NSW))
 !
       ALLOCATE(topswad_aero(klon), solswad_aero(klon))
@@ -603 +593 @@
       ALLOCATE(lcc3dcon(klon, klev))
       ALLOCATE(lcc3dstra(klon, klev))
-      ALLOCATE(icc3dcon(klon, klev))
-      ALLOCATE(icc3dstra(klon, klev))
-      ALLOCATE(zfice(klon, klev))
       ALLOCATE(od443aer(klon))
       ALLOCATE(od550aer(klon))
@@ -858 +845 @@
       DEALLOCATE(d_u_lif,d_v_lif)
       DEALLOCATE(d_ts, d_tr)
-      DEALLOCATE(ZLWFT0_i,ZSWFT0_i,ZFLDN0)
-      DEALLOCATE(ZFLUP0,ZFSDN0,ZFSUP0)
-      DEALLOCATE(PSFSWDIR, PSFSWDIF)
       DEALLOCATE(topswad_aero,solswad_aero)
       DEALLOCATE(topswai_aero,solswai_aero)
@@ -884 +868 @@
       DEALLOCATE(lcc3dcon)
       DEALLOCATE(lcc3dstra)
-      DEALLOCATE(icc3dcon)
-      DEALLOCATE(icc3dstra)
-      DEALLOCATE(zfice)
       DEALLOCATE(od443aer)
       DEALLOCATE(od550aer)

LMDZ6/trunk/libf/phylmd/phys_output_ctrlout_mod.F90

@@ -1447 +1447 @@
   TYPE(ctrl_out), SAVE :: o_lcc3dstra = ctrl_out((/ 2,  6, 10, 10, 10, 10, 11, 11, 11, 11/), &
     'lcc3dstra', 'Stratiform cloud liquid fraction', '1', (/ ('', i=1, 10) /))
-  TYPE(ctrl_out), SAVE :: o_icc3dcon = ctrl_out((/ 2,  6, 10, 10, 10, 10, 11, 11, 11, 11/), &
-    'icc3dcon', 'Mass Fraction of Convective Cloud Ice', &
-    'kg kg-1', (/ ('', i=1, 10) /))
-  TYPE(ctrl_out), SAVE :: o_icc3dstra = ctrl_out((/ 2,  6, 10, 10, 10, 10, 11, 11, 11, 11/), &
-    'icc3dstra', 'Mass Fraction of Stratiform Cloud Ice', &
-    'kg kg-1', (/ ('', i=1, 10) /))
-  TYPE(ctrl_out), SAVE :: o_cldicemxrat = ctrl_out((/ 2,  6, 10, 10, 10, 10, 11, 11, 11, 11/), &
-    'cldicemxrat', 'Cloud Ice Mixing Ratio', &
-    '1', (/ ('', i=1, 10) /))
-  TYPE(ctrl_out), SAVE :: o_cldwatmxrat = ctrl_out((/ 2,  6, 10, 10, 10, 10, 11, 11, 11, 11/), &
-    'cldwatmxrat', 'Cloud Water Mixing Ratio', &
-    '1', (/ ('', i=1, 10) /))
   TYPE(ctrl_out), SAVE :: o_solbnd = ctrl_out((/ 2,  6, 10, 10, 10, 10, 11, 11, 11, 11/), &
     'solbnd', 'Top-of-Atmosphere Solar Insolation for each band', 'W m-2', (/ ('', i=1, 10) /))
-  TYPE(ctrl_out), SAVE :: o_rsdsdiff = ctrl_out((/ 2,  6, 10, 10, 10, 10, 11, 11, 11, 11/), &
-    'rsdsdiff', 'Surface Diffuse Downwelling Shortwave Radiation', 'W m-2', (/ ('', i=1, 10) /))
-  TYPE(ctrl_out), SAVE :: o_rsdscsdiff = ctrl_out((/ 2,  6, 10, 10, 10, 10, 11, 11, 11, 11/), &
-    'rsdscsdiff', 'Surface Diffuse Downwelling Clear Sky Shortwave Radiation', 'W m-2', (/ ('', i=1, 10) /))
   TYPE(ctrl_out), SAVE :: o_stratomask = ctrl_out((/ 2,  6, 10, 10, 10, 10, 11, 11, 11, 11/), &
     'stratomask', 'Stratospheric fraction', '1', (/ ('', i=1, 10) /))

LMDZ6/trunk/libf/phylmd/phys_output_write_mod.F90

@@ -120 +120 @@
          o_swtoacf_zero, o_swsrfcf_zero, &
          o_topswai, o_solswai, o_toplwai, o_sollwai, o_scdnc, &
-         o_cldncl, o_reffclws, o_reffclwc, o_solbnd, &
-         o_rsdsdiff, o_rsdscsdiff, o_stratomask,&
+         o_cldncl, o_reffclws, o_reffclwc, o_solbnd, o_stratomask,&
          o_cldnvi, o_lcc, o_lcc3d, o_lcc3dcon, &
-         o_lcc3dstra, o_icc3dcon, o_icc3dstra, &
-         o_cldicemxrat, o_cldwatmxrat, o_reffclwtop, o_ec550aer, &
+         o_lcc3dstra, o_reffclwtop, o_ec550aer, &
          o_lwcon, o_iwcon, o_temp, o_theta, &
          o_ovapinit, o_ovap, o_oliq, o_ocond, o_geop, &
@@ -279 +277 @@
          toplwad_aero, toplwad0_aero, sollwad_aero, &
          sollwad0_aero, toplwai_aero, sollwai_aero, &
-         scdnc, cldncl, reffclws, reffclwc, cldnvi, &
-         PSFSWDIR, PSFSWDIF, stratomask,&
-         lcc, lcc3d, lcc3dcon, lcc3dstra, icc3dcon, icc3dstra, &
-         zfice, reffclwtop, &
+         scdnc, cldncl, reffclws, reffclwc, cldnvi, stratomask,&
+         lcc, lcc3d, lcc3dcon, lcc3dstra, reffclwtop, &
          ec550aer, flwc, fiwc, t_seri, theta, q_seri, &
          ql_seri, qs_seri, tr_seri, &
@@ -1410 +1406 @@
           CALL histwrite_phy(o_lcc3dcon, lcc3dcon)
           CALL histwrite_phy(o_lcc3dstra, lcc3dstra)
-          CALL histwrite_phy(o_icc3dcon, icc3dcon)
-          CALL histwrite_phy(o_icc3dstra, icc3dstra)
-          CALL histwrite_phy(o_cldicemxrat, zfice)
-          zx_tmp_fi3d(:,:)=1-zfice(:,:)
-          CALL histwrite_phy(o_cldwatmxrat, zx_tmp_fi3d)
           CALL histwrite_phy(o_reffclwtop, reffclwtop)
        ENDIF
@@ -1441 +1432 @@
 #ifdef CPP_RRTM
       IF (iflag_rrtm.EQ.1) THEN
-
        IF (vars_defined) THEN
         DO ISW=1, NSW
@@ -1448 +1438 @@
         CALL histwrite_phy(o_solbnd, zx_tmp_fi3dsp)
        ENDIF
-
-       IF (vars_defined) THEN
-        CALL histwrite_phy(o_rsdscsdiff, PSFSWDIR)
-       ENDIF
-
-       IF (vars_defined) THEN
-        CALL histwrite_phy(o_rsdsdiff, PSFSWDIF)
-       ENDIF
-
       ENDIF
 #endif

LMDZ6/trunk/libf/phylmd/physiq_mod.F90

@@ -80 +80 @@
        ZLWFT0_i,ZSWFT0_i,ZFLDN0,  &
        ZFLUP0,ZFSDN0,ZFSUP0,      &
-       PSFSWDIR, PSFSWDIF, &
        !
        topswad_aero,solswad_aero,   &
@@ -3793 +3792 @@
                                 !-end
                ZLWFT0_i, ZFLDN0, ZFLUP0, &
-               ZSWFT0_i, ZFSDN0, ZFSUP0, &
-               PSFSWDIR, PSFSWDIF)
+               ZSWFT0_i, ZFSDN0, ZFSUP0)
 
           !lwoff=y, betalwoff=1. : offset LW CRE for radiation code and other
@@ -3878 +3876 @@
                                 !-end
                      ZLWFT0_i, ZFLDN0, ZFLUP0, &
-                     ZSWFT0_i, ZFSDN0, ZFSUP0, &
-                     PSFSWDIR, PSFSWDIF)
+                     ZSWFT0_i, ZFSDN0, ZFSUP0)
           endif !ok_4xCO2atm
        ENDIF ! aerosol_couple

LMDZ6/trunk/libf/phylmd/radlwsw_m.F90

@@ -42 +42 @@
 !-end
    ZLWFT0_i, ZFLDN0, ZFLUP0,&
-   ZSWFT0_i, ZFSDN0, ZFSUP0,&
-   PSFSWDIR, PSFSWDIF)
+   ZSWFT0_i, ZFSDN0, ZFSUP0)