Changeset 3274 for palm/trunk/SOURCE/average_3d_data.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/average_3d_data.f90 (modified) (7 diffs)

palm/trunk/SOURCE/average_3d_data.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Modularization of all bulk cloud physics code components
+! 
+! 3004 2018-04-27 12:33:25Z Giersch
 ! Further allocation checks implemented, case z0q* added
 ! 
@@ -138 +141 @@
     USE averaging
 
+    USE bulk_cloud_model_mod,                                                  &
+        ONLY:  bulk_cloud_model, bcm_3d_data_averaging
+
     USE chemistry_model_mod,                                                   &
         ONLY:  chem_3d_data_averaging
@@ -255 +261 @@
              ENDIF
 
-          CASE ( 'nc' )
-             IF ( ALLOCATED( nc_av ) ) THEN
-                DO  i = nxlg, nxrg
-                   DO  j = nysg, nyng
-                      DO  k = nzb, nzt+1
-                         nc_av(k,j,i) = nc_av(k,j,i) / REAL( average_count_3d, KIND=wp )
-                      ENDDO
-                   ENDDO
-                ENDDO
-             ENDIF
-
-          CASE ( 'nr' )
-             IF ( ALLOCATED( nr_av ) ) THEN
-                DO  i = nxlg, nxrg
-                   DO  j = nysg, nyng
-                      DO  k = nzb, nzt+1
-                         nr_av(k,j,i) = nr_av(k,j,i) / REAL( average_count_3d, KIND=wp )
-                      ENDDO
-                   ENDDO
-                ENDDO
-             ENDIF
-
          CASE ( 'ol*' )
              IF ( ALLOCATED( ol_av ) ) THEN
@@ -320 +304 @@
              ENDIF
 
-          CASE ( 'prr' )
-             IF ( ALLOCATED( prr_av ) ) THEN
-                DO  i = nxlg, nxrg
-                   DO  j = nysg, nyng
-                      DO  k = nzb, nzt+1
-                         prr_av(k,j,i) = prr_av(k,j,i) / REAL( average_count_3d, KIND=wp )
-                      ENDDO
-                   ENDDO
-                ENDDO
-             ENDIF
-
           CASE ( 'pt' )
              IF ( ALLOCATED( pt_av ) ) THEN
@@ -353 +326 @@
              ENDIF
 
-          CASE ( 'qc' )
-             IF ( ALLOCATED( qc_av ) ) THEN
-                DO  i = nxlg, nxrg
-                   DO  j = nysg, nyng
-                      DO  k = nzb, nzt+1
-                         qc_av(k,j,i) = qc_av(k,j,i) / REAL( average_count_3d, KIND=wp )
-                      ENDDO
-                   ENDDO
-                ENDDO
-             ENDIF
-
           CASE ( 'ql' )
              IF ( ALLOCATED( ql_av ) ) THEN
@@ -404 +366 @@
                          ql_vp_av(k,j,i) = ql_vp_av(k,j,i) /                      &
                                            REAL( average_count_3d, KIND=wp )
-                      ENDDO
-                   ENDDO
-                ENDDO
-             ENDIF
-
-          CASE ( 'qr' )
-             IF ( ALLOCATED( qr_av ) ) THEN
-                DO  i = nxlg, nxrg
-                   DO  j = nysg, nyng
-                      DO  k = nzb, nzt+1
-                         qr_av(k,j,i) = qr_av(k,j,i) / REAL( average_count_3d, KIND=wp )
                       ENDDO
                    ENDDO
@@ -607 +558 @@
 !--          Turbulence closure module
              CALL tcm_3d_data_averaging( 'average', doav(ii) )
-
+!
+!--          microphysics module quantities
+             IF ( bulk_cloud_model )  THEN
+                CALL bcm_3d_data_averaging( 'average', doav(ii) )
+             ENDIF
 !
 !--          Land surface quantity