Index: palm/trunk/SOURCE/advec_ws.f90
===================================================================
--- palm/trunk/SOURCE/advec_ws.f90	(revision 3864)
+++ palm/trunk/SOURCE/advec_ws.f90	(revision 3870)
@@ -25,4 +25,7 @@
 ! -----------------
 ! $Id$
+! Moving initialization of bcm specific flux arrays into bulk_cloud_model_mod
+! 
+! 3864 2019-04-05 09:01:56Z monakurppa
 ! Remove tailing white spaces
 ! 
@@ -325,14 +328,14 @@
 
        USE arrays_3d,                                                          &
-           ONLY:  diss_l_diss, diss_l_e, diss_l_nc, diss_l_nr, diss_l_pt,      &
-                  diss_l_q, diss_l_qc, diss_l_qr, diss_l_s, diss_l_sa,         &
+           ONLY:  diss_l_diss, diss_l_e, diss_l_pt,      &
+                  diss_l_q, diss_l_s, diss_l_sa,         &
                   diss_l_u, diss_l_v, diss_l_w, flux_l_diss, flux_l_e,         & 
-                  flux_l_nc, flux_l_nr, flux_l_pt, flux_l_q, flux_l_qc,        &
-                  flux_l_qr, flux_l_s, flux_l_sa, flux_l_u, flux_l_v,          &
-                  flux_l_w, diss_s_diss, diss_s_e, diss_s_nc,  diss_s_nr,      &
-                  diss_s_pt, diss_s_q, diss_s_qc, diss_s_qr, diss_s_s,         &
+                  flux_l_pt, flux_l_q,      &
+                  flux_l_s, flux_l_sa, flux_l_u, flux_l_v,          &
+                  flux_l_w, diss_s_diss, diss_s_e,      &
+                  diss_s_pt, diss_s_q, diss_s_s,         &
                   diss_s_sa, diss_s_u, diss_s_v,  diss_s_w, flux_s_diss,       &
-                  flux_s_e, flux_s_nc, flux_s_nr, flux_s_pt, flux_s_q,         &
-                  flux_s_qc, flux_s_qr, flux_s_s, flux_s_sa, flux_s_u,         &
+                  flux_s_e, flux_s_pt, flux_s_q,         &
+                  flux_s_s, flux_s_sa, flux_s_u,         &
                   flux_s_v, flux_s_w
 
@@ -346,7 +349,4 @@
        USE kinds
 
-       USE bulk_cloud_model_mod,                                               &
-           ONLY: bulk_cloud_model, microphysics_morrison, microphysics_seifert
-
        USE pegrid
 
@@ -355,7 +355,7 @@
 
        USE statistics,                                                         &
-           ONLY:  sums_us2_ws_l, sums_vs2_ws_l, sums_ws2_ws_l, sums_wsncs_ws_l,& 
-                  sums_wsnrs_ws_l,sums_wspts_ws_l, sums_wsqcs_ws_l,            &
-                  sums_wsqrs_ws_l, sums_wsqs_ws_l, sums_wsss_ws_l,             &
+           ONLY:  sums_us2_ws_l, sums_vs2_ws_l, sums_ws2_ws_l,&
+                  sums_wspts_ws_l,            &
+                  sums_wsqs_ws_l, sums_wsss_ws_l,             &
                   sums_wssas_ws_l,  sums_wsss_ws_l, sums_wsus_ws_l,            &
                   sums_wsvs_ws_l
@@ -397,22 +397,8 @@
              sums_wsqs_ws_l = 0.0_wp
           ENDIF
-          
+
           IF ( passive_scalar )  THEN
              ALLOCATE( sums_wsss_ws_l(nzb:nzt+1,0:threads_per_task-1) )
              sums_wsss_ws_l = 0.0_wp
-          ENDIF
-
-          IF ( bulk_cloud_model  .AND.  microphysics_morrison )  THEN
-             ALLOCATE( sums_wsqcs_ws_l(nzb:nzt+1,0:threads_per_task-1) )
-             ALLOCATE( sums_wsncs_ws_l(nzb:nzt+1,0:threads_per_task-1) )
-             sums_wsqcs_ws_l = 0.0_wp
-             sums_wsncs_ws_l = 0.0_wp
-          ENDIF
-
-          IF ( bulk_cloud_model  .AND.  microphysics_seifert )  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_wp
-             sums_wsnrs_ws_l = 0.0_wp
           ENDIF
 
@@ -477,5 +463,5 @@
                           diss_l_q(nzb+1:nzt,nys:nyn,0:threads_per_task-1) )
              ENDIF
-             
+
              IF ( passive_scalar )  THEN
                 ALLOCATE( flux_s_s(nzb+1:nzt,0:threads_per_task-1),            &
@@ -483,26 +469,4 @@
                 ALLOCATE( flux_l_s(nzb+1:nzt,nys:nyn,0:threads_per_task-1),    &
                           diss_l_s(nzb+1:nzt,nys:nyn,0:threads_per_task-1) )
-             ENDIF
-
-             IF ( bulk_cloud_model  .AND.  microphysics_morrison )  THEN
-                ALLOCATE( flux_s_qc(nzb+1:nzt,0:threads_per_task-1),           &
-                          diss_s_qc(nzb+1:nzt,0:threads_per_task-1),           &
-                          flux_s_nc(nzb+1:nzt,0:threads_per_task-1),           &
-                          diss_s_nc(nzb+1:nzt,0:threads_per_task-1) )
-                ALLOCATE( flux_l_qc(nzb+1:nzt,nys:nyn,0:threads_per_task-1),   &
-                          diss_l_qc(nzb+1:nzt,nys:nyn,0:threads_per_task-1),   &
-                          flux_l_nc(nzb+1:nzt,nys:nyn,0:threads_per_task-1),   &
-                          diss_l_nc(nzb+1:nzt,nys:nyn,0:threads_per_task-1) ) 
-             ENDIF                  
-
-             IF ( bulk_cloud_model  .AND.  microphysics_seifert )  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) ) 
              ENDIF
 
@@ -1140,8 +1104,5 @@
                   ws_scheme_sca, salsa
 
-       USE kinds  
-
-       USE bulk_cloud_model_mod,                                               &
-           ONLY: bulk_cloud_model, microphysics_morrison, microphysics_seifert
+       USE kinds
 
        USE salsa_util_mod,                                                     &
@@ -1149,7 +1110,7 @@
 
        USE statistics,                                                         &
-           ONLY:  sums_us2_ws_l, sums_vs2_ws_l, sums_ws2_ws_l, sums_wsncs_ws_l,&
-                  sums_wsnrs_ws_l, sums_wspts_ws_l, sums_wsqcs_ws_l,           &
-                  sums_wsqrs_ws_l, sums_wsqs_ws_l, sums_wsss_ws_l,             &
+           ONLY:  sums_us2_ws_l, sums_vs2_ws_l, sums_ws2_ws_l, &
+                  sums_wspts_ws_l,           &
+                  sums_wsqs_ws_l, sums_wsss_ws_l,             &
                   sums_wssas_ws_l, sums_wsus_ws_l, sums_wsvs_ws_l
                    
@@ -1177,12 +1138,4 @@
           IF ( humidity       )  sums_wsqs_ws_l = 0.0_wp
           IF ( passive_scalar )  sums_wsss_ws_l = 0.0_wp
-          IF ( bulk_cloud_model  .AND.  microphysics_morrison )  THEN
-             sums_wsqcs_ws_l = 0.0_wp
-             sums_wsncs_ws_l = 0.0_wp
-          ENDIF
-          IF ( bulk_cloud_model  .AND.  microphysics_seifert )  THEN
-             sums_wsqrs_ws_l = 0.0_wp
-             sums_wsnrs_ws_l = 0.0_wp
-          ENDIF
           IF ( ocean_mode )  sums_wssas_ws_l = 0.0_wp
           IF ( salsa )       sums_salsa_ws_l = 0.0_wp
