Changeset 2346 for LMDZ5/trunk/libf/phylmd/readaerosol.F90

Timestamp:

Aug 21, 2015, 5:13:46 PM (9 years ago)

Author:

Ehouarn Millour

Message:

Physics/dynamics separation:

• remove all references to dimensions.h from physics. nbp_lon (==iim) , nbp_lat (==jjm+1) and nbp_lev (==llm) from mod_grid_phy_lmdz should be used instead.
• added module regular_lonlat_mod in phy_common to store information about the global (lon-lat) grid cell boundaries and centers.

EM

File:

• LMDZ5/trunk/libf/phylmd/readaerosol.F90 (modified) (12 diffs)

LMDZ5/trunk/libf/phylmd/readaerosol.F90

@@ -178 +178 @@
 ! 3) Read field month by month
 ! 4) Close file  
-! 5) Transform the global field from 2D(iim, jjp+1) to 1D(klon_glo)
+! 5) Transform the global field from 2D(nbp_lon,nbp_lat) to 1D(klon_glo)
 !     - Also the levels and the latitudes have to be inversed
 !
@@ -188 +188 @@
     USE netcdf
     USE dimphy
-    USE mod_grid_phy_lmdz
+    USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat, klon_glo, &
+                                 grid2Dto1D_glo
     USE mod_phys_lmdz_para
     USE iophy, ONLY : io_lon, io_lat
@@ -195 +196 @@
     IMPLICIT NONE
       
-    INCLUDE "dimensions.h"      
-
 ! Input argumets
     CHARACTER(len=7), INTENT(IN)          :: varname
@@ -223 +222 @@
     REAL, ALLOCATABLE, DIMENSION(:)       :: varktmp
 
-    REAL, DIMENSION(iim,jjm+1,12)         :: psurf_glo2D   ! Surface pression for 12 months on dynamics global grid
+    REAL, DIMENSION(nbp_lon,nbp_lat,12)         :: psurf_glo2D   ! Surface pression for 12 months on dynamics global grid
     REAL, DIMENSION(klon_glo,12)          :: psurf_glo1D   ! -"- on physical global grid
-    REAL, DIMENSION(iim,jjm+1,12)         :: load_glo2D    ! Load for 12 months on dynamics global grid
+    REAL, DIMENSION(nbp_lon,nbp_lat,12)         :: load_glo2D    ! Load for 12 months on dynamics global grid
     REAL, DIMENSION(klon_glo,12)          :: load_glo1D    ! -"- on physical global grid
-    REAL, DIMENSION(iim,jjm+1)            :: vartmp
-    REAL, DIMENSION(iim)                  :: lon_src              ! longitudes in file
-    REAL, DIMENSION(jjm+1)                :: lat_src, lat_src_inv ! latitudes in file
+    REAL, DIMENSION(nbp_lon,nbp_lat)            :: vartmp
+    REAL, DIMENSION(nbp_lon)                  :: lon_src              ! longitudes in file
+    REAL, DIMENSION(nbp_lat)                :: lat_src, lat_src_inv ! latitudes in file
     LOGICAL                               :: new_file             ! true if new file format detected
     LOGICAL                               :: invert_lat           ! true if the field has to be inverted for latitudes
@@ -267 +266 @@
 
        ! Invert source latitudes
-       DO j = 1, jjm+1
-          lat_src_inv(j) = lat_src(jjm+1 +1 -j)
+       DO j = 1, nbp_lat
+          lat_src_inv(j) = lat_src(nbp_lat +1 -j)
        END DO
 
@@ -313 +312 @@
        
      ! Allocate variables depending on the number of vertical levels
-       ALLOCATE(varmth(iim, jjm+1, klev_src), varyear(iim, jjm+1, klev_src, 12), stat=ierr)
+       ALLOCATE(varmth(nbp_lon,nbp_lat, klev_src), varyear(nbp_lon,nbp_lat, klev_src, 12), stat=ierr)
        IF (ierr /= 0) CALL abort_physic('get_aero_fromfile', 'pb in allocation 1',1)
 
@@ -435 +434 @@
      
 
-! 5) Transform the global field from 2D(iim, jjp+1) to 1D(klon_glo)
+! 5) Transform the global field from 2D(nbp_lon,nbp_lat) to 1D(klon_glo)
 !****************************************************************************************
 ! Test if vertical levels have to be inversed
@@ -448 +447 @@
              varmth(:,:,:) = varyear(:,:,:,imth) ! use varmth temporarly
              DO k=1, klev_src
-                DO j=1, jjm+1
-                   DO i=1,iim 
+                DO j=1, nbp_lat
+                   DO i=1, nbp_lon
                       varyear(i,j,k,imth) = varmth(i,j,klev_src+1-k)
                    END DO
@@ -482 +481 @@
              varmth(:,:,:) = varyear(:,:,:,imth) ! use varmth temporarly
              DO k=1,klev_src
-                DO j=1,jjm+1
-                   DO i=1,iim
-                      varyear(i,j,k,imth) = varmth(i,jjm+1+1-j,k)
+                DO j=1,nbp_lat
+                   DO i=1,nbp_lon
+                      varyear(i,j,k,imth) = varmth(i,nbp_lat+1-j,k)
                    END DO
                 END DO
@@ -491 +490 @@
              ! Invert latitudes for surface pressure
              vartmp(:,:) = psurf_glo2D(:,:,imth)
-             DO j=1, jjm+1
-                DO i=1,iim
-                   psurf_glo2D(i,j,imth)= vartmp(i,jjm+1+1-j)
+             DO j=1,nbp_lat
+                DO i=1,nbp_lon
+                   psurf_glo2D(i,j,imth)= vartmp(i,nbp_lat+1-j)
                 END DO
              END DO
@@ -499 +498 @@
              ! Invert latitudes for the load
              vartmp(:,:) = load_glo2D(:,:,imth)
-             DO j=1, jjm+1
-                DO i=1,iim
-                   load_glo2D(i,j,imth)= vartmp(i,jjm+1+1-j)
+             DO j=1,nbp_lat
+                DO i=1,nbp_lon
+                   load_glo2D(i,j,imth)= vartmp(i,nbp_lat+1-j)
                 END DO
              END DO
@@ -509 +508 @@
           DO k=1, klev_src
              npole=0.  ! North pole, j=1
-             spole=0.  ! South pole, j=jjm+1         
-             DO i=1,iim
+             spole=0.  ! South pole, j=nbp_lat        
+             DO i=1,nbp_lon
                 npole = npole + varyear(i,1,k,imth)
-                spole = spole + varyear(i,jjm+1,k,imth)
+                spole = spole + varyear(i,nbp_lat,k,imth)
              END DO
-             npole = npole/REAL(iim)
-             spole = spole/REAL(iim)
+             npole = npole/REAL(nbp_lon)
+             spole = spole/REAL(nbp_lon)
              varyear(:,1,    k,imth) = npole
-             varyear(:,jjm+1,k,imth) = spole
+             varyear(:,nbp_lat,k,imth) = spole
           END DO
        END DO ! imth