Changeset 3507 for palm

Timestamp:

Nov 8, 2018 2:28:46 PM (6 years ago)

Author:

schwenkel

Message:

Minor bugfixes for bcm cache version and initializing prr

File:

• palm/trunk/SOURCE/bulk_cloud_model_mod.f90 (modified) (5 diffs)

palm/trunk/SOURCE/bulk_cloud_model_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Minor bugfixes for bcm cache version and initializing prr
+! 
+! 3452 2018-10-30 13:13:34Z schwenkel
 ! Bugfix for profiles output
 ! 
@@ -958 +961 @@
 !--       Liquid water content and precipitation amount
 !--       are zero at beginning of the simulation
-          IF ( bulk_cloud_model )  THEN
-             ql = 0.0_wp
+          ql = 0.0_wp
 ! TODO ???
-             qc = 0.0_wp
-             precipitation_amount = 0.0_wp
-          ENDIF
+          qc = 0.0_wp
+          precipitation_amount = 0.0_wp
+          prr = 0.0_wp
 
 !
@@ -3469 +3471 @@
 !--       Predetermine flag to mask topography
           flag = MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_0(k,j,i), 0 ) )
-          nc_auto = MERGE ( nc(k,j,i), nc_const, microphysics_morrison )
+          IF ( microphysics_morrison ) THEN
+             nc_auto = nc(k,j,i)
+          ELSE
+             nc_auto = nc_const
+          ENDIF
 
           IF ( qc(k,j,i) > eps_sb  .AND.  nc_auto > eps_mr )  THEN
@@ -3619 +3625 @@
 !--       Predetermine flag to mask topography
           flag = MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_0(k,j,i), 0 ) )
-          nc_accr = MERGE ( nc(k,j,i), nc_const, microphysics_morrison )
+          IF ( microphysics_morrison ) THEN
+             nc_accr = nc(k,j,i)
+          ELSE
+             nc_accr = nc_const
+          ENDIF
 
           IF ( ( qc(k,j,i) > eps_sb )  .AND.  ( qr(k,j,i) > eps_sb )  .AND.  &
@@ -3859 +3869 @@
 !--       Predetermine flag to mask topography
           flag = MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_0(k,j,i), 0 ) )
-          nc_sedi = MERGE( nc(k,j,i), nc_const, microphysics_morrison )
+          IF ( microphysics_morrison ) THEN
+             nc_sedi = nc(k,j,i)
+          ELSE
+             nc_sedi = nc_const
+          ENDIF
 !
 !--       Sedimentation fluxes for number concentration are only calculated