Changeset 138 for codes/icosagcm/trunk/src/caldyn_gcm.f90

Timestamp:

02/16/13 17:03:57 (11 years ago)

Author:

dubos

Message:

Transport now working again - tested with dcmip4.1.0

File:

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

codes/icosagcm/trunk/src/caldyn_gcm.f90

@@ -297 +297 @@
     REAL(rstd),INTENT(IN)  :: qu(iim*3*jjm,llm)
 
-    REAL(rstd),INTENT(OUT) :: du(iim*3*jjm,llm), hflux(iim*3*jjm,llm)
+    REAL(rstd),INTENT(OUT) :: du(iim*3*jjm,llm), hflux(iim*3*jjm,llm) ! hflux in kg/s
     REAL(rstd),INTENT(OUT) :: dtheta_rhodz(iim*jjm,llm)
     REAL(rstd),INTENT(OUT) :: dps(iim*jjm)
-    REAL(rstd),INTENT(OUT) :: wflux(iim*jjm,llm+1) ! vertical mass flux
+    REAL(rstd),INTENT(OUT) :: wflux(iim*jjm,llm+1) ! vertical mass flux (kg/m2/s)
     
     INTEGER :: i,j,ij,l
@@ -312 +312 @@
     REAL(rstd),ALLOCATABLE,SAVE :: phi(:,:)    ! geopotential
     REAL(rstd),ALLOCATABLE,SAVE :: Ftheta(:,:) ! theta flux
-    REAL(rstd),ALLOCATABLE,SAVE :: convm(:,:)  ! mass flux convergence
+    REAL(rstd),ALLOCATABLE,SAVE :: divm(:,:)  ! mass flux divergence
     REAL(rstd),ALLOCATABLE,SAVE :: berni(:,:)  ! Bernouilli function
     
@@ -328 +328 @@
     ALLOCATE(phi(iim*jjm,llm))      ! geopotential
     ALLOCATE(Ftheta(3*iim*jjm,llm)) ! theta flux   
-    ALLOCATE(convm(iim*jjm,llm))    ! mass flux convergence
+    ALLOCATE(divm(iim*jjm,llm))    ! mass flux convergence
     ALLOCATE(berni(iim*jjm,llm))    ! bernouilli term
 
@@ -363 +363 @@
       DO i=ii_begin,ii_end
         ij=(j-1)*iim+i  
-        ! convm = +div(mass flux), sign convention as in Ringler et al. 2012, eq. 21
-        convm(ij,l)= 1./Ai(ij)*(ne(ij,right)*hflux(ij+u_right,l)   +  &
+        ! divm = +div(mass flux), sign convention as in Ringler et al. 2012, eq. 21
+        divm(ij,l)= 1./Ai(ij)*(ne(ij,right)*hflux(ij+u_right,l)   +  &
                                 ne(ij,rup)*hflux(ij+u_rup,l)       +  &  
                                 ne(ij,lup)*hflux(ij+u_lup,l)       +  &  
@@ -383 +383 @@
   ENDDO
    
-!!! cumulate mass flux convergence from top to bottom
+!!! cumulate mass flux divergence from top to bottom
   DO  l = llm-1, 1, -1
 !$OMP DO
@@ -389 +389 @@
       DO i=ii_begin,ii_end
         ij=(j-1)*iim+i
-        convm(ij,l) = convm(ij,l) + convm(ij,l+1)
+        divm(ij,l) = divm(ij,l) + divm(ij,l+1)
       ENDDO
     ENDDO
@@ -402 +402 @@
         ! w = int(z,ztop,div(flux)dz) + B(eta)dps/dt
         ! => w>0 for upward transport
-        wflux( ij, l+1 ) = convm( ij, l+1 ) - bp(l+1) * convm( ij, 1 )
+        wflux( ij, l+1 ) = divm( ij, l+1 ) - bp(l+1) * divm( ij, 1 )
       ENDDO
     ENDDO
   ENDDO
 
-! compute dps, vertical mass flux at the surface = 0
+! compute dps, set vertical mass flux at the surface to 0
 !$OMP DO
   DO j=jj_begin,jj_end
@@ -414 +414 @@
       wflux(ij,1)  = 0.
       ! dps/dt = -int(div flux)dz
-      dps(ij)=-convm(ij,1) * g 
+      dps(ij)=-divm(ij,1) * g 
     ENDDO
   ENDDO
@@ -644 +644 @@
     DEALLOCATE(phi)     ! geopotential
     DEALLOCATE(Ftheta)  ! theta flux   
-    DEALLOCATE(convm)   ! mass flux convergence
+    DEALLOCATE(divm)    ! mass flux divergence
     DEALLOCATE(berni)   ! bernouilli term
 !!$OMP END MASTER