Changeset 1053 for palm/trunk/SOURCE/advec_ws.f90

Timestamp:

Nov 13, 2012 5:11:03 PM (12 years ago)

Author:

hoffmann

Message:

two-moment cloud physics implemented

Location:

palm/trunk

Files:

• . (modified) (1 prop)
• SOURCE (modified) (1 prop)
• SOURCE/advec_ws.f90 (modified) (6 diffs)

palm/trunk/SOURCE/advec_ws.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
+! necessary expansions according to the two new prognostic equations (nr, qr) 
+! of the two-moment cloud physics scheme:
+! +flux_l_*, flux_s_*, diss_l_*, diss_s_*, sums_ws*s_ws_l 
 !
 ! Former revisions:
@@ -210 +213 @@
           ENDIF
 
+          IF ( cloud_physics .AND. icloud_scheme == 0 )  THEN
+             ALLOCATE( sums_wsqrs_ws_l(nzb:nzt+1,0:threads_per_task-1) )
+             ALLOCATE( sums_wsnrs_ws_l(nzb:nzt+1,0:threads_per_task-1) )
+             sums_wsqrs_ws_l = 0.0
+             sums_wsnrs_ws_l = 0.0
+          ENDIF
+
           IF ( ocean )  THEN
              ALLOCATE( sums_wssas_ws_l(nzb:nzt+1,0:threads_per_task-1) )
@@ -253 +263 @@
 
              IF ( humidity .OR. passive_scalar )  THEN
-                ALLOCATE( flux_s_q(nzb+1:nzt,0:threads_per_task-1),         &
+                ALLOCATE( flux_s_q(nzb+1:nzt,0:threads_per_task-1),          &
                           diss_s_q(nzb+1:nzt,0:threads_per_task-1) )
-                ALLOCATE( flux_l_q(nzb+1:nzt,nys:nyn,0:threads_per_task-1), &
+                ALLOCATE( flux_l_q(nzb+1:nzt,nys:nyn,0:threads_per_task-1),  &
                           diss_l_q(nzb+1:nzt,nys:nyn,0:threads_per_task-1) )
              ENDIF
+
+             IF ( cloud_physics .AND. icloud_scheme == 0 )  THEN
+                ALLOCATE( flux_s_qr(nzb+1:nzt,0:threads_per_task-1),         &
+                          diss_s_qr(nzb+1:nzt,0:threads_per_task-1),         &
+                          flux_s_nr(nzb+1:nzt,0:threads_per_task-1),         &
+                          diss_s_nr(nzb+1:nzt,0:threads_per_task-1) )
+                ALLOCATE( flux_l_qr(nzb+1:nzt,nys:nyn,0:threads_per_task-1), &
+                          diss_l_qr(nzb+1:nzt,nys:nyn,0:threads_per_task-1), &
+                          flux_l_nr(nzb+1:nzt,nys:nyn,0:threads_per_task-1), &
+                          diss_l_nr(nzb+1:nzt,nys:nyn,0:threads_per_task-1) ) 
+             END IF
 
              IF ( ocean )  THEN
@@ -297 +318 @@
           sums_wspts_ws_l = 0.0
           IF ( humidity .OR. passive_scalar )  sums_wsqs_ws_l = 0.0
+          IF ( cloud_physics .AND. icloud_scheme == 0 )  THEN
+             sums_wsqrs_ws_l = 0.0
+             sums_wsnrs_ws_l = 0.0
+          ENDIF
           IF ( ocean )  sums_wssas_ws_l = 0.0
 
@@ -307 +332 @@
 ! Scalar advection - Call for grid point i,j
 !------------------------------------------------------------------------------!
-    SUBROUTINE advec_s_ws_ij( i, j, sk, sk_char,swap_flux_y_local,  &
-                              swap_diss_y_local, swap_flux_x_local, &
+    SUBROUTINE advec_s_ws_ij( i, j, sk, sk_char, swap_flux_y_local,  &
+                              swap_diss_y_local, swap_flux_x_local,  &
                               swap_diss_x_local, i_omp, tn )
 
@@ -727 +752 @@
                                  * weight_substep(intermediate_timestep_count)
              ENDDO
+
+          CASE ( 'qr' )
+
+             DO  k = nzb, nzt
+                sums_wsqrs_ws_l(k,tn)  = sums_wsqrs_ws_l(k,tn) +               &
+                                      ( flux_t(k) + diss_t(k) )                &
+                                 * weight_substep(intermediate_timestep_count)
+             ENDDO
+
+          CASE ( 'nr' )
+
+             DO  k = nzb, nzt
+                sums_wsnrs_ws_l(k,tn)  = sums_wsnrs_ws_l(k,tn) +               &
+                                      ( flux_t(k) + diss_t(k) )                &
+                                 * weight_substep(intermediate_timestep_count)
+             ENDDO
+
 
          END SELECT