Changeset 1331 for LMDZ4/trunk

Timestamp:

Mar 25, 2010, 11:52:08 AM (15 years ago)

Author:

yann meurdesoif

Message:

Correction problème de COSP : Les sorties 3D par histwrite_phy devaient avoir nécessairement "klev" niveaux verticaux. Cette contrainte est desormais relachee

File:

• LMDZ4/trunk/libf/phylmd/iophy.F90 (modified) (5 diffs)

LMDZ4/trunk/libf/phylmd/iophy.F90

@@ -4 +4 @@
 module iophy
   
-  REAL,private,allocatable,dimension(:,:),save :: tmp_tab2d
-  REAL,private,allocatable,dimension(:,:,:),save :: tmp_tab3d
-  INTEGER,private,allocatable,dimension(:),save :: ndex2d
-  INTEGER,private,allocatable,dimension(:),save :: ndex3d
 ! abd  REAL,private,allocatable,dimension(:),save :: io_lat
 ! abd  REAL,private,allocatable,dimension(:),save :: io_lon
@@ -61 +57 @@
     io_lon(:)=rlon_glo(2-1/iim:iim+1-1/iim)
 
-
-    allocate(tmp_tab2d(iim,jj_nb))
-    allocate(tmp_tab3d(iim,jj_nb,klev))
-    allocate(ndex2d(iim*jj_nb))
-    allocate(ndex3d(iim*jj_nb*klev))
-    ndex2d(:)=0
-    ndex3d(:)=0
-    
     ddid=(/ 1,2 /)
     dsg=(/ iim, jjm+1-1/iim /)
@@ -110 +98 @@
     allocate(io_lon(iim))
     io_lon(:)=lon(:)
-    allocate(tmp_tab2d(iim,jj_nb))
-    allocate(tmp_tab3d(iim,jj_nb,klev))
-    allocate(ndex2d(iim*jj_nb))
-    allocate(ndex3d(iim*jj_nb*klev))
-    ndex2d(:)=0
-    ndex3d(:)=0
-    
+   
     ddid=(/ 1,2 /)
     dsg=(/ iim, jjm+1-1/iim /)
@@ -173 +155 @@
     character*(*), intent(IN) :: name
     integer, intent(in) :: itau
-    real,dimension(klon),intent(in) :: field
-    
+    real,dimension(:),intent(in) :: field
     REAL,dimension(klon_mpi) :: buffer_omp
+    INTEGER :: index2d(iim*jj_nb)
+    REAL :: Field2d(iim,jj_nb)
+
+    IF (size(field)/=klon) CALL abort_gcm('iophy::histwrite2d','Field first dimension not equal to klon',1)
     
     CALL Gather_omp(field,buffer_omp)    
 !$OMP MASTER
-    CALL grid1Dto2D_mpi(buffer_omp,tmp_tab2d)
-    CALL histwrite(nid,name,itau,tmp_tab2d,iim*jj_nb,ndex2d)
+    CALL grid1Dto2D_mpi(buffer_omp,Field2d)
+    CALL histwrite(nid,name,itau,Field2d,iim*jj_nb,index2d)
 !$OMP END MASTER    
   end subroutine histwrite2d_phy
+
+
   
   subroutine histwrite3d_phy(nid,name,itau,field)
@@ -195 +182 @@
     character*(*), intent(IN) :: name
     integer, intent(in) :: itau
-    real,dimension(klon,klev),intent(in) :: field
-
-    REAL,dimension(klon_mpi,klev) :: buffer_omp
+    real,dimension(:,:),intent(in) :: field  ! --> field(klon,:)
+    REAL,dimension(klon_mpi,size(field,2)) :: buffer_omp
+    INTEGER :: nlev
+    INTEGER :: index3d(iim*jj_nb*size(field,2))
+    REAL :: Field3d(iim,jj_nb,size(field,2))
+    
+    IF (size(field,1)/=klon) CALL abort_gcm('iophy::histwrite3d','Field first dimension not equal to klon',1)
+    nlev=size(field,2)
     
     CALL Gather_omp(field,buffer_omp)
 !$OMP MASTER
-    CALL grid1Dto2D_mpi(buffer_omp,tmp_tab3d)
-    CALL histwrite(nid,name,itau,tmp_tab3d,iim*jj_nb*klev,ndex3d)
+    CALL grid1Dto2D_mpi(buffer_omp,field3d)
+    CALL histwrite(nid,name,itau,Field3d,iim*jj_nb*nlev,index3d)
 !$OMP END MASTER    
   end subroutine histwrite3d_phy