Changeset 428 for codes/icosagcm/trunk/src/exner.f90

Timestamp:

06/14/16 21:54:26 (8 years ago)

Author:

dubos

Message:

theta-related cleanup

File:

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

codes/icosagcm/trunk/src/exner.f90

@@ -11 +11 @@
   USE icosa
   IMPLICIT NONE
-    TYPE(t_field), POINTER :: f_ps(:)
-    TYPE(t_field), POINTER :: f_p(:)
-    TYPE(t_field), POINTER :: f_pks(:)
-    TYPE(t_field), POINTER :: f_pk(:)
+    TYPE(t_field), POINTER :: f_ps(:)  ! IN
+    TYPE(t_field), POINTER :: f_p(:)   ! IN
+    TYPE(t_field), POINTER :: f_pks(:) ! OUT
+    TYPE(t_field), POINTER :: f_pk(:)  ! OUT
   
     REAL(rstd), POINTER :: ps(:)
@@ -49 +49 @@
     INTEGER,INTENT(IN) :: offset
     INTEGER :: i,j,ij,l
-    REAL(rstd) :: alpha(iim*jjm,llm),beta(iim*jjm,llm)
-    REAL(rstd) :: delta 
     
-    IF(caldyn_exner == lmdz) THEN          ! LMD-Z style calculation of Exner pressure
-       !! Compute Alpha and Beta
+    ! surface : pks
+    IF (is_omp_level_master) THEN
        
-       IF (is_omp_level_master) THEN
-       ! for llm layer
-         DO j=jj_begin-offset,jj_end+offset
-            DO i=ii_begin-offset,ii_end+offset
-               ij=(j-1)*iim+i
-               alpha(ij,llm) = 0.
-               beta (ij,llm) = 1./ (1+ 2*kappa)
-            ENDDO
-         ENDDO
+       DO j=jj_begin-offset,jj_end+offset
+          DO i=ii_begin-offset,ii_end+offset
+             ij=(j-1)*iim+i
+             pks(ij) = cpp * ( ps(ij)/preff ) ** kappa
+          ENDDO
+       ENDDO
        
-       ! for other layer   
-         DO l = llm-1 , 2 , -1
-            DO j=jj_begin-offset,jj_end+offset
-               DO i=ii_begin-offset,ii_end+offset
-                  ij=(j-1)*iim+i
-                  delta = p(ij,l)* (1+2*kappa) + p(ij,l+1)* ( beta(ij,l+1)- (1+2*kappa) )
-                  alpha(ij,l)  = - p(ij,l+1) / delta * alpha(ij,l+1)
-                  beta (ij,l)  =   p(ij,l  ) / delta   
-               ENDDO
-            ENDDO
-         ENDDO
-       
-         !! Compute pk
-       
-         ! for first layer
-         DO j=jj_begin-offset,jj_end+offset
-            DO i=ii_begin-offset,ii_end+offset
-               ij=(j-1)*iim+i
-               pks(ij) = cpp * ( ps(ij)/preff ) ** kappa
-               pk(ij,1) = ( p(ij,1)*pks(ij) - 0.5*alpha(ij,2)*p(ij,2) )     /    &
-                    (  p(ij,1)* (1.+kappa) + 0.5*( beta(ij,2)-(1.+2*kappa) )* p(ij,2) )
-            ENDDO
-         ENDDO
-       
-       ! for other layers
-       
-         DO l = 2, llm
-            DO j=jj_begin-offset,jj_end+offset
-               DO i=ii_begin-offset,ii_end+offset
-                  ij=(j-1)*iim+i
-                  pk(ij,l) = alpha(ij,l) + beta(ij,l) * pk(ij,l-1)
-               ENDDO
-            ENDDO
-         ENDDO
-
-       ENDIF
-
-    ELSE ! Simple calculation of Exner pressure based on centered average
-       ! surface : pks
-       IF (is_omp_level_master) THEN
-
-         DO j=jj_begin-offset,jj_end+offset
-            DO i=ii_begin-offset,ii_end+offset
-               ij=(j-1)*iim+i
-               pks(ij) = cpp * ( ps(ij)/preff ) ** kappa
-            ENDDO
-         ENDDO
-
-       ENDIF
-
-         ! 3D : pk
-       DO l = 1, llm
-          DO j=jj_begin-offset,jj_end+offset
-             DO i=ii_begin-offset,ii_end+offset
-               ij=(j-1)*iim+i
-               pk(ij,l) = cpp * ((.5/preff)*(p(ij,l)+p(ij,l+1))) ** kappa
+    ENDIF
+    
+    ! 3D : pk
+    DO l = 1, llm
+       DO j=jj_begin-offset,jj_end+offset
+          DO i=ii_begin-offset,ii_end+offset
+             ij=(j-1)*iim+i
+             pk(ij,l) = cpp * ((.5/preff)*(p(ij,l)+p(ij,l+1))) ** kappa
              ENDDO
           ENDDO
        ENDDO
-
-    END IF
-    
+       
   END SUBROUTINE compute_exner