Changeset 2311 for LMDZ5/trunk/libf/phylmd/readaerosol_interp.F90

Timestamp:

Jun 25, 2015, 9:45:24 AM (9 years ago)

Author:

Ehouarn Millour

Message:

Further modifications to enforce physics/dynamics separation:

• moved iniprint.h and misc_mod back to dyn3d_common, as these should only be used by dynamics.
• created print_control_mod in the physics to store flags prt_level, lunout, debug to be local to physics (should be used rather than iniprint.h)
• created abort_physic.F90 , which does the same job as abort_gcm() did, but should be used instead when in physics.
• reactivated inifis (turned it into a module, inifis_mod.F90) to initialize physical constants and print_control_mod flags.

EM

File:

• LMDZ5/trunk/libf/phylmd/readaerosol_interp.F90 (modified) (11 diffs)

LMDZ5/trunk/libf/phylmd/readaerosol_interp.F90

@@ -21 +21 @@
   USE phys_cal_mod
   USE pres2lev_mod
+  USE print_control_mod, ONLY: lunout
 
   IMPLICIT NONE
@@ -28 +29 @@
   INCLUDE "temps.h"      
   INCLUDE "clesphys.h"
-  INCLUDE "iniprint.h"
   INCLUDE "dimensions.h"
   INCLUDE "comvert.h"
@@ -150 +150 @@
   IF (.NOT. ALLOCATED(var_day)) THEN
      ALLOCATE( var_day(klon, klev, naero_spc), stat=ierr)
-     IF (ierr /= 0) CALL abort_gcm('readaerosol_interp', 'pb in allocation 1',1)
+     IF (ierr /= 0) CALL abort_physic('readaerosol_interp', 'pb in allocation 1',1)
      ALLOCATE( pi_var_day(klon, klev, naero_spc), stat=ierr)
-     IF (ierr /= 0) CALL abort_gcm('readaerosol_interp', 'pb in allocation 2',1)
+     IF (ierr /= 0) CALL abort_physic('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)
+     IF (ierr /= 0) CALL abort_physic('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)
+     IF (ierr /= 0) CALL abort_physic('readaerosol_interp', 'pb in allocation 4',1)
 
      lnewday=.TRUE.
@@ -209 +209 @@
         END IF
      ELSE
-        CALL abort_gcm('readaerosol_interp', 'this aer_type not supported',1)
+        CALL abort_physic('readaerosol_interp', 'this aer_type not supported',1)
      END IF
 
@@ -216 +216 @@
      IF (.NOT. ALLOCATED(var_year)) THEN
         ALLOCATE(var_year(klon, klev_src, 12, naero_spc), stat=ierr)
-        IF (ierr /= 0) CALL abort_gcm('readaerosol_interp', 'pb in allocation 5',1)
+        IF (ierr /= 0) CALL abort_physic('readaerosol_interp', 'pb in allocation 5',1)
      END IF
      var_year(:,:,:,id_aero) = pt_tmp(:,:,:)
@@ -230 +230 @@
         WRITE(lunout,*) 'Error! All forcing files for the same aerosol must have the same vertical dimension'
         WRITE(lunout,*) 'Aerosol : ', name_aero(id_aero)
-        CALL abort_gcm('readaerosol_interp','Differnt vertical axes in aerosol forcing files',1)
+        CALL abort_physic('readaerosol_interp','Differnt vertical axes in aerosol forcing files',1)
      END IF
 
      IF (.NOT. ALLOCATED(pi_var_year)) THEN
         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)
+        IF (ierr /= 0) CALL abort_physic('readaerosol_interp', 'pb in allocation 6',1)
      END IF
      pi_var_year(:,:,:,id_aero) = pt_tmp(:,:,:)
@@ -259 +259 @@
         IF (  psurf_year(1,1,id_aero) /= pi_psurf_year(1,1,id_aero) ) THEN
            WRITE(lunout,*) 'Warning! All forcing files for the same aerosol must have the same structure'
-           CALL abort_gcm('readaerosol_interp', 'The aerosol files have not the same format',1)
+           CALL abort_physic('readaerosol_interp', 'The aerosol files have not the same format',1)
         END IF
         
         IF (klev /= klev_src) THEN
            WRITE(lunout,*) 'Old format of aerosol file do not allowed vertical interpolation'
-           CALL abort_gcm('readaerosol_interp', 'Old aerosol file not possible',1)
+           CALL abort_physic('readaerosol_interp', 'Old aerosol file not possible',1)
         END IF
 
@@ -336 +336 @@
        END IF
      ELSE
-       CALL abort_gcm('readaerosol_interp', 'number of months undefined',1)
+       CALL abort_physic('readaerosol_interp', 'number of months undefined',1)
      ENDIF
      if (debug) then
@@ -345 +345 @@
      ! Time interpolation, still on vertical source grid
      ALLOCATE(tmp1(klon,klev_src), tmp2(klon,klev_src),stat=ierr)
-     IF (ierr /= 0) CALL abort_gcm('readaerosol_interp', 'pb in allocation 7',1)
+     IF (ierr /= 0) CALL abort_physic('readaerosol_interp', 'pb in allocation 7',1)
 
      ALLOCATE(pplay_src(klon,klev_src), stat=ierr)
-     IF (ierr /= 0) CALL abort_gcm('readaerosol_interp', 'pb in allocation 8',1)
+     IF (ierr /= 0) CALL abort_physic('readaerosol_interp', 'pb in allocation 8',1)
      
 
@@ -544 +544 @@
                  WRITE(lunout,*) 'stop for aerosol : ',name_aero(id_aero)
                  WRITE(lunout,*) 'day1, day2, jDay = ', day1, day2, jDay 
-                 CALL abort_gcm('readaerosol_interp','Error in interpolation 1',1)
+                 CALL abort_physic('readaerosol_interp','Error in interpolation 1',1)
               END IF
            END DO 
@@ -563 +563 @@
                  
                  WRITE(lunout,*) 'stop for aerosol : ',name_aero(id_aero)
-                 CALL abort_gcm('readaerosol_interp','Error in interpolation 2',1)
+                 CALL abort_physic('readaerosol_interp','Error in interpolation 2',1)
               END IF
            END DO