Changeset 159


Ignore:
Timestamp:
Apr 9, 2008 8:06:03 AM (14 years ago)
Author:
raasch
Message:

bugfix of max_pr_user problem

Location:
palm/trunk/SOURCE
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SOURCE/read_var_list.f90

    r153 r159  
    6767    CHARACTER (LEN=10) ::  binary_version, version_on_file
    6868    CHARACTER (LEN=30) ::  variable_chr
    69 
    70     INTEGER            ::  max_pr_user_on_file
    7169
    7270
     
    130128       CALL local_stop
    131129    ENDIF
    132     READ ( 13 )  max_pr_user_on_file
    133     IF ( max_pr_user_on_file /= max_pr_user )  THEN
    134        IF ( myid == 0 )  THEN
    135           PRINT*, '+++ read_var_list: version mismatch concerning maximum', &
    136                   ' number of user profiles'
    137           PRINT*, '                   max_pr_user on file    = "', &
    138                   max_pr_user_on_file, '"'
    139           PRINT*, '                   max_pr_user from run   = "', &
    140                   max_pr_user, '"'
    141        ENDIF
    142        CALL local_stop
    143     ENDIF
     130    READ ( 13 )  max_pr_user    ! This value is checked against the number of
     131                                ! user profiles given for the current run
     132                                ! in routine user_parin (it has to match)
    144133
    145134    READ ( 13 )  variable_chr
     
    670659    READ ( 13 )  variable_chr
    671660    IF ( TRIM( variable_chr ) /= 'statistic_regions' )  THEN
    672        PRINT*, '+++ read_var_list: statistic_regions not found in restart da', &
    673                     'ta file'
     661       PRINT*, '+++ read_parts_of_var_list: statistic_regions not found in ', &
     662                    'restart data file'
    674663       CALL local_stop
    675664    ENDIF
  • palm/trunk/SOURCE/user_interface.f90

    r156 r159  
    8686    CHARACTER (LEN=80) ::  zeile
    8787
    88     INTEGER ::  i, j
     88    INTEGER ::  i, j, max_pr_user_tmp
    8989
    9090
     
    111111!-- Determine the number of user-defined profiles and append them to the
    112112!-- standard data output (data_output_pr)
     113    max_pr_user_tmp = 0
    113114    IF ( data_output_pr_user(1) /= ' ' )  THEN
    114115       i = 1
     
    119120       DO  WHILE ( data_output_pr_user(j) /= ' '  .AND.  j <= 100 )
    120121          data_output_pr(i) = data_output_pr_user(j)
    121           max_pr_user       = max_pr_user + 1
     122          max_pr_user_tmp   = max_pr_user_tmp + 1
    122123          i = i + 1
    123124          j = j + 1
    124125       ENDDO
     126    ENDIF
     127
     128!
     129!-- In case of a restart run, the number of user-defined profiles on the
     130!-- restart file (already stored in max_pr_user) has to match the one given
     131!-- for the current run
     132    IF ( TRIM( initializing_actions ) == 'read_restart_data' )  THEN
     133       IF ( max_pr_user /= max_pr_user_tmp )  THEN
     134          PRINT*, '+++ user_parin: the number of user-defined profiles given in'
     135          PRINT*, '                data_output_pr (', max_pr_user_tmp, ' doe', &
     136                                   's not match the one'
     137          PRINT*, '                found in the restart file (', max_pr_user, &
     138                                   ')'
     139          CALL local_stop
     140       ENDIF
     141    ELSE
     142       max_pr_user = max_pr_user_tmp
    125143    ENDIF
    126144
Note: See TracChangeset for help on using the changeset viewer.