Changeset 127 for codes/icosagcm/trunk/src

Timestamp:

02/01/13 02:12:12 (11 years ago)

Author:

dubos

Message:

Ready for energy-conserving variant

File:

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

codes/icosagcm/trunk/src/caldyn_gcm.f90

@@ -158 +158 @@
     
     INTEGER :: i,j,ij,l
-    REAL(rstd) :: ww,uu 
-    REAL(rstd) :: delta
-    REAL(rstd) :: etav,hv, du2
-
-    REAL(rstd),ALLOCATABLE,SAVE :: theta(:,:)  ! potential temperature
-    REAL(rstd),ALLOCATABLE,SAVE :: pk(:,:), pks(:) ! Exner function
-    REAL(rstd),ALLOCATABLE,SAVE :: alpha(:,:), beta(:,:)
-    REAL(rstd),ALLOCATABLE,SAVE :: phi(:,:)              ! geopotential
-    REAL(rstd),ALLOCATABLE,SAVE :: Fe(:,:), Ftheta(:,:)  ! mass flux, theta flux
-    REAL(rstd),ALLOCATABLE,SAVE :: convm(:,:)  ! mass flux convergence
-    REAL(rstd),ALLOCATABLE,SAVE :: w(:,:)      ! vertical velocity      
+!    REAL(rstd) :: ww,uu 
+!    REAL(rstd) :: delta
+    REAL(rstd) :: etav,hv
     REAL(rstd),ALLOCATABLE,SAVE :: qv(:,:)     ! potential velocity  
-    REAL(rstd),ALLOCATABLE,SAVE :: berni(:,:)  ! Bernouilli function
     
     LOGICAL,SAVE :: first=.TRUE.
@@ -178 +169 @@
 !$OMP MASTER  
 !    IF (first) THEN
-    ALLOCATE(theta(iim*jjm,llm))    ! potential temperature
-    ALLOCATE(pk(iim*jjm,llm))       ! Exner function
-    ALLOCATE(pks(iim*jjm))
-    ALLOCATE(alpha(iim*jjm,llm))
-    ALLOCATE(beta(iim*jjm,llm))
-    ALLOCATE(phi(iim*jjm,llm))      ! geopotential
-    ALLOCATE(Fe(3*iim*jjm,llm))     ! mass flux   
-    ALLOCATE(Ftheta(3*iim*jjm,llm)) ! theta flux   
-    ALLOCATE(convm(iim*jjm,llm))    ! mass flux convergence
-    ALLOCATE(w(iim*jjm,llm))        ! vertical velocity      
     ALLOCATE(qv(2*iim*jjm,llm))     ! potential velocity  
-    ALLOCATE(berni(iim*jjm,llm))    ! bernouilli term
     
 !!! Compute pressure