Changeset 2031 for palm/trunk/SOURCE/production_e.f90

Timestamp:

Oct 21, 2016 3:11:58 PM (8 years ago)

Author:

knoop

Message:

Renamed variable rho to rho_ocean, rho_init to rho_ocean_init and rho_av to rho_ocean_av

File:

• palm/trunk/SOURCE/production_e.f90 (modified) (11 diffs)

palm/trunk/SOURCE/production_e.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! renamed variable rho to rho_ocean
 ! 
 ! Former revisions:
@@ -136 +136 @@
 
        USE arrays_3d,                                                          &
-           ONLY:  ddzw, dd2zu, kh, km, pt, q, ql, qsws, qswst, rho, shf,       &
+           ONLY:  ddzw, dd2zu, kh, km, pt, q, ql, qsws, qswst, rho_ocean, shf,       &
                   tend, tswst, u, v, vpt, w
 
@@ -537 +537 @@
                             tend(k,j,i) = tend(k,j,i) +                     &
                                           kh(k,j,i) * g / rho_reference *   &
-                                          ( rho(k+1,j,i) - rho(k-1,j,i) ) * &
+                                          ( rho_ocean(k+1,j,i) - rho_ocean(k-1,j,i) ) * &
                                           dd2zu(k)
                          ENDDO
@@ -576 +576 @@
                          DO  k = nzb_s_inner(j,i)+1, nzt
                             tend(k,j,i) = tend(k,j,i) +                     &
-                                          kh(k,j,i) * g / rho(k,j,i) *      &
-                                          ( rho(k+1,j,i) - rho(k-1,j,i) ) * &
+                                          kh(k,j,i) * g / rho_ocean(k,j,i) *      &
+                                          ( rho_ocean(k+1,j,i) - rho_ocean(k-1,j,i) ) * &
                                           dd2zu(k)
                          ENDDO
@@ -742 +742 @@
 
        USE arrays_3d,                                                          &
-           ONLY:  ddzw, dd2zu, kh, km, pt, q, ql, qsws, qswst, rho, shf,       &
+           ONLY:  ddzw, dd2zu, kh, km, pt, q, ql, qsws, qswst, rho_ocean, shf,       &
                   tend, tswst, u, v, vpt, w
 
@@ -806 +806 @@
 !--    Calculate TKE production by shear
        !$acc kernels present( ddzw, dd2zu, kh, km, nzb_diff_s_inner, nzb_diff_s_outer ) &
-       !$acc         present( nzb_s_inner, pt, q, ql, qsws, qswst, rho )                &
+       !$acc         present( nzb_s_inner, pt, q, ql, qsws, qswst, rho_ocean )                &
        !$acc         present( shf, tend, tswst, u, v, vpt, w, wall_e_x, wall_e_y )      &
        !$acc         copyin( u_0, v_0 )
@@ -1166 +1166 @@
                                tend(k,j,i) = tend(k,j,i) +                     &
                                              kh(k,j,i) * g / rho_reference *   &
-                                             ( rho(k+1,j,i) - rho(k-1,j,i) ) * &
+                                             ( rho_ocean(k+1,j,i) - rho_ocean(k-1,j,i) ) * &
                                              dd2zu(k)
                             ENDIF
@@ -1212 +1212 @@
                             IF ( k > nzb_s_inner(j,i) )  THEN
                                tend(k,j,i) = tend(k,j,i) +                     &
-                                             kh(k,j,i) * g / rho(k,j,i) *      &
-                                             ( rho(k+1,j,i) - rho(k-1,j,i) ) * &
+                                             kh(k,j,i) * g / rho_ocean(k,j,i) *      &
+                                             ( rho_ocean(k+1,j,i) - rho_ocean(k-1,j,i) ) * &
                                              dd2zu(k)
                             ENDIF
@@ -1410 +1410 @@
 
        USE arrays_3d,                                                          &
-           ONLY:  ddzw, dd2zu, kh, km, pt, q, ql, qsws, qswst, rho, shf,       &
+           ONLY:  ddzw, dd2zu, kh, km, pt, q, ql, qsws, qswst, rho_ocean, shf,       &
                   tend, tswst, u, v, vpt, w
 
@@ -1766 +1766 @@
                       tend(k,j,i) = tend(k,j,i) +                   &
                                     kh(k,j,i) * g / rho_reference * &
-                                    ( rho(k+1,j,i) - rho(k-1,j,i) ) * dd2zu(k)
+                                    ( rho_ocean(k+1,j,i) - rho_ocean(k-1,j,i) ) * dd2zu(k)
                    ENDDO
 
@@ -1797 +1797 @@
                    DO  k = nzb_s_inner(j,i)+1, nzt
                       tend(k,j,i) = tend(k,j,i) +                &
-                                    kh(k,j,i) * g / rho(k,j,i) * &
-                                    ( rho(k+1,j,i) - rho(k-1,j,i) ) * dd2zu(k)
+                                    kh(k,j,i) * g / rho_ocean(k,j,i) * &
+                                    ( rho_ocean(k+1,j,i) - rho_ocean(k-1,j,i) ) * dd2zu(k)
                    ENDDO