Changeset 1994 for palm/trunk/SOURCE

Timestamp:

Aug 15, 2016 9:52:21 AM (8 years ago)

Author:

suehring

Message:

Bugfix in definition of generic topography; missing check for microphysics added

Location:

palm/trunk/SOURCE

Files:

• check_parameters.f90 (modified) (2 diffs)
• init_grid.f90 (modified) (3 diffs)

palm/trunk/SOURCE/check_parameters.f90

@@ -19 +19 @@
 ! Current revisions:
 ! -----------------
-! 
+! Add missing check for cloud_physics and cloud_droplets
 ! 
 ! Former revisions:
@@ -973 +973 @@
        CALL message( 'check_parameters', 'PA0029', 1, 2, 0, 6, 0 )
     ENDIF
+!
+!-- Check for proper settings for microphysics 
+    IF ( cloud_physics  .AND.  cloud_droplets )  THEN
+       message_string = 'cloud_physics = .TRUE. is not allowed with ' //  &
+                        'cloud_droplets = .TRUE.'
+       CALL message( 'check_parameters', 'PA0442', 1, 2, 0, 6, 0 )
+    ENDIF
 
 !

palm/trunk/SOURCE/init_grid.f90

@@ -19 +19 @@
 ! Current revisions:
 ! -----------------
-! 
+! Bugfix in definition of generic topography
 ! 
 ! Former revisions:
@@ -642 +642 @@
              nzb_local(MAX(nys,bys):MIN(nyn,byn),MAX(nxl,bxl):MIN(nxr,bxr)) = bh
 
+          CALL exchange_horiz_2d_int( nzb_local, nys, nyn, nxl, nxr, nbgp )
+
        CASE ( 'single_street_canyon' )
 !
@@ -715 +717 @@
                 nzb_local(MAX(nys,cys+1):MIN(nyn,cyn-1),:) = 0
           ENDIF
+
+          CALL exchange_horiz_2d_int( nzb_local, nys, nyn, nxl, nxr, nbgp )
 
        CASE ( 'read_from_file' )