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

Timestamp:

Jul 9, 2012 2:31:00 PM (12 years ago)

Author:

raasch

Message:

temperature equation can be switched off; bugfix of tridia_1dd for current Intel (12.1) compilers

File:

• palm/trunk/SOURCE/check_parameters.f90 (modified) (3 diffs)

palm/trunk/SOURCE/check_parameters.f90

@@ -4 +4 @@
 ! Current revisions:
 ! -----------------
-!
+! checks for parameter neutral
 !
 ! Former revisions:
@@ -1039 +1039 @@
 !
 !--    Compute initial temperature profile using the given temperature gradients
-       i = 1
-       gradient = 0.0
-
-       IF ( .NOT. ocean )  THEN
-
-          pt_vertical_gradient_level_ind(1) = 0
-          DO  k = 1, nzt+1
-             IF ( i < 11 ) THEN
-                IF ( pt_vertical_gradient_level(i) < zu(k)  .AND. &
-                     pt_vertical_gradient_level(i) >= 0.0 )  THEN
-                   gradient = pt_vertical_gradient(i) / 100.0
-                   pt_vertical_gradient_level_ind(i) = k - 1
-                   i = i + 1
+       IF ( .NOT. neutral )  THEN
+
+          i = 1
+          gradient = 0.0
+
+          IF ( .NOT. ocean )  THEN
+
+             pt_vertical_gradient_level_ind(1) = 0
+             DO  k = 1, nzt+1
+                IF ( i < 11 ) THEN
+                   IF ( pt_vertical_gradient_level(i) < zu(k)  .AND. &
+                        pt_vertical_gradient_level(i) >= 0.0 )  THEN
+                      gradient = pt_vertical_gradient(i) / 100.0
+                      pt_vertical_gradient_level_ind(i) = k - 1
+                      i = i + 1
+                   ENDIF
                 ENDIF
-             ENDIF
-             IF ( gradient /= 0.0 )  THEN
-                IF ( k /= 1 )  THEN
-                   pt_init(k) = pt_init(k-1) + dzu(k) * gradient
+                IF ( gradient /= 0.0 )  THEN
+                   IF ( k /= 1 )  THEN
+                      pt_init(k) = pt_init(k-1) + dzu(k) * gradient
+                   ELSE
+                      pt_init(k) = pt_surface   + 0.5 * dzu(k) * gradient
+                   ENDIF
                 ELSE
-                   pt_init(k) = pt_surface   + 0.5 * dzu(k) * gradient
+                   pt_init(k) = pt_init(k-1)
                 ENDIF
-             ELSE
-                pt_init(k) = pt_init(k-1)
-             ENDIF
-          ENDDO
-
-       ELSE
-
-          pt_vertical_gradient_level_ind(1) = nzt+1
-          DO  k = nzt, 0, -1
-             IF ( i < 11 ) THEN
-                IF ( pt_vertical_gradient_level(i) > zu(k)  .AND. &
-                     pt_vertical_gradient_level(i) <= 0.0 )  THEN
-                   gradient = pt_vertical_gradient(i) / 100.0
-                   pt_vertical_gradient_level_ind(i) = k + 1
-                   i = i + 1
+             ENDDO
+
+          ELSE
+
+             pt_vertical_gradient_level_ind(1) = nzt+1
+             DO  k = nzt, 0, -1
+                IF ( i < 11 ) THEN
+                   IF ( pt_vertical_gradient_level(i) > zu(k)  .AND. &
+                        pt_vertical_gradient_level(i) <= 0.0 )  THEN
+                      gradient = pt_vertical_gradient(i) / 100.0
+                      pt_vertical_gradient_level_ind(i) = k + 1
+                      i = i + 1
+                   ENDIF
                 ENDIF
-             ENDIF
-             IF ( gradient /= 0.0 )  THEN
-                IF ( k /= nzt )  THEN
-                   pt_init(k) = pt_init(k+1) - dzu(k+1) * gradient
+                IF ( gradient /= 0.0 )  THEN
+                   IF ( k /= nzt )  THEN
+                      pt_init(k) = pt_init(k+1) - dzu(k+1) * gradient
+                   ELSE
+                      pt_init(k)   = pt_surface - 0.5 * dzu(k+1) * gradient
+                      pt_init(k+1) = pt_surface + 0.5 * dzu(k+1) * gradient
+                   ENDIF
                 ELSE
-                   pt_init(k)   = pt_surface - 0.5 * dzu(k+1) * gradient
-                   pt_init(k+1) = pt_surface + 0.5 * dzu(k+1) * gradient
+                   pt_init(k) = pt_init(k+1)
                 ENDIF
-             ELSE
-                pt_init(k) = pt_init(k+1)
-             ENDIF
-          ENDDO
+             ENDDO
+
+          ENDIF
 
        ENDIF
@@ -1505 +1509 @@
     IF ( surface_heatflux == 9999999.9 )  constant_heatflux     = .FALSE.
     IF ( top_heatflux     == 9999999.9 )  constant_top_heatflux = .FALSE.
+
+    IF ( neutral )  THEN
+
+       IF ( surface_heatflux /= 0.0  .AND.  surface_heatflux /= 9999999.9 ) &
+       THEN
+          message_string = 'heatflux must not be set for pure neutral flow'
+          CALL message( 'check_parameters', 'PA0351', 1, 2, 0, 6, 0 )
+       ENDIF
+
+       IF ( top_heatflux /= 0.0  .AND.  top_heatflux /= 9999999.9 ) &
+       THEN
+          message_string = 'heatflux must not be set for pure neutral flow'
+          CALL message( 'check_parameters', 'PA0351', 1, 2, 0, 6, 0 )
+       ENDIF
+
+    ENDIF
+
     IF ( top_momentumflux_u /= 9999999.9  .AND.  &
          top_momentumflux_v /= 9999999.9 )  THEN