Changeset 167 for codes/icosagcm/trunk/src/dissip_gcm.f90

Timestamp:

06/29/13 02:35:03 (11 years ago)

Author:

dubos

Message:

Multi-layer Saint-Venant / Ripa equations - tested with Williamson91.5 & JW06

File:

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

codes/icosagcm/trunk/src/dissip_gcm.f90

@@ -27 +27 @@
   REAL, save    :: rayleigh_tau
   
-!  INTEGER,SAVE :: itau_dissip
   REAL,SAVE    :: dtdissip
  
@@ -368 +367 @@
     fact=2
     DO l=1,llm
-       zz= 1. - preff/presnivs(l)
+       IF(ap_bp_present) THEN ! height-dependent dissipation
+          zz= 1. - preff/presnivs(l)
+       ELSE
+          zz = 0.
+       END IF
        zvert=fact-(fact-1)/(1+zz*zz)
        tau_graddiv(l) = tau_graddiv(l)/zvert
@@ -390 +393 @@
  
   
-  SUBROUTINE dissip(f_ue,f_due,f_ps,f_phis,f_theta_rhodz,f_dtheta_rhodz)
+  SUBROUTINE dissip(f_ue,f_due,f_mass,f_phis,f_theta_rhodz,f_dtheta_rhodz)
   USE icosa
   USE theta2theta_rhodz_mod
@@ -402 +405 @@
     TYPE(t_field),POINTER :: f_ue(:)
     TYPE(t_field),POINTER :: f_due(:)
-    TYPE(t_field),POINTER :: f_ps(:), f_phis(:)
+    TYPE(t_field),POINTER :: f_mass(:), f_phis(:)
     TYPE(t_field),POINTER :: f_theta_rhodz(:)
     TYPE(t_field),POINTER :: f_dtheta_rhodz(:)
@@ -421 +424 @@
     CALL gradiv(f_ue,f_due_diss1)
     CALL gradrot(f_ue,f_due_diss2)
-    
-    CALL divgrad_theta_rhodz(f_ps,f_theta_rhodz,f_dtheta_rhodz_diss)
+
+    CALL divgrad_theta_rhodz(f_mass,f_theta_rhodz,f_dtheta_rhodz_diss)
     
 ! later for openmp    
@@ -646 +649 @@
   END SUBROUTINE divgrad
    
-  SUBROUTINE divgrad_theta_rhodz(f_ps,f_theta_rhodz,f_dtheta_rhodz)
+  SUBROUTINE divgrad_theta_rhodz(f_mass,f_theta_rhodz,f_dtheta_rhodz)
   USE icosa
   USE trace
   USE omp_para
-  USE disvert_mod
   IMPLICIT NONE
-    TYPE(t_field),POINTER :: f_ps(:)
+    TYPE(t_field),POINTER :: f_mass(:)
     TYPE(t_field),POINTER :: f_theta_rhodz(:)
     TYPE(t_field),POINTER :: f_dtheta_rhodz(:)
     
-    REAL(rstd),POINTER :: ps(:)
+    REAL(rstd),POINTER :: mass(:,:)
     REAL(rstd),POINTER :: theta_rhodz(:,:)
     REAL(rstd),POINTER :: dtheta_rhodz(:,:)
@@ -668 +670 @@
       CALL swap_dimensions(ind)
       CALL swap_geometry(ind)
-      ps=f_ps(ind)
+      mass=f_mass(ind)
       theta_rhodz=f_theta_rhodz(ind)
       dtheta_rhodz=f_dtheta_rhodz(ind) 
@@ -675 +677 @@
           DO i=ii_begin,ii_end
             ij=(j-1)*iim+i
-            dtheta_rhodz(ij,l) = theta_rhodz(ij,l) / ( ap(l)-ap(l+1) + (bp(l)-bp(l+1))*ps(ij))/g
+            dtheta_rhodz(ij,l) = theta_rhodz(ij,l) / mass(ij,l)
           ENDDO
         ENDDO
@@ -703 +705 @@
           DO i=ii_begin,ii_end
             ij=(j-1)*iim+i
-            dtheta_rhodz(ij,l) = dtheta_rhodz(ij,l) * ( ap(l)-ap(l+1) + (bp(l)-bp(l+1))*ps(ij))/g
+            dtheta_rhodz(ij,l) = dtheta_rhodz(ij,l) * mass(ij,l)
           ENDDO
         ENDDO