Changeset 2823 for LMDZ5/trunk/libf/phylmd/phys_local_var_mod.F90

Timestamp:

Mar 14, 2017, 11:10:55 PM (7 years ago)

Author:

oboucher

Message:

Climatological ASNO3M, CSNO3M, CINO3M aerosol fields can be read and fed
through the aerosol routines for optical properties. The get_aero_fromfile
routine needed some change so that it doesn't stop if a particular field
is not there.

File:

• LMDZ5/trunk/libf/phylmd/phys_local_var_mod.F90 (modified) (4 diffs)

LMDZ5/trunk/libf/phylmd/phys_local_var_mod.F90

@@ -209 +209 @@
       REAL, SAVE, ALLOCATABLE :: loaddust(:) 
       !$OMP THREADPRIVATE(loaddust) 
+      REAL, SAVE, ALLOCATABLE :: loadno3(:) 
+      !$OMP THREADPRIVATE(loadno3) 
       REAL, SAVE, ALLOCATABLE :: load_tmp1(:) 
       !$OMP THREADPRIVATE(load_tmp1) 
@@ -215 +217 @@
       REAL, SAVE, ALLOCATABLE :: load_tmp3(:) 
       !$OMP THREADPRIVATE(load_tmp3) 
-      REAL, SAVE, ALLOCATABLE :: load_tmp4(:) 
-      !$OMP THREADPRIVATE(load_tmp4) 
-      REAL, SAVE, ALLOCATABLE :: load_tmp5(:) 
-      !$OMP THREADPRIVATE(load_tmp5) 
-      REAL, SAVE, ALLOCATABLE :: load_tmp6(:) 
-      !$OMP THREADPRIVATE(load_tmp6) 
-      REAL, SAVE, ALLOCATABLE :: load_tmp7(:) 
-      !$OMP THREADPRIVATE(load_tmp7) 
 
 !IM ajout variables CFMIP2/CMIP5
@@ -605 +599 @@
       allocate(loadss(klon))
       allocate(loaddust(klon))
+      allocate(loadno3(klon))
       allocate(load_tmp1(klon))
       allocate(load_tmp2(klon))
       allocate(load_tmp3(klon))
-      allocate(load_tmp4(klon))
-      allocate(load_tmp5(klon))
-      allocate(load_tmp6(klon))
-      allocate(load_tmp7(klon))
 
 !IM ajout variables CFMIP2/CMIP5
@@ -866 +857 @@
       deallocate(loadss) 
       deallocate(loaddust) 
+      deallocate(loadno3) 
       deallocate(load_tmp1)
       deallocate(load_tmp2)
       deallocate(load_tmp3)
-      deallocate(load_tmp4)
-      deallocate(load_tmp5)
-      deallocate(load_tmp6)
-      deallocate(load_tmp7)
       deallocate(du_gwd_hines,dv_gwd_hines,d_t_hin)
       deallocate(d_q_ch4)