Changeset 3274 for palm/trunk/SOURCE/boundary_conds.f90

Timestamp:

Sep 24, 2018 3:42:55 PM (6 years ago)

Author:

knoop

Message:

Modularization of all bulk cloud physics code components

File:

• palm/trunk/SOURCE/boundary_conds.f90 (modified) (10 diffs)

palm/trunk/SOURCE/boundary_conds.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3241 2018-09-12 15:02:00Z raasch
 ! unused variables removed
 ! 
@@ -197 +200 @@
                w, w_p, w_m_l, w_m_n, w_m_r, w_m_s
 
+    USE basic_constants_and_equations_mod,                                     &
+        ONLY:  kappa
+
     USE chemistry_model_mod,                                                   &
         ONLY:  chem_boundary_conds 
@@ -204 +210 @@
                bc_dirichlet_s, bc_radiation_l, bc_radiation_n, bc_radiation_r, &
                bc_radiation_s, bc_pt_t_val, bc_q_t_val, bc_s_t_val,            &
-               child_domain, constant_diffusion, cloud_physics, coupling_mode, &
+               child_domain, constant_diffusion, coupling_mode, &
                dt_3d, humidity, ibc_pt_b, ibc_pt_t, ibc_q_b, ibc_q_t, ibc_s_b, &
                ibc_s_t,ibc_sa_t, ibc_uv_b, ibc_uv_t,                           &
-               intermediate_timestep_count, kappa,                             &
-               microphysics_morrison, microphysics_seifert,                    &
+               intermediate_timestep_count,                                    &
                nesting_offline, nudging,                                       &
                ocean, passive_scalar, rans_mode, rans_tke_e, tsc, use_cmax
@@ -220 +225 @@
 
     USE kinds
+
+    USE bulk_cloud_model_mod,                                                  &
+        ONLY: bulk_cloud_model, microphysics_morrison, microphysics_seifert
 
     USE pegrid
@@ -597 +605 @@
        ENDIF
 
-       IF ( cloud_physics  .AND.  microphysics_morrison )  THEN
+       IF ( bulk_cloud_model  .AND.  microphysics_morrison )  THEN
 !             
 !--       Surface conditions cloud water (Dirichlet)
@@ -618 +626 @@
        ENDIF
 
-       IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
+       IF ( bulk_cloud_model  .AND.  microphysics_seifert )  THEN
 !             
 !--       Surface conditions rain water (Dirichlet)
@@ -736 +744 @@
        IF ( humidity )  THEN
           q_p(:,nys-1,:) = q_p(:,nys,:)
-          IF ( cloud_physics  .AND.  microphysics_morrison )  THEN
+          IF ( bulk_cloud_model  .AND.  microphysics_morrison )  THEN
              qc_p(:,nys-1,:) = qc_p(:,nys,:)
              nc_p(:,nys-1,:) = nc_p(:,nys,:)
           ENDIF
-          IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
+          IF ( bulk_cloud_model  .AND.  microphysics_seifert )  THEN
              qr_p(:,nys-1,:) = qr_p(:,nys,:)
              nr_p(:,nys-1,:) = nr_p(:,nys,:)
@@ -752 +760 @@
        IF ( humidity )  THEN
           q_p(:,nyn+1,:) = q_p(:,nyn,:)
-          IF ( cloud_physics  .AND.  microphysics_morrison )  THEN
+          IF ( bulk_cloud_model  .AND.  microphysics_morrison )  THEN
              qc_p(:,nyn+1,:) = qc_p(:,nyn,:)
              nc_p(:,nyn+1,:) = nc_p(:,nyn,:)
           ENDIF
-          IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
+          IF ( bulk_cloud_model  .AND.  microphysics_seifert )  THEN
              qr_p(:,nyn+1,:) = qr_p(:,nyn,:)
              nr_p(:,nyn+1,:) = nr_p(:,nyn,:)
@@ -768 +776 @@
        IF ( humidity )  THEN
           q_p(:,:,nxl-1) = q_p(:,:,nxl)
-          IF ( cloud_physics  .AND.  microphysics_morrison )  THEN
+          IF ( bulk_cloud_model  .AND.  microphysics_morrison )  THEN
              qc_p(:,:,nxl-1) = qc_p(:,:,nxl)
              nc_p(:,:,nxl-1) = nc_p(:,:,nxl)
           ENDIF
-          IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
+          IF ( bulk_cloud_model  .AND.  microphysics_seifert )  THEN
              qr_p(:,:,nxl-1) = qr_p(:,:,nxl)
              nr_p(:,:,nxl-1) = nr_p(:,:,nxl)
@@ -784 +792 @@
        IF ( humidity )  THEN
           q_p(:,:,nxr+1) = q_p(:,:,nxr)
-          IF ( cloud_physics  .AND.  microphysics_morrison )  THEN
+          IF ( bulk_cloud_model  .AND.  microphysics_morrison )  THEN
              qc_p(:,:,nxr+1) = qc_p(:,:,nxr)
              nc_p(:,:,nxr+1) = nc_p(:,:,nxr)
           ENDIF
-          IF ( cloud_physics  .AND.  microphysics_seifert )  THEN
+          IF ( bulk_cloud_model  .AND.  microphysics_seifert )  THEN
              qr_p(:,:,nxr+1) = qr_p(:,:,nxr)
              nr_p(:,:,nxr+1) = nr_p(:,:,nxr)