Changeset 1270 for LMDZ4/branches/LMDZ4-dev/libf/phylmd/readaerosol_interp.F90

Timestamp:

Nov 25, 2009, 3:02:45 PM (15 years ago)

Author:

Laurent Fairhead

Message:

Les nouvelles routines de lecture des aerosols posent probleme en multiproc. On revient aux routines
precedentes en incluant le traitement du calendrier realiste.

File:

• LMDZ4/branches/LMDZ4-dev/libf/phylmd/readaerosol_interp.F90 (modified) (9 diffs)

LMDZ4/branches/LMDZ4-dev/libf/phylmd/readaerosol_interp.F90

@@ -79 +79 @@
 
   REAL, DIMENSION(:,:,:), POINTER   :: pt_tmp      ! Pointer allocated in readaerosol
-  REAL, DIMENSION(:,:), POINTER     :: pt_tmp_surf ! Pointer allocated in readaerosol
-  REAL, DIMENSION(:,:), POINTER     :: pt_tmp_load ! Pointer allocated in readaerosol
-  REAL, DIMENSION(:,:), POINTER     :: pt_tmp_pi_surf ! Pointer allocated in readaerosol
-  REAL, DIMENSION(:,:), POINTER     :: pt_tmp_pi_load ! Pointer allocated in readaerosol
   REAL, POINTER, DIMENSION(:), SAVE :: pt_ap, pt_b ! Pointer for describing the vertical levels 
 !$OMP THREADPRIVATE(pt_ap, pt_b)
   INTEGER, SAVE                     :: nbr_tsteps ! number of time steps in file read
   REAL, DIMENSION(14), SAVE         :: month_len, month_start, month_mid
-!$OMP THREADPRIVATE(month_len, month_start, month_mid)
+!$OMP THREADPRIVATE(nbr_tsteps, month_len, month_start, month_mid)
   REAL                              :: jDay
 
-!$OMP THREADPRIVATE(nbr_tsteps)
   LOGICAL            :: lnewday      ! Indicates if first time step at a new day
   LOGICAL            :: OLDNEWDAY
@@ -110 +105 @@
 
   ! Use phys_cal_mod
-! iday= day_cur
-! iyr = year_cur
-! im  = mth_cur
+  !iday= day_cur
+  !iyr = year_cur
+  !im  = mth_cur
 
   iday = INT(r_day)
@@ -153 +148 @@
      IF (ierr /= 0) CALL abort_gcm('readaerosol_interp', 'pb in allocation 2',1)
 
-!     ALLOCATE( psurf_year(klon, 12, naero_spc), pi_psurf_year(klon, 12, naero_spc), stat=ierr)
-!     IF (ierr /= 0) CALL abort_gcm('readaerosol_interp', 'pb in allocation 3',1)
-!
-!     ALLOCATE( load_year(klon, 12, naero_spc), pi_load_year(klon, 12, naero_spc), stat=ierr)
-!     IF (ierr /= 0) CALL abort_gcm('readaerosol_interp', 'pb in allocation 4',1)
+     ALLOCATE( psurf_year(klon, 12, naero_spc), pi_psurf_year(klon, 12, naero_spc), stat=ierr)
+     IF (ierr /= 0) CALL abort_gcm('readaerosol_interp', 'pb in allocation 3',1)
+
+     ALLOCATE( load_year(klon, 12, naero_spc), pi_load_year(klon, 12, naero_spc), stat=ierr)
+     IF (ierr /= 0) CALL abort_gcm('readaerosol_interp', 'pb in allocation 4',1)
 
      lnewday=.TRUE.
@@ -172 +167 @@
   IF ( (first .OR. iday==0) .AND. lnewday ) THEN 
      NULLIFY(pt_tmp)
-     NULLIFY(pt_tmp_surf)
-     NULLIFY(pt_tmp_pi_surf)
-     NULLIFY(pt_tmp_load)
-     NULLIFY(pt_tmp_pi_load)
 
      ! Reading values corresponding to the closest year taking into count the choice of aer_type. 
      ! For aer_type=scenario interpolation between 2 data sets is done in readaerosol.
      CALL readaerosol(name_aero(id_aero), aer_type, iyr, klev_src, pt_ap, pt_b, pt_tmp, &
-          pt_tmp_surf,pt_tmp_load,nbr_tsteps)
+          psurf_year(:,:,id_aero), load_year(:,:,id_aero))
      IF (.NOT. ALLOCATED(var_year)) THEN
-        ALLOCATE(var_year(klon, klev_src, nbr_tsteps, naero_spc), stat=ierr)
-        IF (ierr /= 0) CALL abort_gcm('readaerosol_interp', 'pb in allocation 5.1',1)
-        ALLOCATE( psurf_year(klon, nbr_tsteps, naero_spc), load_year(klon, nbr_tsteps, naero_spc), stat=ierr)
-        IF (ierr /= 0) CALL abort_gcm('readaerosol_interp', 'pb in allocation 5.2',1)
+        ALLOCATE(var_year(klon, klev_src, 12, naero_spc), stat=ierr)
+        IF (ierr /= 0) CALL abort_gcm('readaerosol_interp', 'pb in allocation 5',1)
      END IF
      var_year(:,:,:,id_aero) = pt_tmp(:,:,:)
-     psurf_year(:,:,id_aero) = pt_tmp_surf(:,:)
-     load_year(:,:,id_aero) = pt_tmp_load(:,:)
 
      ! Reading values corresponding to the preindustrial concentrations.
      CALL readaerosol(name_aero(id_aero), 'preind', iyr, pi_klev_src, pt_ap, pt_b, pt_tmp, &
-          pt_tmp_surf,pt_tmp_load,nbr_tsteps)
+          pi_psurf_year(:,:,id_aero), pi_load_year(:,:,id_aero))
 
      ! klev_src must be the same in both files. 
@@ -204 +191 @@
 
      IF (.NOT. ALLOCATED(pi_var_year)) THEN
-        ALLOCATE(pi_var_year(klon, klev_src, nbr_tsteps, naero_spc), stat=ierr)
-        IF (ierr /= 0) CALL abort_gcm('readaerosol_interp', 'pb in allocation 6.1',1)
-        ALLOCATE( pi_psurf_year(klon, nbr_tsteps, naero_spc), pi_load_year(klon, nbr_tsteps, naero_spc), stat=ierr)
-        IF (ierr /= 0) CALL abort_gcm('readaerosol_interp', 'pb in allocation 6.2',1)
+        ALLOCATE(pi_var_year(klon, klev_src, 12, naero_spc), stat=ierr)
+        IF (ierr /= 0) CALL abort_gcm('readaerosol_interp', 'pb in allocation 6',1)
      END IF
      pi_var_year(:,:,:,id_aero) = pt_tmp(:,:,:)
-     pi_psurf_year(:,:,id_aero) = pt_tmp_surf(:,:)
-     pi_load_year(:,:,id_aero) = pt_tmp_load(:,:)
     
      IF (debug) THEN
-        CALL writefield_phy('var_year_first',var_year(:,:,1,id_aero),klev_src)
-        CALL writefield_phy('var_year_last',var_year(:,:,nbr_tsteps,id_aero),klev_src)
+        CALL writefield_phy('var_year_jan',var_year(:,:,1,id_aero),klev_src)
+        CALL writefield_phy('var_year_dec',var_year(:,:,12,id_aero),klev_src)
         CALL writefield_phy('psurf_src',psurf_year(:,:,id_aero),1)
         CALL writefield_phy('pi_psurf_src',pi_psurf_year(:,:,id_aero),1)
@@ -224 +207 @@
      ! Pointer no more useful, deallocate. 
      DEALLOCATE(pt_tmp)
-     DEALLOCATE(pt_tmp_surf)
-     DEALLOCATE(pt_tmp_load)
 
      ! Test if vertical interpolation will be needed.
@@ -259 +240 @@
      month_mid(:) = month_start (:) + month_len(:)/2.
 
-     write(55,*)'month_len = ',month_len
-     write(55,*)'month_start = ',month_start
-     write(55,*)'month_mid = ',month_mid
-       
   END IF  ! IF ( (first .OR. iday==0) .AND. lnewday ) THEN 
   
@@ -277 +254 @@
 !****************************************************************************************
     ! Find which months and days to use for time interpolation
+     nbr_tsteps = 12
      IF (nbr_tsteps == 12) then
        IF (jDay < month_mid(im+1)) THEN
@@ -313 +291 @@
      ENDIF
 
-!     ! Find which months and days to use for time interpolation
-!     IF (iday < im*30-15) THEN
-!        ! in the first half of the month use month before and actual month
-!        im2=im-1
-!        day2 = im2*30-15
-!        day1 = im2*30+15
-!        IF (im2 <= 0) THEN 
-!           ! the month is january, thus the month before december
-!           im2=12
-!        END IF
-!     ELSE
-!        ! the second half of the month
-!        im2=im+1
-!        IF (im2 > 12) THEN
-!           ! the month is december, the following thus january
-!           im2=1
-!        ENDIF
-!        day2 = im*30-15
-!        day1 = im*30+15
-!     END IF
-!      jDay = jDay+1
-!      write(55,*)'iday, jDay, im, im2, day1, day2 = ',iday, jDay, im, im2, day1, day2, nbr_tsteps
  
      ! Time interpolation, still on vertical source grid