Changeset 2039 for palm/trunk
- Timestamp:
- Oct 26, 2016 4:53:23 PM (8 years ago)
- Location:
- palm/trunk/SOURCE
- Files:
-
- 3 edited
-
check_open.f90 (modified) (3 diffs)
-
check_parameters.f90 (modified) (2 diffs)
-
netcdf_interface_mod.f90 (modified) (13 diffs)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/check_open.f90
r2001 r2039 20 20 ! Current revisions: 21 21 ! ----------------- 22 ! 22 ! Removed open of file 'PLOTTS_DATA' ( CASE(50:59) ) as it is no longer needed 23 23 ! 24 24 ! Former revisions: … … 163 163 ONLY: cross_ts_numbers, cross_ts_number_count 164 164 165 USE statistics, &166 ONLY: region, statistic_regions167 168 165 169 166 IMPLICIT NONE … … 524 521 ENDIF 525 522 526 CASE ( 50:59 )527 528 IF ( statistic_regions == 0 .AND. file_id == 50 ) THEN529 suffix = ''530 ELSE531 WRITE ( suffix, '(''_'',I1)' ) file_id - 50532 ENDIF533 OPEN ( file_id, FILE='PLOTTS_DATA'//TRIM( coupling_char )// &534 TRIM( suffix ), &535 FORM='FORMATTED', RECL=496 )536 !537 !-- Write PROFIL parameter file for output of time series538 !-- NOTE: To be on the safe side, this output is done at the beginning of539 !-- the model run (in case of collapse) and it is repeated in540 !-- close_file, then, however, with value ranges for the coordinate541 !-- systems542 !543 !-- Firstly determine the number of the coordinate systems to be drawn544 cranz = 0545 DO j = 1, 10546 IF ( cross_ts_number_count(j) /= 0 ) cranz = cranz+1547 ENDDO548 rtext = '\1.0 ' // TRIM( run_description_header ) // ' ' // &549 TRIM( region( file_id - 50 ) )550 !551 !-- Write RAHMEN parameter552 OPEN ( 90, FILE='PLOTTS_PAR'//TRIM( coupling_char )// &553 TRIM( suffix ), &554 FORM='FORMATTED', DELIM='APOSTROPHE' )555 WRITE ( 90, RAHMEN )556 !557 !-- Determine and write CROSS parameters for the individual coordinate558 !-- systems559 DO j = 1, 10560 k = cross_ts_number_count(j)561 IF ( k /= 0 ) THEN562 !563 !-- Store curve numbers, colours and line style564 klist(1:k) = cross_ts_numbers(1:k,j)565 klist(k+1:10) = 999999566 !567 !-- Write CROSS parameter568 WRITE ( 90, CROSS )569 570 ENDIF571 ENDDO572 573 CLOSE ( 90 )574 !575 !-- Write all labels at the top of the data file, but only during the576 !-- first run of a sequence of jobs. The following jobs copy the time577 !-- series data to the bottom of that file.578 IF ( runnr == 0 ) THEN579 WRITE ( file_id, 5000 ) TRIM( run_description_header ) // &580 ' ' // TRIM( region( file_id - 50 ) )581 ENDIF582 583 584 523 CASE ( 80 ) 585 524 -
palm/trunk/SOURCE/check_parameters.f90
r2038 r2039 20 20 ! Current revisions: 21 21 ! ----------------- 22 ! 22 ! Removed check for statistic_regions > 9. 23 23 ! 24 24 ! Former revisions: … … 1985 1985 1986 1986 ! 1987 !-- Check number of chosen statistic regions. More than 10 regions are not 1988 !-- allowed, because so far no more than 10 corresponding output files can 1989 !-- be opened (cf. check_open) 1990 IF ( statistic_regions > 9 .OR. statistic_regions < 0 ) THEN 1987 !-- Check number of chosen statistic regions 1988 IF ( statistic_regions < 0 ) THEN 1991 1989 WRITE ( message_string, * ) 'number of statistic_regions = ', & 1992 statistic_regions+1, ' but only 10 regions areallowed'1990 statistic_regions+1, ' is not allowed' 1993 1991 CALL message( 'check_parameters', 'PA0082', 1, 2, 0, 6, 0 ) 1994 1992 ENDIF -
palm/trunk/SOURCE/netcdf_interface_mod.f90
r2038 r2039 20 20 ! Current revisions: 21 21 ! ------------------ 22 ! 22 ! Increased number of possible statistic_regions to 99 23 23 ! 24 24 ! Former revisions: … … 341 341 INTEGER(iwp), DIMENSION(dopts_num,0:10) :: id_var_dopts 342 342 INTEGER(iwp), DIMENSION(0:1,500) :: id_var_do2d, id_var_do3d 343 INTEGER(iwp), DIMENSION(100,0:9 ):: id_dim_z_pr, id_var_dopr, &343 INTEGER(iwp), DIMENSION(100,0:99) :: id_dim_z_pr, id_var_dopr, & 344 344 id_var_z_pr 345 INTEGER(iwp), DIMENSION(dots_max,0:9 ):: id_var_dots345 INTEGER(iwp), DIMENSION(dots_max,0:99) :: id_var_dots 346 346 347 347 ! … … 469 469 IMPLICIT NONE 470 470 471 CHARACTER (LEN= 2) :: suffix !<471 CHARACTER (LEN=3) :: suffix !< 472 472 CHARACTER (LEN=2), INTENT (IN) :: callmode !< 473 CHARACTER (LEN=3) :: suffix1 !<474 473 CHARACTER (LEN=4) :: grid_x !< 475 474 CHARACTER (LEN=4) :: grid_y !< … … 3955 3954 !-- names 3956 3955 DO j = 0, statistic_regions 3957 WRITE ( suffix, '(''_'',I 1)' ) j3956 WRITE ( suffix, '(''_'',I2.2)' ) j 3958 3957 3959 3958 ! … … 4042 4041 ELSE 4043 4042 DO j = 0, statistic_regions 4044 WRITE ( suffix, '(''_'',I 1)' ) j4043 WRITE ( suffix, '(''_'',I2.2)' ) j 4045 4044 var_list = TRIM( var_list ) // TRIM( data_output_pr(i) ) // & 4046 4045 suffix // ';' … … 4110 4109 ELSE 4111 4110 DO j = 0, statistic_regions 4112 WRITE ( suffix, '(''_'',I 1)' ) j4111 WRITE ( suffix, '(''_'',I2.2)' ) j 4113 4112 netcdf_var_name = TRIM( data_output_pr(i) ) // suffix 4114 4113 nc_stat = NF90_INQ_VARID( id_set_pr, netcdf_var_name, & … … 4192 4191 !-- names 4193 4192 DO j = 0, statistic_regions 4194 WRITE ( suffix, '(''_'',I 1)' ) j4193 WRITE ( suffix, '(''_'',I2.2)' ) j 4195 4194 4196 4195 CALL netcdf_create_var( id_set_ts, (/ id_dim_time_ts /), & … … 4241 4240 ELSE 4242 4241 DO j = 0, statistic_regions 4243 WRITE ( suffix, '(''_'',I 1)' ) j4242 WRITE ( suffix, '(''_'',I2.2)' ) j 4244 4243 var_list = TRIM( var_list ) // TRIM( dots_label(i) ) // & 4245 4244 suffix // ';' … … 4309 4308 ELSE 4310 4309 DO j = 0, statistic_regions 4311 WRITE ( suffix, '(''_'',I 1)' ) j4310 WRITE ( suffix, '(''_'',I2.2)' ) j 4312 4311 netcdf_var_name = TRIM( dots_label(i) ) // suffix 4313 4312 nc_stat = NF90_INQ_VARID( id_set_ts, netcdf_var_name, & … … 4870 4869 4871 4870 IF ( j == 0 ) THEN 4872 suffix 1= ''4871 suffix = '' 4873 4872 ELSE 4874 WRITE ( suffix 1, '(''_'',I2.2)' ) j4873 WRITE ( suffix, '(''_'',I2.2)' ) j 4875 4874 ENDIF 4876 4875 4877 4876 IF ( j == 0 ) THEN 4878 4877 CALL netcdf_create_var( id_set_pts, (/ id_dim_time_pts /), & 4879 TRIM( dopts_label(i) ) // suffix 1, &4878 TRIM( dopts_label(i) ) // suffix, & 4880 4879 nc_precision(6), id_var_dopts(i,j), & 4881 4880 TRIM( dopts_unit(i) ), & … … 4884 4883 ELSE 4885 4884 CALL netcdf_create_var( id_set_pts, (/ id_dim_time_pts /), & 4886 TRIM( dopts_label(i) ) // suffix 1, &4885 TRIM( dopts_label(i) ) // suffix, & 4887 4886 nc_precision(6), id_var_dopts(i,j), & 4888 4887 TRIM( dopts_unit(i) ), & 4889 4888 TRIM( dopts_label(i) ) // ' PG ' // & 4890 suffix 1(2:3), 400, 401, 402 )4889 suffix(2:3), 400, 401, 402 ) 4891 4890 ENDIF 4892 4891 4893 4892 var_list = TRIM( var_list ) // TRIM( dopts_label(i) ) // & 4894 suffix 1// ';'4893 suffix // ';' 4895 4894 4896 4895 IF ( number_of_particle_groups == 1 ) EXIT … … 4932 4931 4933 4932 IF ( j == 0 ) THEN 4934 suffix 1= ''4933 suffix = '' 4935 4934 ELSE 4936 WRITE ( suffix 1, '(''_'',I2.2)' ) j4935 WRITE ( suffix, '(''_'',I2.2)' ) j 4937 4936 ENDIF 4938 4937 4939 4938 var_list = TRIM( var_list ) // TRIM( dopts_label(i) ) // & 4940 suffix 1// ';'4939 suffix // ';' 4941 4940 4942 4941 IF ( number_of_particle_groups == 1 ) EXIT … … 5003 5002 5004 5003 IF ( j == 0 ) THEN 5005 suffix 1= ''5004 suffix = '' 5006 5005 ELSE 5007 WRITE ( suffix 1, '(''_'',I2.2)' ) j5006 WRITE ( suffix, '(''_'',I2.2)' ) j 5008 5007 ENDIF 5009 5008 5010 netcdf_var_name = TRIM( dopts_label(i) ) // suffix 15009 netcdf_var_name = TRIM( dopts_label(i) ) // suffix 5011 5010 5012 5011 nc_stat = NF90_INQ_VARID( id_set_pts, netcdf_var_name, &
Note: See TracChangeset
for help on using the changeset viewer.
