Changeset 959 for palm

Timestamp:

Jul 24, 2012 1:13:41 PM (12 years ago)

Author:

hoffmann

Message:

bugfixes in palmplot and cross_profiles

Location:

palm/trunk

Files:

• SCRIPTS/NCL/profiles.ncl (modified) (3 diffs)
• SOURCE/netcdf.f90 (modified) (7 diffs)

palm/trunk/SCRIPTS/NCL/profiles.ncl

@@ -381 +381 @@
 
       ;************************************************************************
-      ; currently, more than 3 plots cannot be drawn together
+      ; currently, more than 3 plots cannot be drawn together. the profiles 
+      ; are split to a maximum of 3 plots per panel.
       ;***********************************************************************
 
@@ -387 +388 @@
          if(number_comb_all(com_i) .GT. 3) then
             print(" ")
-            print("Currently, it is not possible to plot more than three"+\
-                  "profiles together. Hence, they are split to a maximum"+\
-                  "of three profiles per coordinate plane.")
+            print("Currently, it is not possible to plot more than three "+\
+                  "profiles together ("+c_var_all(com_i)+"). Hence, they "+\
+                  "are split to a maximum of three profiles per "+\
+                  "coordinate plane.")
             print(" ") 
             c_var_all_temp = c_var_all
@@ -410 +412 @@
             end do
             number_comb_all(com_i+1) = max(dimsizes(c_var_long)) - 3 
-            c_var_all(com_i+2:max_com_i) = c_var_all_temp(com_i+1:max_com_i-1)
-            number_comb_all(com_i+2:max_com_i) = number_comb_all_temp(com_i+1:max_com_i-1)
+            if (com_i+2 .le. max_com_i) then
+               c_var_all(com_i+2:max_com_i) = c_var_all_temp(com_i+1:max_com_i-1)
+               number_comb_all(com_i+2:max_com_i) = number_comb_all_temp(com_i+1:max_com_i-1)
+            end if
             delete(c_var_all_temp)
             delete(number_comb_all_temp)

palm/trunk/SOURCE/netcdf.f90

@@ -7 +7 @@
 ! Current revisions:
 ! ------------------
-! 
+! Bugfix in cross_profiles. It is not possible to arrange more than 100 
+! profiles with cross_profiles. 
 !
 ! Former revisions:
@@ -117 +118 @@
     CHARACTER (LEN=10)             ::  netcdf_var_name, precision, var
     CHARACTER (LEN=80)             ::  time_average_text
-    CHARACTER (LEN=2000)           ::  char_cross_profiles, var_list, &
-                                       var_list_old
+    CHARACTER (LEN=2000)           ::  char_cross_profiles,     &
+                                       message_cross_profiles,  &
+                                       var_list, var_list_old
 
     CHARACTER (LEN=100), DIMENSION(1:crmax) :: cross_profiles_adj,   &
@@ -3169 +3171 @@
             IF ( TRIM( cross_profiles_adj(i) ) == ' ' )  EXIT
             delim_old = 0
-            DO   j = 1, 100
+            DO   j = 1, crmax
               delim = INDEX( cross_profiles_adj(i)(delim_old+1:), ' ' )
               IF (delim .EQ. 1)  EXIT
-              cross_profiles_char(k) = cross_profiles_adj(i)(delim_old+1:    &
-                                       delim_old+delim-1)
-              cross_profiles_numb(k) = i
+              cross_profiles_char( MIN( crmax, k ) ) = cross_profiles_adj(i)  &
+                                       (delim_old+1:delim_old+delim-1)
+              cross_profiles_numb( MIN( crmax, k ) ) = i
               k = k+1
               cross_profiles_maxi  = i
@@ -3181 +3183 @@
           ENDDO
 
-          cross_profiles_count = k-1
+          cross_profiles_count = MIN( crmax, k-1 )
           
 !
@@ -3192 +3194 @@
           DO  i = 1, cross_profiles_count
             DO  j = 1, dopr_n
-              IF ( TRIM(cross_profiles_char(i)) == TRIM(data_output_pr(j)) ) &
+              IF ( TRIM(cross_profiles_char(i) ) == TRIM(data_output_pr(j)) ) &
                  EXIT
               IF ( j == dopr_n)  THEN
@@ -3223 +3225 @@
                 cross_profiles_count = cross_profiles_count + 1
                 cross_profiles_maxi  = cross_profiles_maxi  + 1
-                cross_profiles_char( cross_profiles_count ) =                  &
+                cross_profiles_char( MIN( crmax, cross_profiles_count ) ) =    &
                                                       TRIM( data_output_pr(i) )
-                cross_profiles_numb(cross_profiles_count) = cross_profiles_maxi
+                cross_profiles_numb( MIN( crmax, cross_profiles_count ) ) =    &
+                                                      cross_profiles_maxi
                 cross_profiles_log = .TRUE.
-                message_string = TRIM( message_string ) // ', ' //             &
-                                 TRIM( data_output_pr(i) )
+                message_string = TRIM( message_string ) // ', '&
+                                         // TRIM( data_output_pr(i) )
               ENDIF
             ENDDO
@@ -3234 +3237 @@
 
           IF ( cross_profiles_log )  THEN
-            message_string = TRIM(message_string(2:)) // ' has/have been' //  & 
-                             ' added to cross_profiles.'
+            message_string = TRIM(message_string(2:)) //               &
+                             ' has/have been added to cross_profiles.'
             CALL message( 'define_netcdf_header', 'PA0353', 0, 0, 0, 6, 0 )
+          ENDIF
+
+          IF ( cross_profiles_count .ge. crmax )  THEN
+            message_string = 'It is not possible to arrange more than '&
+                             // '100 profiles with cross_profiles.'
+            CALL message( 'define_netcdf_header', 'PA0354', 0, 0, 0, 6, 0 )
           ENDIF