Ignore:
Timestamp:
Dec 14, 2015, 11:43:09 AM (9 years ago)
Author:
Laurent Fairhead
Message:

Merged trunk changes r2298:2396 into testing branch

Location:
LMDZ5/branches/testing
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ5/branches/testing

  • LMDZ5/branches/testing/libf/phylmd/readaerosol_interp.F90

    r1910 r2408  
    2121  USE phys_cal_mod
    2222  USE pres2lev_mod
     23  USE print_control_mod, ONLY: lunout
    2324
    2425  IMPLICIT NONE
     
    2627  INCLUDE "YOMCST.h"
    2728  INCLUDE "chem.h"     
    28   INCLUDE "temps.h"     
    2929  INCLUDE "clesphys.h"
    30   INCLUDE "iniprint.h"
    31   INCLUDE "dimensions.h"
    32   INCLUDE "comvert.h"
     30
    3331!
    3432! Input:
     
    150148  IF (.NOT. ALLOCATED(var_day)) THEN
    151149     ALLOCATE( var_day(klon, klev, naero_spc), stat=ierr)
    152      IF (ierr /= 0) CALL abort_gcm('readaerosol_interp', 'pb in allocation 1',1)
     150     IF (ierr /= 0) CALL abort_physic('readaerosol_interp', 'pb in allocation 1',1)
    153151     ALLOCATE( pi_var_day(klon, klev, naero_spc), stat=ierr)
    154      IF (ierr /= 0) CALL abort_gcm('readaerosol_interp', 'pb in allocation 2',1)
     152     IF (ierr /= 0) CALL abort_physic('readaerosol_interp', 'pb in allocation 2',1)
    155153
    156154     ALLOCATE( psurf_year(klon, 12, naero_spc), pi_psurf_year(klon, 12, naero_spc), stat=ierr)
    157      IF (ierr /= 0) CALL abort_gcm('readaerosol_interp', 'pb in allocation 3',1)
     155     IF (ierr /= 0) CALL abort_physic('readaerosol_interp', 'pb in allocation 3',1)
    158156
    159157     ALLOCATE( load_year(klon, 12, naero_spc), pi_load_year(klon, 12, naero_spc), stat=ierr)
    160      IF (ierr /= 0) CALL abort_gcm('readaerosol_interp', 'pb in allocation 4',1)
     158     IF (ierr /= 0) CALL abort_physic('readaerosol_interp', 'pb in allocation 4',1)
    161159
    162160     lnewday=.TRUE.
     
    209207        END IF
    210208     ELSE
    211         CALL abort_gcm('readaerosol_interp', 'this aer_type not supported',1)
     209        CALL abort_physic('readaerosol_interp', 'this aer_type not supported',1)
    212210     END IF
    213211
     
    216214     IF (.NOT. ALLOCATED(var_year)) THEN
    217215        ALLOCATE(var_year(klon, klev_src, 12, naero_spc), stat=ierr)
    218         IF (ierr /= 0) CALL abort_gcm('readaerosol_interp', 'pb in allocation 5',1)
     216        IF (ierr /= 0) CALL abort_physic('readaerosol_interp', 'pb in allocation 5',1)
    219217     END IF
    220218     var_year(:,:,:,id_aero) = pt_tmp(:,:,:)
     
    230228        WRITE(lunout,*) 'Error! All forcing files for the same aerosol must have the same vertical dimension'
    231229        WRITE(lunout,*) 'Aerosol : ', name_aero(id_aero)
    232         CALL abort_gcm('readaerosol_interp','Differnt vertical axes in aerosol forcing files',1)
     230        CALL abort_physic('readaerosol_interp','Differnt vertical axes in aerosol forcing files',1)
    233231     END IF
    234232
    235233     IF (.NOT. ALLOCATED(pi_var_year)) THEN
    236234        ALLOCATE(pi_var_year(klon, klev_src, 12, naero_spc), stat=ierr)
    237         IF (ierr /= 0) CALL abort_gcm('readaerosol_interp', 'pb in allocation 6',1)
     235        IF (ierr /= 0) CALL abort_physic('readaerosol_interp', 'pb in allocation 6',1)
    238236     END IF
    239237     pi_var_year(:,:,:,id_aero) = pt_tmp(:,:,:)
     
    259257        IF (  psurf_year(1,1,id_aero) /= pi_psurf_year(1,1,id_aero) ) THEN
    260258           WRITE(lunout,*) 'Warning! All forcing files for the same aerosol must have the same structure'
    261            CALL abort_gcm('readaerosol_interp', 'The aerosol files have not the same format',1)
     259           CALL abort_physic('readaerosol_interp', 'The aerosol files have not the same format',1)
    262260        END IF
    263261       
    264262        IF (klev /= klev_src) THEN
    265263           WRITE(lunout,*) 'Old format of aerosol file do not allowed vertical interpolation'
    266            CALL abort_gcm('readaerosol_interp', 'Old aerosol file not possible',1)
     264           CALL abort_physic('readaerosol_interp', 'Old aerosol file not possible',1)
    267265        END IF
    268266
     
    336334       END IF
    337335     ELSE
    338        CALL abort_gcm('readaerosol_interp', 'number of months undefined',1)
     336       CALL abort_physic('readaerosol_interp', 'number of months undefined',1)
    339337     ENDIF
    340338     if (debug) then
     
    345343     ! Time interpolation, still on vertical source grid
    346344     ALLOCATE(tmp1(klon,klev_src), tmp2(klon,klev_src),stat=ierr)
    347      IF (ierr /= 0) CALL abort_gcm('readaerosol_interp', 'pb in allocation 7',1)
     345     IF (ierr /= 0) CALL abort_physic('readaerosol_interp', 'pb in allocation 7',1)
    348346
    349347     ALLOCATE(pplay_src(klon,klev_src), stat=ierr)
    350      IF (ierr /= 0) CALL abort_gcm('readaerosol_interp', 'pb in allocation 8',1)
     348     IF (ierr /= 0) CALL abort_physic('readaerosol_interp', 'pb in allocation 8',1)
    351349     
    352350
     
    544542                 WRITE(lunout,*) 'stop for aerosol : ',name_aero(id_aero)
    545543                 WRITE(lunout,*) 'day1, day2, jDay = ', day1, day2, jDay
    546                  CALL abort_gcm('readaerosol_interp','Error in interpolation 1',1)
     544                 CALL abort_physic('readaerosol_interp','Error in interpolation 1',1)
    547545              END IF
    548546           END DO
     
    563561                 
    564562                 WRITE(lunout,*) 'stop for aerosol : ',name_aero(id_aero)
    565                  CALL abort_gcm('readaerosol_interp','Error in interpolation 2',1)
     563                 CALL abort_physic('readaerosol_interp','Error in interpolation 2',1)
    566564              END IF
    567565           END DO
Note: See TracChangeset for help on using the changeset viewer.