Changeset 159 for palm/trunk/SOURCE

Timestamp:

Apr 9, 2008 8:06:03 AM (17 years ago)

Author:

raasch

Message:

bugfix of max_pr_user problem

Location:

palm/trunk/SOURCE

Files:

• read_var_list.f90 (modified) (3 diffs)
• user_interface.f90 (modified) (3 diffs)

palm/trunk/SOURCE/read_var_list.f90

@@ -67 +67 @@
     CHARACTER (LEN=10) ::  binary_version, version_on_file
     CHARACTER (LEN=30) ::  variable_chr
-
-    INTEGER            ::  max_pr_user_on_file
 
 
@@ -130 +128 @@
        CALL local_stop
     ENDIF
-    READ ( 13 )  max_pr_user_on_file
-    IF ( max_pr_user_on_file /= max_pr_user )  THEN
-       IF ( myid == 0 )  THEN
-          PRINT*, '+++ read_var_list: version mismatch concerning maximum', &
-                  ' number of user profiles'
-          PRINT*, '                   max_pr_user on file    = "', &
-                  max_pr_user_on_file, '"'
-          PRINT*, '                   max_pr_user from run   = "', &
-                  max_pr_user, '"'
-       ENDIF
-       CALL local_stop
-    ENDIF
+    READ ( 13 )  max_pr_user    ! This value is checked against the number of
+                                ! user profiles given for the current run
+                                ! in routine user_parin (it has to match)
 
     READ ( 13 )  variable_chr
@@ -670 +659 @@
     READ ( 13 )  variable_chr
     IF ( TRIM( variable_chr ) /= 'statistic_regions' )  THEN
-       PRINT*, '+++ read_var_list: statistic_regions not found in restart da', &
-                    'ta file'
+       PRINT*, '+++ read_parts_of_var_list: statistic_regions not found in ', &
+                    'restart data file'
        CALL local_stop
     ENDIF

palm/trunk/SOURCE/user_interface.f90

@@ -86 +86 @@
     CHARACTER (LEN=80) ::  zeile
 
-    INTEGER ::  i, j
+    INTEGER ::  i, j, max_pr_user_tmp
 
 
@@ -111 +111 @@
 !-- Determine the number of user-defined profiles and append them to the
 !-- standard data output (data_output_pr)
+    max_pr_user_tmp = 0
     IF ( data_output_pr_user(1) /= ' ' )  THEN
        i = 1
@@ -119 +120 @@
        DO  WHILE ( data_output_pr_user(j) /= ' '  .AND.  j <= 100 )
           data_output_pr(i) = data_output_pr_user(j)
-          max_pr_user       = max_pr_user + 1
+          max_pr_user_tmp   = max_pr_user_tmp + 1
           i = i + 1
           j = j + 1
        ENDDO
+    ENDIF
+
+!
+!-- In case of a restart run, the number of user-defined profiles on the
+!-- restart file (already stored in max_pr_user) has to match the one given
+!-- for the current run
+    IF ( TRIM( initializing_actions ) == 'read_restart_data' )  THEN
+       IF ( max_pr_user /= max_pr_user_tmp )  THEN
+          PRINT*, '+++ user_parin: the number of user-defined profiles given in'
+          PRINT*, '                data_output_pr (', max_pr_user_tmp, ' doe', &
+                                   's not match the one'
+          PRINT*, '                found in the restart file (', max_pr_user, &
+                                   ')'
+          CALL local_stop
+       ENDIF
+    ELSE
+       max_pr_user = max_pr_user_tmp
     ENDIF