Changeset 2037 for palm/trunk/SOURCE/pres.f90

Timestamp:

Oct 26, 2016 11:15:40 AM (8 years ago)

Author:

knoop

Message:

Anelastic approximation implemented

File:

• palm/trunk/SOURCE/pres.f90 (modified) (6 diffs)

palm/trunk/SOURCE/pres.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-! 
+! Anelastic approximation implemented
 ! 
 ! Former revisions:
@@ -128 +128 @@
 
     USE arrays_3d,                                                             &
-        ONLY:  d, ddzu, ddzu_pres, ddzw, dzw, p, p_loc, tend, u, v, w
+        ONLY:  d, ddzu, ddzu_pres, ddzw, dzw, p, p_loc, rho_air, rho_air_zw,   &
+               tend, u, v, w
 
     USE control_parameters,                                                    &
@@ -399 +400 @@
        DO  j = nys, nyn
           DO  k = nzb_s_inner(j,i)+1, nzt
-             d(k,j,i) = ( ( u(k,j,i+1) - u(k,j,i) ) * ddx + &
-                          ( v(k,j+1,i) - v(k,j,i) ) * ddy + &
-                          ( w(k,j,i) - w(k-1,j,i) ) * ddzw(k) ) * ddt_3d      &
-                                                                * d_weight_pres 
+             d(k,j,i) = ( ( u(k,j,i+1) - u(k,j,i) ) * rho_air(k) * ddx +       &
+                          ( v(k,j+1,i) - v(k,j,i) ) * rho_air(k) * ddy +       &
+                          ( w(k,j,i)   * rho_air_zw(k) -                       &
+                            w(k-1,j,i) * rho_air_zw(k-1) ) * ddzw(k)           &
+                        ) * ddt_3d * d_weight_pres 
           ENDDO
 !
@@ -427 +429 @@
        DO  j = nys, nyn
           DO  k = 1, nzt
-             d(k,j,i) = ( ( u(k,j,i+1) - u(k,j,i) ) * ddx +             &
-                        ( v(k,j+1,i) - v(k,j,i) ) * ddy +               &
-                        ( w(k,j,i) - w(k-1,j,i) ) * ddzw(k) ) * ddt_3d  &
-                        * d_weight_pres * rflags_s_inner(k,j,i)
+             d(k,j,i) = ( ( u(k,j,i+1) - u(k,j,i) ) * rho_air(k) * ddx +       &
+                          ( v(k,j+1,i) - v(k,j,i) ) * rho_air(k) * ddy +       &
+                          ( w(k,j,i)   * rho_air_zw(k) -                       &
+                            w(k-1,j,i) * rho_air_zw(k-1) ) * ddzw(k)           &
+                        ) * ddt_3d * d_weight_pres * rflags_s_inner(k,j,i)
           ENDDO
        ENDDO
@@ -808 +811 @@
           DO  j = nys, nyn
              DO  k = nzb_s_inner(j,i)+1, nzt
-                d(k,j,i) = ( u(k,j,i+1) - u(k,j,i) ) * ddx +                   &
-                           ( v(k,j+1,i) - v(k,j,i) ) * ddy +                   &
-                           ( w(k,j,i) - w(k-1,j,i) ) * ddzw(k)
+             d(k,j,i) = ( u(k,j,i+1) - u(k,j,i) ) * rho_air(k) * ddx +         &
+                        ( v(k,j+1,i) - v(k,j,i) ) * rho_air(k) * ddy +         &
+                        ( w(k,j,i)   * rho_air_zw(k) -                         &
+                          w(k-1,j,i) * rho_air_zw(k-1) ) * ddzw(k)
              ENDDO
              DO  k = nzb+1, nzt
@@ -823 +827 @@
           DO  j = nys, nyn
              DO  k = 1, nzt
-                   d(k,j,i) = ( ( u(k,j,i+1) - u(k,j,i) ) * ddx +              &
-                                ( v(k,j+1,i) - v(k,j,i) ) * ddy +              &
-                                ( w(k,j,i) - w(k-1,j,i) ) * ddzw(k)            &
-                              ) * rflags_s_inner(k,j,i)
+                d(k,j,i) = ( ( u(k,j,i+1) - u(k,j,i) ) * rho_air(k) * ddx +    &
+                             ( v(k,j+1,i) - v(k,j,i) ) * rho_air(k) * ddy +    &
+                             ( w(k,j,i)   * rho_air_zw(k) -                    &
+                               w(k-1,j,i) * rho_air_zw(k-1) ) * ddzw(k)        &
+                           ) * rflags_s_inner(k,j,i)
              ENDDO
           ENDDO