Changeset 1674 for LMDZ5/trunk/libf/phylmd/iophy.F90

Timestamp:

Oct 29, 2012, 5:27:03 PM (12 years ago)

Author:

Ehouarn Millour

Message:

Modification pour activation du 2D latitude-pression
(pour pouvoir compiler en -d 1xjmxlm)
dyn3d/fxhyp.F : calcul des longitudes a la main pour iim=1
dyn3d/groupe.F : desactive si iim=1
dyn3d/paramet.h : iip1=iim+1 au lieu de iim+1-1/iim precedemment
phylmd/iophy.F90 : on enleve les -1/iim
phylmd/phyetat0.F90 : on enleve les -1/iim

Modification for activation of the 3D latitude-pressure version
(to be compiled with -d 1xjmxlm)
dyn3d/fxhyp.F : longitudes imposed for iim=1
dyn3d/groupe.F : desactived when iim=1
dyn3d/paramet.h : iip1=iim+1 instead of iim+1-1/iim previously
phylmd/iophy.F90 : -1/iim removed
phylmd/phyetat0.F90 : -1/iim removed

FH et EM

File:

• LMDZ5/trunk/libf/phylmd/iophy.F90 (modified) (6 diffs)

LMDZ5/trunk/libf/phylmd/iophy.F90

@@ -51 +51 @@
     
 !$OMP MASTER  
-    ALLOCATE(io_lat(jjm+1-1/iim))
+    ALLOCATE(io_lat(jjm+1-1/(iim*jjm)))
     io_lat(1)=rlat_glo(1)
-    io_lat(jjm+1-1/iim)=rlat_glo(klon_glo)
-    IF (iim > 1) then
+    io_lat(jjm+1-1/(iim*jjm))=rlat_glo(klon_glo)
+    IF ((iim*jjm) > 1) then
       DO i=2,jjm
         io_lat(i)=rlat_glo(2+(i-2)*iim)
@@ -61 +61 @@
 
     ALLOCATE(io_lon(iim))
-    io_lon(:)=rlon_glo(2-1/iim:iim+1-1/iim)
+    io_lon(:)=rlon_glo(2-1/(iim*jjm):iim+1-1/(iim*jjm))
 
     ddid=(/ 1,2 /)
-    dsg=(/ iim, jjm+1-1/iim /)
+    dsg=(/ iim, jjm+1-1/(iim*jjm) /)
     dsl=(/ iim, jj_nb /)
     dpf=(/ 1,jj_begin /)
@@ -89 +89 @@
   include 'dimensions.h'   
     real,dimension(iim),intent(in) :: lon
-    real,dimension(jjm+1-1/iim),intent(in) :: lat
+    real,dimension(jjm+1-1/(iim*jjm)),intent(in) :: lat
 
     INTEGER,DIMENSION(2) :: ddid
@@ -100 +100 @@
 
 !$OMP MASTER  
-    allocate(io_lat(jjm+1-1/iim))
+    allocate(io_lat(jjm+1-1/(iim*jjm)))
     io_lat(:)=lat(:)
     allocate(io_lon(iim))
@@ -106 +106 @@
    
     ddid=(/ 1,2 /)
-    dsg=(/ iim, jjm+1-1/iim /)
+    dsg=(/ iim, jjm+1-1/(iim*jjm) /)
     dsl=(/ iim, jj_nb /)
     dpf=(/ 1,jj_begin /)
@@ -234 +234 @@
 
        CALL gr_fi_ecrit(1,klon,iim,jjmp1,rlon_glo,zx_lon)
-       if (iim.gt.1) then
+       if ((iim*jjm).gt.1) then
        DO i = 1, iim
          zx_lon(i,1) = rlon_glo(i+1)