Changeset 53

Timestamp:

07/30/12 19:01:07 (12 years ago)

Author:

ymipsl

Message:

bug fix in caldyn_gcm, didn't work with different size of local domain

YM

File:

• codes/icosagcm/trunk/src/caldyn_gcm.f90 (modified) (3 diffs)

codes/icosagcm/trunk/src/caldyn_gcm.f90

@@ -235 +235 @@
 !$OMP BARRIER      
 !$OMP MASTER  
-    IF (first) THEN
+!    IF (first) THEN
       ALLOCATE(theta(iim*jjm,llm))  ! potential temperature
       ALLOCATE(p(iim*jjm,llm+1))  ! pression
@@ -251 +251 @@
       ALLOCATE(qv(2*iim*jjm,llm))       ! potential velocity  
       ALLOCATE(berni(iim*jjm,llm))   ! bernouilli term
-      first=.FALSE.
-    ENDIF
+!      first=.FALSE.
+!    ENDIF
 !$OMP END MASTER
 !$OMP BARRIER        
@@ -659 +659 @@
 !!$OMP BARRIER
 !!$OMP MASTER  
-!    DEALLOCATE(theta)  ! potential temperature
-!    DEALLOCATE(p)  ! pression
-!    DEALLOCATE(pk)   ! Exner function
-!    DEALLOCATE(pks)
-!    DEALLOCATE(alpha)
-!    DEALLOCATE(beta)
-!    DEALLOCATE(phi)    ! geopotential
-!    DEALLOCATE(mass)   ! mass    
-!    DEALLOCATE(rhodz)   ! mass density   
-!    DEALLOCATE(Fe)   ! mass flux   
-!    DEALLOCATE(Ftheta) ! theta flux   
-!    DEALLOCATE(convm)    ! mass flux convergence
-!    DEALLOCATE(w)       ! vertical velocity      
-!    DEALLOCATE(qv)       ! potential velocity  
-!    DEALLOCATE(berni)   ! bernouilli term
+    DEALLOCATE(theta)  ! potential temperature
+    DEALLOCATE(p)  ! pression
+    DEALLOCATE(pk)   ! Exner function
+    DEALLOCATE(pks)
+    DEALLOCATE(alpha)
+    DEALLOCATE(beta)
+    DEALLOCATE(phi)    ! geopotential
+    DEALLOCATE(mass)   ! mass    
+    DEALLOCATE(rhodz)   ! mass density   
+    DEALLOCATE(Fe)   ! mass flux   
+    DEALLOCATE(Ftheta) ! theta flux   
+    DEALLOCATE(convm)    ! mass flux convergence
+    DEALLOCATE(w)       ! vertical velocity      
+    DEALLOCATE(qv)       ! potential velocity  
+    DEALLOCATE(berni)   ! bernouilli term
 !!$OMP END MASTER
 !!$OMP BARRIER