Changeset 2366 for LMDZ5/trunk/libf/phylmd/phys_state_var_mod.F90

Timestamp:

Sep 21, 2015, 10:41:04 PM (9 years ago)

Author:

oboucher

Message:

Second batch of changes for diagnosing SW radiative
diagnostics at the physics timestep resolution
radsol is now computed in physiq.F90

File:

• LMDZ5/trunk/libf/phylmd/phys_state_var_mod.F90 (modified) (9 diffs)

LMDZ5/trunk/libf/phylmd/phys_state_var_mod.F90

@@ -48 +48 @@
       REAL, ALLOCATABLE, SAVE :: radsol(:)
 !$OMP THREADPRIVATE(radsol)
+      REAL, ALLOCATABLE, SAVE :: swradcorr(:)
+!$OMP THREADPRIVATE(swradcorr)
 
 !clesphy0 param physiq
@@ -97 +99 @@
 !$OMP THREADPRIVATE(clwcon0th,rnebcon0th)
 ! radiation outputs
-      REAL,ALLOCATABLE,SAVE :: zswdn0(:,:), zswdn(:,:)
-!$OMP THREADPRIVATE(zswdn0,zswdn)
-      REAL,ALLOCATABLE,SAVE :: zswup0(:,:), zswup(:,:)
-!$OMP THREADPRIVATE(zswup0,zswup)
       REAL,ALLOCATABLE,SAVE :: swdn0(:,:), swdn(:,:)
 !$OMP THREADPRIVATE(swdn0,swdn)
@@ -344 +342 @@
       REAL,ALLOCATABLE,SAVE :: lwup0p(:,:), lwupp(:,:)
 !$OMP THREADPRIVATE(lwdn0p, lwdnp, lwup0p, lwupp)
-      REAL,ALLOCATABLE,SAVE :: zswdn0p(:,:), zswdnp(:,:)
-      REAL,ALLOCATABLE,SAVE :: zswup0p(:,:), zswupp(:,:)
-!$OMP THREADPRIVATE(zswdn0p, zswdnp, zswup0p, zswupp)
       REAL,ALLOCATABLE,SAVE :: swdn0p(:,:), swdnp(:,:)
       REAL,ALLOCATABLE,SAVE :: swup0p(:,:), swupp(:,:)
@@ -440 +435 @@
       ALLOCATE(solsw(klon), sollw(klon))
       ALLOCATE(radsol(klon))
+      ALLOCATE(swradcorr(klon))
       ALLOCATE(zmea(klon), zstd(klon), zsig(klon), zgam(klon))
       ALLOCATE(zthe(klon), zpic(klon), zval(klon))
@@ -465 +461 @@
       ALLOCATE(clwcon0th(klon,klev),rnebcon0th(klon,klev))
 ! radiation outputs
-      ALLOCATE(zswdn0(klon,klevp1), zswdn(klon,klevp1))
-      ALLOCATE(zswup0(klon,klevp1), zswup(klon,klevp1))
       ALLOCATE(swdn0(klon,klevp1), swdn(klon,klevp1))
       ALLOCATE(swup0(klon,klevp1), swup(klon,klevp1))
@@ -566 +560 @@
       ALLOCATE(lwdn0p(klon,klevp1), lwdnp(klon,klevp1))
       ALLOCATE(lwup0p(klon,klevp1), lwupp(klon,klevp1))
-      ALLOCATE(zswdn0p(klon,klevp1), zswdnp(klon,klevp1))
-      ALLOCATE(zswup0p(klon,klevp1), zswupp(klon,klevp1))
       ALLOCATE(swdn0p(klon,klevp1), swdnp(klon,klevp1))
       ALLOCATE(swup0p(klon,klevp1), swupp(klon,klevp1))
@@ -605 +597 @@
       deallocate(rlat, rlon, pctsrf, ftsol, falb1, falb2)
       deallocate(qsol,fevap,z0m,z0h,agesno)
-      deallocate(rain_fall, snow_fall, solsw, sollw, radsol)
+      deallocate(rain_fall, snow_fall, solsw, sollw, radsol, swradcorr)
       deallocate(zmea, zstd, zsig, zgam)
       deallocate(zthe, zpic, zval)
@@ -622 +614 @@
       deallocate(clwcon0th, rnebcon0th)
 ! radiation outputs
-      deallocate(zswdn0, zswdn)
-      deallocate(zswup0, zswup)
       deallocate(swdn0, swdn)
       deallocate(swup0, swup)
@@ -700 +690 @@
       deallocate(lwdn0p, lwdnp)
       deallocate(lwup0p, lwupp)
-      deallocate(zswdn0p, zswdnp)
-      deallocate(zswup0p, zswupp)
       deallocate(swdn0p, swdnp)
       deallocate(swup0p, swupp)