Changeset 978 for palm/trunk/SOURCE/check_parameters.f90

Timestamp:

Aug 9, 2012 8:28:32 AM (12 years ago)

Author:

fricke

Message:

merge fricke branch back into trunk

Location:

palm/trunk

Files:

• . (modified) (1 prop)
• SOURCE (modified) (1 prop)
• SOURCE/check_parameters.f90 (modified) (10 diffs)

palm/trunk/SOURCE/check_parameters.f90

@@ -4 +4 @@
 ! Current revisions:
 ! -----------------
-!
+! setting of bc_lr/ns_dirneu/neudir
+! outflow damping layer removed
+! check for z0h*
+! check for pt_damping_width
 !
 ! Former revisions:
@@ -1379 +1382 @@
 !-- Lateral boundary conditions
     IF ( bc_lr /= 'cyclic'  .AND.  bc_lr /= 'dirichlet/radiation'  .AND. &
-         bc_lr /= 'radiation/dirichlet' )  THEN
+         bc_lr /= 'radiation/dirichlet' .AND. bc_lr /= 'dirichlet/neumann' &
+         .AND. bc_lr /= 'neumann/dirichlet' )  THEN
        message_string = 'unknown boundary condition: bc_lr = "' // &
                         TRIM( bc_lr ) // '"'
@@ -1385 +1389 @@
     ENDIF
     IF ( bc_ns /= 'cyclic'  .AND.  bc_ns /= 'dirichlet/radiation'  .AND. &
-         bc_ns /= 'radiation/dirichlet' )  THEN
+         bc_ns /= 'radiation/dirichlet' .AND. bc_ns /= 'dirichlet/neumann' &
+         .AND. bc_ns /= 'neumann/dirichlet' )  THEN
        message_string = 'unknown boundary condition: bc_ns = "' // &
                         TRIM( bc_ns ) // '"'
@@ -1396 +1401 @@
     IF ( bc_lr == 'dirichlet/radiation' )  bc_lr_dirrad = .TRUE.
     IF ( bc_lr == 'radiation/dirichlet' )  bc_lr_raddir = .TRUE.
+    IF ( bc_lr == 'dirichlet/neumann' )    bc_lr_dirneu = .TRUE.
+    IF ( bc_lr == 'neumann/dirichlet' )    bc_lr_neudir = .TRUE.
     IF ( bc_ns /= 'cyclic' )               bc_ns_cyc    = .FALSE.
     IF ( bc_ns == 'dirichlet/radiation' )  bc_ns_dirrad = .TRUE.
     IF ( bc_ns == 'radiation/dirichlet' )  bc_ns_raddir = .TRUE.
+    IF ( bc_ns == 'dirichlet/neumann' )    bc_ns_dirneu = .TRUE.
+    IF ( bc_ns == 'neumann/dirichlet' )    bc_ns_neudir = .TRUE.
 
 !
@@ -2659 +2668 @@
              unit = 'psu'
 
-          CASE ( 'u*', 't*', 'lwp*', 'pra*', 'prr*', 'qsws*', 'shf*', 'z0*' )
+          CASE ( 'u*', 't*', 'lwp*', 'pra*', 'prr*', 'qsws*', 'shf*', 'z0*', 'z0h*' )
              IF ( k == 0  .OR.  data_output(i)(ilen-2:ilen) /= '_xy' )  THEN
                 message_string = 'illegal value for data_output: "' // &
@@ -2700 +2709 @@
              IF ( TRIM( var ) == 'u*'     )  unit = 'm/s'
              IF ( TRIM( var ) == 'z0*'    )  unit = 'm'
+             IF ( TRIM( var ) == 'z0h*'    )  unit = 'm'
 
 
@@ -2964 +2974 @@
 
 !
-!-- In case of non-cyclic lateral boundaries, set the default maximum value
-!-- for the horizontal diffusivity used within the outflow damping layer,
-!-- and check/set the width of the damping layer
+!-- In case of non-cyclic lateral boundaries and a damping layer for the
+!-- potential temperature, check the width of the damping layer
     IF ( bc_lr /= 'cyclic' ) THEN
-       IF ( km_damp_max == -1.0 )  THEN
-          km_damp_max = 0.5 * dx
-       ENDIF
-       IF ( outflow_damping_width == -1.0 )  THEN
-          outflow_damping_width = MIN( 20, nx/2 )
-       ENDIF
-       IF ( outflow_damping_width <= 0  .OR.  outflow_damping_width > nx )  THEN
-          message_string = 'outflow_damping width out of range'
+       IF ( pt_damping_width < 0.0 .OR. pt_damping_width > REAL( nx * dx ) )  THEN
+          message_string = 'pt_damping_width out of range'
           CALL message( 'check_parameters', 'PA0124', 1, 2, 0, 6, 0 )
        ENDIF
@@ -2981 +2984 @@
 
     IF ( bc_ns /= 'cyclic' )  THEN
-       IF ( km_damp_max == -1.0 )  THEN
-          km_damp_max = 0.5 * dy
-       ENDIF
-       IF ( outflow_damping_width == -1.0 )  THEN
-          outflow_damping_width = MIN( 20, ny/2 )
-       ENDIF
-       IF ( outflow_damping_width <= 0  .OR.  outflow_damping_width > ny )  THEN
-          message_string = 'outflow_damping width out of range'
+       IF ( pt_damping_width < 0.0 .OR. pt_damping_width > REAL( ny * dy ) )  THEN
+          message_string = 'pt_damping_width out of range'
           CALL message( 'check_parameters', 'PA0124', 1, 2, 0, 6, 0 )
        ENDIF
@@ -3108 +3105 @@
     ENDIF
 
-    IF ( bc_lr == 'radiation/dirichlet' )  THEN
+    IF ( bc_lr == 'radiation/dirichlet' .OR. bc_lr == 'neumann/dirichlet' )  THEN
        dist_nxr    = nx - inflow_disturbance_begin
        dist_nxl(1) = nx - inflow_disturbance_end
-    ELSEIF ( bc_lr == 'dirichlet/radiation' )  THEN
+    ELSEIF ( bc_lr == 'dirichlet/radiation' .OR. bc_lr == 'dirichlet/neumann' )  THEN
        dist_nxl    = inflow_disturbance_begin
        dist_nxr(1) = inflow_disturbance_end
     ENDIF
-    IF ( bc_ns == 'dirichlet/radiation' )  THEN
+    IF ( bc_ns == 'dirichlet/radiation' .OR. bc_ns == 'dirichlet/neumann' )  THEN
        dist_nyn    = ny - inflow_disturbance_begin
        dist_nys(1) = ny - inflow_disturbance_end
-    ELSEIF ( bc_ns == 'radiation/dirichlet' )  THEN
+    ELSEIF ( bc_ns == 'radiation/dirichlet' .OR. bc_ns == 'neumann/dirichlet' )  THEN
        dist_nys    = inflow_disturbance_begin
        dist_nyn(1) = inflow_disturbance_end
@@ -3126 +3123 @@
 !-- A turbulent inflow requires Dirichlet conditions at the respective inflow
 !-- boundary (so far, a turbulent inflow is realized from the left side only)
-    IF ( turbulent_inflow  .AND.  bc_lr /= 'dirichlet/radiation' )  THEN
+    IF ( turbulent_inflow  .AND.  bc_lr /= 'dirichlet/radiation' .AND.  bc_lr /= 'dirichlet/neumann' )  THEN
        message_string = 'turbulent_inflow = .T. requires a Dirichlet ' // &
                         'condition at the inflow boundary'