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

Timestamp:

Mar 26, 2013 6:16:16 PM (11 years ago)

Author:

hoffmann

Message:

optimization of two-moments cloud physics

File:

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

palm/trunk/SOURCE/advec_ws.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
+! calculation of qr and nr is restricted to precipitation
 !
 ! Former revisions:
@@ -210 +211 @@
           sums_wspts_ws_l = 0.0
 
-          IF ( humidity .OR. passive_scalar )  THEN
+          IF ( humidity  .OR.  passive_scalar )  THEN
              ALLOCATE( sums_wsqs_ws_l(nzb:nzt+1,0:threads_per_task-1) )
              sums_wsqs_ws_l = 0.0
           ENDIF
 
-          IF ( cloud_physics .AND. icloud_scheme == 0 )  THEN
+          IF ( cloud_physics  .AND.  icloud_scheme == 0  .AND.  &
+               precipitation )  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) )
@@ -264 +266 @@
                        diss_l_e(nzb+1:nzt,nys:nyn,0:threads_per_task-1) )
 
-             IF ( humidity .OR. passive_scalar )  THEN
+             IF ( humidity  .OR.  passive_scalar )  THEN
                 ALLOCATE( flux_s_q(nzb+1:nzt,0:threads_per_task-1),          &
                           diss_s_q(nzb+1:nzt,0:threads_per_task-1) )
@@ -271 +273 @@
              ENDIF
 
-             IF ( cloud_physics .AND. icloud_scheme == 0 )  THEN
+             IF ( cloud_physics  .AND.  icloud_scheme == 0  .AND.            &
+                  precipitation )  THEN
                 ALLOCATE( flux_s_qr(nzb+1:nzt,0:threads_per_task-1),         &
                           diss_s_qr(nzb+1:nzt,0:threads_per_task-1),         &
@@ -280 +283 @@
                           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
+             ENDIF
 
              IF ( ocean )  THEN
@@ -297 +300 @@
 
 !------------------------------------------------------------------------------!
-! Initialize variables used for storing statistic qauntities (fluxes, variances)
+! Initialize variables used for storing statistic quantities (fluxes, variances)
 !------------------------------------------------------------------------------!
     SUBROUTINE ws_statistics
@@ -319 +322 @@
        IF ( ws_scheme_sca )  THEN
           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
+          IF ( humidity  .OR.  passive_scalar )  sums_wsqs_ws_l = 0.0
+          IF ( cloud_physics  .AND.  icloud_scheme == 0  .AND.  &
+               precipitation )  THEN
              sums_wsqrs_ws_l = 0.0
              sums_wsnrs_ws_l = 0.0
@@ -770 +774 @@
                                  * weight_substep(intermediate_timestep_count)
              ENDDO
-
 
          END SELECT