Changeset 1071 for trunk/LMDZ.COMMON/libf/dyn3d

Timestamp:

Oct 14, 2013, 7:15:25 PM (11 years ago)

Author:

slebonnois

Message:

SL: still some corrections to version 1056

File:

• trunk/LMDZ.COMMON/libf/dyn3d/calfis.F (modified) (3 diffs)

trunk/LMDZ.COMMON/libf/dyn3d/calfis.F

@@ -195 +195 @@
 ! to allow for 2D computation of microphys and chemistry
       LOGICAL,save :: flag_moyzon
-      REAL,dimension(iip1,llm) :: tmpvar
-      REAL,dimension(iip1,llmp1) :: tmpvarp1
-      REAL,dimension(llm) :: tmpvarbar
-      REAL,dimension(llmp1) :: tmpvarbarp1
+      REAL,allocatable :: tmpvar(:,:)
+      REAL,allocatable :: tmpvarp1(:,:)
+      REAL,allocatable :: tmpvarbar(:)
+      REAL,allocatable :: tmpvarbarp1(:)
 
 c-----------------------------------------------------------------------
@@ -222 +222 @@
         if(moyzon_ch.or.moyzon_mu) then
          flag_moyzon = .true.
+         allocate(tmpvar(iip1,llm))
+         allocate(tmpvarp1(iip1,llmp1))
+         allocate(tmpvarbar(llm))
+         allocate(tmpvarbarp1(llmp1))
         endif
+
         if (flag_moyzon) call moyzon_init
 
 c----------------------------------------------
 c moyennes globales pour le profil de pression
+      if(planet_type.eq."titan") then
         ALLOCATE(plevmoy(llm+1))
         ALLOCATE(playmoy(llm))
@@ -252 +258 @@
         playmoy = preff * (pkmoy/cpp) ** unskap
         call tpot2t(llm,tetamoy,tmoy,pkmoy)
-c----------------------------------------------
+c-------------------
 c + lat index
-      allocate(klat(ngridmx))
-      klat=0
-      klat(1)  = 1
-      ig0  = 2
-      DO j = 2,jjm
-         do i=0,iim-1
-          klat(ig0+i) = j
-         enddo
-         ig0 = ig0+iim
-      ENDDO
-      klat(ngridmx)  = jjp1
+        allocate(klat(ngridmx))
+        klat=0
+        klat(1)  = 1
+        ig0  = 2
+        DO j = 2,jjm
+           do i=0,iim-1
+            klat(ig0+i) = j
+           enddo
+           ig0 = ig0+iim
+        ENDDO
+        klat(ngridmx)  = jjp1
+      endif   ! planet_type=titan
 c----------------------------------------------
       ELSE