Changeset 2826 for palm/trunk/SOURCE

Timestamp:

Feb 21, 2018 12:39:28 PM (6 years ago)

Author:

hellstea

Message:

Bugfix in setting the default boundary conditions for nest domains

File:

• palm/trunk/SOURCE/parin.f90 (modified) (2 diffs)

palm/trunk/SOURCE/parin.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Bugfix in setting the default boundary conditions for nest domains
+! 
+! 2817 2018-02-19 16:32:21Z knoop
 ! Preliminary gust module interface implemented
 ! 
@@ -615 +618 @@
 !
 !--       In case of nested runs, explicitly set nesting boundary conditions. 
-!--       This will overwrite the user settings. bc_lr and bc_ns always need
-!--       to be cyclic for vertical nesting.
-          IF ( nesting_mode == 'vertical' )  THEN
-             IF (bc_lr /= 'cyclic' .OR. bc_ns /= 'cyclic' )  THEN
-                WRITE ( message_string, *)  'bc_lr and bc_ns were set to ,',   &
-                                      'cyclic for vertical nesting'
-                CALL message( 'parin', 'PA0428', 0, 0, 0, 6, 0 )
-                bc_lr   = 'cyclic'
-                bc_ns   = 'cyclic'
-             ENDIF
-             IF ( nest_domain )  THEN
-                bc_uv_t  = 'nested'
-                bc_pt_t  = 'nested'
-                bc_q_t   = 'nested'
-                bc_s_t   = 'nested'
-                bc_cs_t  = 'nested'
-                bc_p_t   = 'neumann'  
-             ENDIF        
-!
-!--       For other nesting modes only set boundary conditions for 
-!--       nested domains.
-             IF ( nest_domain )  THEN
-                bc_lr    = 'nested'
-                bc_ns    = 'nested'
-                bc_uv_t  = 'nested'
-                bc_pt_t  = 'nested'
-                bc_q_t   = 'nested'
-                bc_s_t   = 'nested'
-                bc_cs_t = 'nested'
-                bc_p_t   = 'neumann'
+!--       This will overwrite the user settings and basic defaults.
+!--       bc_lr and bc_ns always need to be cyclic for vertical nesting.
+          IF ( nested_run )  THEN
+             IF ( nesting_mode == 'vertical' )  THEN
+                IF (bc_lr /= 'cyclic' .OR. bc_ns /= 'cyclic' )  THEN
+                   WRITE ( message_string, *) 'bc_lr and bc_ns were set to ,', &
+                        'cyclic for vertical nesting'
+                   CALL message( 'parin', 'PA0428', 0, 0, 0, 6, 0 )
+                   bc_lr   = 'cyclic'
+                   bc_ns   = 'cyclic'
+                ENDIF
+                IF ( nest_domain )  THEN
+                   bc_uv_t  = 'nested'
+                   bc_pt_t  = 'nested'
+                   bc_q_t   = 'nested'
+                   bc_s_t   = 'nested'
+                   bc_cs_t  = 'nested'
+                   bc_p_t   = 'neumann'  
+                ENDIF
+!
+!--          For other nesting modes only set boundary conditions for 
+!--          nested domains.
+             ELSE 
+                IF ( nest_domain )  THEN
+                   bc_lr    = 'nested'
+                   bc_ns    = 'nested'
+                   bc_uv_t  = 'nested'
+                   bc_pt_t  = 'nested'
+                   bc_q_t   = 'nested'
+                   bc_s_t   = 'nested'
+                   bc_cs_t  = 'nested'
+                   bc_p_t   = 'neumann'
+                ENDIF
              ENDIF
           ENDIF