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

Timestamp:

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

Author:

knoop

Message:

Anelastic approximation implemented

File:

• palm/trunk/SOURCE/tridia_solver_mod.f90 (modified) (8 diffs)

palm/trunk/SOURCE/tridia_solver_mod.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-! 
+! Anelastic approximation implemented
 ! 
 ! Former revisions:
@@ -129 +129 @@
 
        USE arrays_3d,                                                          &
-           ONLY:  ddzu_pres, ddzw
+           ONLY:  ddzu_pres, ddzw, rho_air_zw
 
        USE kinds
@@ -140 +140 @@
 
        DO  k = 0, nz-1
-          ddzuw(k,1) = ddzu_pres(k+1) * ddzw(k+1)
-          ddzuw(k,2) = ddzu_pres(k+2) * ddzw(k+1)
+          ddzuw(k,1) = ddzu_pres(k+1) * ddzw(k+1) * rho_air_zw(k)
+          ddzuw(k,2) = ddzu_pres(k+2) * ddzw(k+1) * rho_air_zw(k+1)
           ddzuw(k,3) = -1.0_wp * &
-                       ( ddzu_pres(k+2) * ddzw(k+1) + ddzu_pres(k+1) * ddzw(k+1) )
+                       ( ddzu_pres(k+2) * ddzw(k+1) * rho_air_zw(k+1) +        &
+                         ddzu_pres(k+1) * ddzw(k+1) * rho_air_zw(k) )
        ENDDO
 !
@@ -168 +169 @@
 
           USE arrays_3d,                                                       &
-              ONLY:  tric
+              ONLY:  tric, rho_air
 
           USE constants,                                                       &
@@ -231 +232 @@
              DO  j = nys_z, nyn_z
                 DO  i = nxl_z, nxr_z
-                   tric(i,j,k) = ddzuw(k,3) - ll(i,j)
+                   tric(i,j,k) = ddzuw(k,3) - ll(i,j) * rho_air(k+1)
                 ENDDO
              ENDDO
@@ -491 +492 @@
 
        USE arrays_3d,                                                          &
-           ONLY:  ddzu_pres, ddzw
+           ONLY:  ddzu_pres, ddzw, rho_air, rho_air_zw
 
        USE control_parameters,                                                 &
@@ -526 +527 @@
        DO  k = 0, nz-1
           DO  i = 0,nx
-             tri_for_1d(2,i,k) = ddzu_pres(k+1) * ddzw(k+1)
-             tri_for_1d(3,i,k) = ddzu_pres(k+2) * ddzw(k+1)
+             tri_for_1d(2,i,k) = ddzu_pres(k+1) * ddzw(k+1) * rho_air_zw(k)
+             tri_for_1d(3,i,k) = ddzu_pres(k+2) * ddzw(k+1) * rho_air_zw(k+1)
           ENDDO
        ENDDO
@@ -591 +592 @@
           DO  k = 0, nz-1
              DO  i = 0, nx
-                a = -1.0_wp * ddzu_pres(k+2) * ddzw(k+1)
-                c = -1.0_wp * ddzu_pres(k+1) * ddzw(k+1)
-                tri_for_1d(1,i,k) = a + c - l(i)
+                a = -1.0_wp * ddzu_pres(k+2) * ddzw(k+1) * rho_air_zw(k+1)
+                c = -1.0_wp * ddzu_pres(k+1) * ddzw(k+1) * rho_air_zw(k)
+                tri_for_1d(1,i,k) = a + c - l(i) * rho_air(k+1)
              ENDDO
           ENDDO