Changeset 1795 for palm/trunk/SOURCE

Timestamp:

Mar 18, 2016 3:00:53 PM (9 years ago)

Author:

raasch

Message:

bugfix: setting of initial scalar profile in ocean

File:

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

palm/trunk/SOURCE/check_parameters.f90

@@ -19 +19 @@
 ! Current revisions:
 ! -----------------
-! 
+! Bugfix: setting of initial scalar profile in ocean
 ! 
 ! Former revisions:
@@ -1543 +1543 @@
           i = 1
           gradient = 0.0_wp
-          q_vertical_gradient_level_ind(1) = 0
-          DO  k = 1, nzt+1
-             IF ( i < 11 )  THEN
-                IF ( q_vertical_gradient_level(i) < zu(k)  .AND.               &
-                     q_vertical_gradient_level(i) >= 0.0_wp )  THEN
-                   gradient = q_vertical_gradient(i) / 100.0_wp
-                   q_vertical_gradient_level_ind(i) = k - 1
-                   i = i + 1
+
+          IF (  .NOT.  ocean )  THEN
+
+             q_vertical_gradient_level_ind(1) = 0
+             DO  k = 1, nzt+1
+                IF ( i < 11 )  THEN
+                   IF ( q_vertical_gradient_level(i) < zu(k)  .AND.            &
+                        q_vertical_gradient_level(i) >= 0.0_wp )  THEN
+                      gradient = q_vertical_gradient(i) / 100.0_wp
+                      q_vertical_gradient_level_ind(i) = k - 1
+                      i = i + 1
+                   ENDIF
                 ENDIF
-             ENDIF
-             IF ( gradient /= 0.0_wp )  THEN
-                IF ( k /= 1 )  THEN
-                   q_init(k) = q_init(k-1) + dzu(k) * gradient
+                IF ( gradient /= 0.0_wp )  THEN
+                   IF ( k /= 1 )  THEN
+                      q_init(k) = q_init(k-1) + dzu(k) * gradient
+                   ELSE
+                      q_init(k) = q_init(k-1) + dzu(k) * gradient
+                   ENDIF
                 ELSE
-                   q_init(k) = q_init(k-1) + dzu(k) * gradient
+                   q_init(k) = q_init(k-1)
                 ENDIF
-             ELSE
-                q_init(k) = q_init(k-1)
-             ENDIF
-!
-!--          Avoid negative humidities
-             IF ( q_init(k) < 0.0_wp )  THEN
-                q_init(k) = 0.0_wp
-             ENDIF
-          ENDDO
-
+   !
+   !--          Avoid negative humidities
+                IF ( q_init(k) < 0.0_wp )  THEN
+                   q_init(k) = 0.0_wp
+                ENDIF
+             ENDDO
+
+          ELSE
+
+             q_vertical_gradient_level_ind(1) = nzt+1
+             DO  k = nzt, 0, -1
+                IF ( i < 11 )  THEN
+                   IF ( q_vertical_gradient_level(i) > zu(k)  .AND.            &
+                        q_vertical_gradient_level(i) <= 0.0_wp )  THEN
+                      gradient = q_vertical_gradient(i) / 100.0_wp
+                      q_vertical_gradient_level_ind(i) = k + 1
+                      i = i + 1
+                   ENDIF
+                ENDIF
+                IF ( gradient /= 0.0_wp )  THEN
+                   IF ( k /= nzt )  THEN
+                      q_init(k) = q_init(k+1) - dzu(k+1) * gradient
+                   ELSE
+                      q_init(k)   = q_surface - 0.5_wp * dzu(k+1) * gradient
+                      q_init(k+1) = q_surface + 0.5_wp * dzu(k+1) * gradient
+                   ENDIF
+                ELSE
+                   q_init(k) = q_init(k+1)
+                ENDIF
+   !
+   !--          Avoid negative humidities
+                IF ( q_init(k) < 0.0_wp )  THEN
+                   q_init(k) = 0.0_wp
+                ENDIF
+             ENDDO
+
+          ENDIF
 !
 !--       In case of no given humidity gradients, choose zero gradient