Changeset 1964

Timestamp:

Jul 14, 2016 3:35:18 PM (8 years ago)

Author:

hellstea

Message:

Bug in vertical nesting mode corrected

File:

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

palm/trunk/SOURCE/init_pegrid.f90

@@ -19 +19 @@
 ! Current revisions:
 ! ------------------
-! 
+! Bugfix: erroneous setting of nest_bound_l/r/s/n = .TRUE. for vertical nesting mode removed.
 ! 
 ! Former revisions:
@@ -1099 +1099 @@
 !
 !-- Setting of flags for inflow/outflow/nesting conditions.
-    IF ( nesting_mode == 'vertical' .AND. nest_domain )  THEN
-       IF ( nxl == 0 )  THEN
+    IF ( pleft == MPI_PROC_NULL )  THEN
+       IF ( bc_lr == 'dirichlet/radiation' )  THEN
+          inflow_l  = .TRUE.
+       ELSEIF ( bc_lr == 'radiation/dirichlet' )  THEN
+          outflow_l = .TRUE.
+       ELSEIF ( bc_lr == 'nested' )  THEN
           nest_bound_l = .TRUE.
        ENDIF
-    ELSE
-       IF ( pleft == MPI_PROC_NULL )  THEN
-          IF ( bc_lr == 'dirichlet/radiation' )  THEN
-             inflow_l  = .TRUE.
-          ELSEIF ( bc_lr == 'radiation/dirichlet' )  THEN
-             outflow_l = .TRUE.
-          ELSEIF ( bc_lr == 'nested' )  THEN
-             nest_bound_l = .TRUE.
-          ENDIF
-       ENDIF
     ENDIF
  
-    IF ( nesting_mode == 'vertical' .AND. nest_domain )  THEN
-       IF ( nxr == nx )  THEN
+    IF ( pright == MPI_PROC_NULL )  THEN
+       IF ( bc_lr == 'dirichlet/radiation' )  THEN
+          outflow_r = .TRUE.
+       ELSEIF ( bc_lr == 'radiation/dirichlet' )  THEN
+          inflow_r  = .TRUE.
+       ELSEIF ( bc_lr == 'nested' )  THEN
           nest_bound_r = .TRUE.
        ENDIF
-    ELSE
-       IF ( pright == MPI_PROC_NULL )  THEN
-          IF ( bc_lr == 'dirichlet/radiation' )  THEN
-             outflow_r = .TRUE.
-          ELSEIF ( bc_lr == 'radiation/dirichlet' )  THEN
-             inflow_r  = .TRUE.
-          ELSEIF ( bc_lr == 'nested' )  THEN
-             nest_bound_r = .TRUE.
-          ENDIF
-       ENDIF
-    ENDIF
-
-    IF ( nesting_mode == 'vertical' .AND. nest_domain )  THEN
-       IF ( nys == 0 )  THEN
+    ENDIF
+
+    IF ( psouth == MPI_PROC_NULL )  THEN
+       IF ( bc_ns == 'dirichlet/radiation' )  THEN
+          outflow_s = .TRUE.
+       ELSEIF ( bc_ns == 'radiation/dirichlet' )  THEN
+          inflow_s  = .TRUE.
+       ELSEIF ( bc_ns == 'nested' )  THEN
           nest_bound_s = .TRUE.
        ENDIF
-    ELSE
-       IF ( psouth == MPI_PROC_NULL )  THEN
-          IF ( bc_ns == 'dirichlet/radiation' )  THEN
-             outflow_s = .TRUE.
-          ELSEIF ( bc_ns == 'radiation/dirichlet' )  THEN
-             inflow_s  = .TRUE.
-          ELSEIF ( bc_ns == 'nested' )  THEN
-             nest_bound_s = .TRUE.
-          ENDIF
-       ENDIF
-    ENDIF
-
-    IF ( nesting_mode == 'vertical' .AND. nest_domain )  THEN
-       IF ( nyn == ny )  THEN
+    ENDIF
+
+    IF ( pnorth == MPI_PROC_NULL )  THEN
+       IF ( bc_ns == 'dirichlet/radiation' )  THEN
+          inflow_n  = .TRUE.
+       ELSEIF ( bc_ns == 'radiation/dirichlet' )  THEN
+          outflow_n = .TRUE.
+       ELSEIF ( bc_ns == 'nested' )  THEN
           nest_bound_n = .TRUE.
-       ENDIF
-    ELSE
-       IF ( pnorth == MPI_PROC_NULL )  THEN
-          IF ( bc_ns == 'dirichlet/radiation' )  THEN
-             inflow_n  = .TRUE.
-          ELSEIF ( bc_ns == 'radiation/dirichlet' )  THEN
-             outflow_n = .TRUE.
-          ELSEIF ( bc_ns == 'nested' )  THEN
-             nest_bound_n = .TRUE.
-          ENDIF
        ENDIF
     ENDIF