Changeset 292 for palm/trunk
- Timestamp:
- Apr 16, 2009 4:10:51 PM (16 years ago)
- Location:
- palm/trunk
- Files:
-
- 6 edited
-
DOC/tec/message_identifiers (modified) (1 diff)
-
SCRIPTS/subjob (modified) (4 diffs)
-
SOURCE/CURRENT_MODIFICATIONS (modified) (1 diff)
-
SOURCE/header.f90 (modified) (9 diffs)
-
SOURCE/init_3d_model.f90 (modified) (3 diffs)
-
SOURCE/netcdf.f90 (modified) (36 diffs)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/DOC/tec/message_identifiers
r291 r292 580 580 PA0317 ocean = .F. does not allow coupling_char = ... 581 581 set by mrun-option "-y" 582 PA0318 inflow_damping_height must be explicitly specified 583 because &the inversion height calculated by the prerun 584 is zero 582 585 583 586 -
palm/trunk/SCRIPTS/subjob
r291 r292 96 96 # 02/10/08 - Siggi - PBS adjustments for lcxt4 97 97 # 02/03/09 - Siggi - Adjustments for new NEC-SX9 at RIAM 98 # 16/04/09 - Marcus- Adjustments for lcsgib and lcsgih 98 99 99 100 … … 166 167 (breg*-en0|berni*-en0) local_addres=130.73.230.10; local_host=ibmb;; 167 168 (breva) local_addres=130.75.105.98; local_host=lcmuk;; 168 (b01*) local_addres=130.73.232.102; local_host=lcsgib;; 169 (b01*|bicegate1) local_addres=130.73.232.102; local_host=lcsgib;; 170 (bicegate2) local_addres=130.73.232.103; local_host=lcsgib;; 169 171 (compute-*.local) local_addres=172.20.4.2; local_host=lcfimm;; 170 172 (cs*) local_addres=136.172.44.131; local_host=nech;; … … 177 179 (hababai) local_addres=130.75.105.108; local_host=lcmuk;; 178 180 (hexagon.bccs.uib.no) local_addres=129.177.20.113; local_host=lcxt4;; 179 (h icegate1)local_addres=130.75.4.102; local_host=lcsgih;;181 (h01*|hicegate1) local_addres=130.75.4.102; local_host=lcsgih;; 180 182 (hicegate2) local_addres=130.75.4.103; local_host=lcsgih;; 181 183 (hreg*-en0|hanni*-en0) local_addres=130.75.4.10; local_host=ibmh;; 182 (h01*) local_addres=130.75.4.102; local_host=lcsgih;;183 184 (irifi) local_addres=130.75.105.104; local_host=lcmuk;; 184 185 (levanto) local_addres=130.75.105.45; local_host=lcmuk;; … … 1155 1156 echo "$submcom $job_on_remhost" 1156 1157 chmod u+x $job_on_remhost 1158 elif [[ $(echo $local_host | cut -c1-5) = lcsgi ]] 1159 then 1160 eval $submcom $job_on_remhost 1157 1161 elif [[ $local_host = nech ]] 1158 1162 then -
palm/trunk/SOURCE/CURRENT_MODIFICATIONS
r291 r292 94 94 on. (time_integration) 95 95 96 advec_particles, check_parameters, cpu_log, init_particles, modules, time_integration 96 Typographical errors (netcdf) 97 98 If the inversion height calculated by the prerun is zero, inflow_damping_height 99 must be explicitly specified (init_3d_model) 100 101 Small bugfix concerning 3d 64bit netcdf output format (header) 102 103 104 advec_particles, check_parameters, cpu_log, header, init_3d_model, init_particles, modules, netcdf, time_integration -
palm/trunk/SOURCE/header.f90
r291 r292 11 11 ! dp_smooth, dpdxy, u_bulk, v_bulk 12 12 ! topography_grid_convention moved from user_header 13 ! small bugfix concerning 3d 64bit netcdf output format 13 14 ! 14 15 ! Former revisions: … … 693 694 ENDIF 694 695 ENDIF 695 WRITE ( io, 34 5) output_format696 WRITE ( io, 344 ) output_format 696 697 697 698 DO i = 1, dopr_n … … 771 772 ENDIF 772 773 ENDIF 773 WRITE ( io, 34 5) output_format774 WRITE ( io, 344 ) output_format 774 775 775 776 IF ( do2d_xy /= '' .AND. section(1,1) /= -9999 ) THEN … … 915 916 output_format = '' 916 917 IF ( netcdf_output ) THEN 917 IF ( netcdf_64bit .AND. netcdf_64bit_3d ) THEN918 IF ( netcdf_64bit_3d ) THEN 918 919 output_format = 'netcdf (64 bit offset)' 919 920 ELSE … … 928 929 ENDIF 929 930 ENDIF 930 WRITE ( io, 34 5) output_format931 WRITE ( io, 344 ) output_format 931 932 932 933 IF ( do3d_at_begin ) THEN … … 1005 1006 ENDIF 1006 1007 ENDIF 1007 WRITE ( io, 34 5) output_format1008 WRITE ( io, 344 ) output_format 1008 1009 WRITE ( io, 341 ) dt_dots 1009 1010 ENDIF … … 1061 1062 ENDIF 1062 1063 ENDIF 1063 WRITE ( io, 34 5) output_format1064 WRITE ( io, 344 ) output_format 1064 1065 WRITE ( io, 371 ) dt_dosp 1065 1066 IF ( skip_time_dosp /= 0.0 ) WRITE ( io, 339 ) skip_time_dosp … … 1320 1321 output_format = 'binary' 1321 1322 ENDIF 1322 WRITE ( io, 34 5) output_format1323 WRITE ( io, 344 ) output_format 1323 1324 ENDIF 1324 1325 IF ( dt_dopts /= 9999999.9 ) WRITE ( io, 494 ) dt_dopts … … 1593 1594 ' Averaging input every ',F8.2,' s'/ & 1594 1595 ' Upper output limit at ',F8.2,' m (GP ',I4,')'/) 1595 34 5FORMAT (' Output format: ',A/)1596 344 FORMAT (' Output format: ',A/) 1596 1597 #if defined( __dvrp_graphics ) 1597 1598 360 FORMAT (' Plot-Sequence with dvrp-software:'/ & -
palm/trunk/SOURCE/init_3d_model.f90
r274 r292 12 12 ! +conserve_volume_flow_mode: 'default', 'initial_profiles', 'inflow_profile' 13 13 ! and 'bulk_velocity' 14 ! If the inversion height calculated by the prerun is zero, 15 ! inflow_damping_height must be explicitly specified. 14 16 ! 15 17 ! Former revisions: … … 538 540 539 541 ! 540 !-- Set initial horizontal velocities at the lowest computational grid levels541 !-- to zero in order to avoid too small time steps caused by the diffusion542 !-- limit in the initial phase of a run (at k=1, dz/2 occurs in the543 !-- limiting formula!). The original values are stored to be later used for544 !-- volume flow control.542 !-- Set initial horizontal velocities at the lowest computational grid 543 !-- levels to zero in order to avoid too small time steps caused by the 544 !-- diffusion limit in the initial phase of a run (at k=1, dz/2 occurs 545 !-- in the limiting formula!). The original values are stored to be later 546 !-- used for volume flow control. 545 547 DO i = nxl-1, nxr+1 546 548 DO j = nys-1, nyn+1 … … 968 970 IF ( inflow_damping_height == 9999999.9 ) THEN 969 971 ! 970 !-- Default: use the inversion height calculated by the prerun 971 inflow_damping_height = hom_sum(nzb+6,pr_palm,0) 972 !-- Default: use the inversion height calculated by the prerun; if 973 !-- this is zero, inflow_damping_height must be explicitly specified. 974 IF ( hom_sum(nzb+6,pr_palm,0) /= 0.0 ) THEN 975 inflow_damping_height = hom_sum(nzb+6,pr_palm,0) 976 ELSE 977 WRITE( message_string, * ) 'inflow_damping_height must be ', & 978 'explicitly specified because&the inversion height ', & 979 'calculated by the prerun is zero.' 980 CALL message( 'init_3d_model', 'PA0318', 1, 2, 0, 6, 0 ) 981 ENDIF 972 982 973 983 ENDIF -
palm/trunk/SOURCE/netcdf.f90
r288 r292 11 11 ! Output of NetCDF messages with aid of message handling routine. 12 12 ! Output of messages replaced by message handling routine. 13 ! Typographical errors fixed. 13 14 ! 14 15 ! … … 181 182 182 183 ! 183 !-- Select the mode to be processed. Possibilities are xy, xz, yz, pr and ts. 184 !-- Select the mode to be processed. Possibilities are 3d, xy, xz, yz, 185 !-- pr and ts. 184 186 SELECT CASE ( mode ) 185 187 … … 563 565 IF ( TRIM( var_list ) /= TRIM( var_list_old ) ) THEN 564 566 message_string = 'NetCDF file for volume data ' // & 565 TRIM( var ) // ' from previ uos run found,' // &567 TRIM( var ) // ' from previous run found,' // & 566 568 '&but this file cannot be extended due to' // & 567 569 ' variable mismatch.' // & … … 588 590 IF ( nz_do3d-nzb+1 /= nz_old ) THEN 589 591 message_string = 'NetCDF file for volume data ' // & 590 TRIM( var ) // ' from previ uos run found,' // &592 TRIM( var ) // ' from previous run found,' // & 591 593 '&but this file cannot be extended due to' // & 592 594 ' mismatch in number of' // & … … 624 626 IF ( last_time_coordinate(1) >= simulated_time ) THEN 625 627 message_string = 'NetCDF file for volume data ' // & 626 TRIM( var ) // ' from previ uos run found,' // &628 TRIM( var ) // ' from previous run found,' // & 627 629 '&but this file cannot be extended becaus' // & 628 630 'e the current output time' // & … … 648 650 649 651 ! 650 !-- Change the tit elattribute on file652 !-- Change the title attribute on file 651 653 nc_stat = NF90_PUT_ATT( id_set_3d(av), NF90_GLOBAL, 'title', & 652 654 TRIM( run_description_header ) ) … … 1139 1141 IF ( TRIM( var_list ) /= TRIM( var_list_old ) ) THEN 1140 1142 message_string = 'NetCDF file for cross-sections ' // & 1141 TRIM( var ) // ' from previ uos run found,' // &1143 TRIM( var ) // ' from previous run found,' // & 1142 1144 '& but this file cannot be extended due to' // & 1143 1145 ' variable mismatch.' // & … … 1172 1174 IF ( ns /= ns_old ) THEN 1173 1175 message_string = 'NetCDF file for cross-sections ' // & 1174 TRIM( var ) // ' from previ uos run found,' // &1176 TRIM( var ) // ' from previous run found,' // & 1175 1177 '&but this file cannot be extended due to' // & 1176 1178 ' mismatch in number of' // & … … 1193 1195 IF ( zu(section(i,1)) /= netcdf_data(i) ) THEN 1194 1196 message_string = 'NetCDF file for cross-sections ' // & 1195 TRIM( var ) // ' from previ uos run found,' // &1197 TRIM( var ) // ' from previous run found,' // & 1196 1198 '&but this file cannot be extended' // & 1197 1199 ' due to mismatch in cross' // & … … 1206 1208 IF ( -1.0 /= netcdf_data(i) ) THEN 1207 1209 message_string = 'NetCDF file for cross-sections ' // & 1208 TRIM( var ) // ' from previ uos run found,' // &1210 TRIM( var ) // ' from previous run found,' // & 1209 1211 '&but this file cannot be extended' // & 1210 1212 ' due to mismatch in cross' // & … … 1246 1248 IF ( last_time_coordinate(1) >= simulated_time ) THEN 1247 1249 message_string = 'NetCDF file for cross sections ' // & 1248 TRIM( var ) // ' from previ uos run found,' // &1250 TRIM( var ) // ' from previous run found,' // & 1249 1251 '&but this file cannot be extended becaus' // & 1250 1252 'e the current output time' // & … … 1274 1276 1275 1277 ! 1276 !-- Change the tit elattribute on file1278 !-- Change the title attribute on file 1277 1279 nc_stat = NF90_PUT_ATT( id_set_xy(av), NF90_GLOBAL, 'title', & 1278 1280 TRIM( run_description_header ) ) … … 1661 1663 IF ( TRIM( var_list ) /= TRIM( var_list_old ) ) THEN 1662 1664 message_string = 'NetCDF file for cross-sections ' // & 1663 TRIM( var ) // ' from previ uos run found,' // &1665 TRIM( var ) // ' from previous run found,' // & 1664 1666 '& but this file cannot be extended due to' // & 1665 1667 ' variable mismatch.' // & … … 1694 1696 IF ( ns /= ns_old ) THEN 1695 1697 message_string = 'NetCDF file for cross-sections ' // & 1696 TRIM( var ) // ' from previ uos run found,' // &1698 TRIM( var ) // ' from previous run found,' // & 1697 1699 '&but this file cannot be extended due to' // & 1698 1700 ' mismatch in number of' // & … … 1715 1717 IF ( ( section(i,2) * dy ) /= netcdf_data(i) ) THEN 1716 1718 message_string = 'NetCDF file for cross-sections ' // & 1717 TRIM( var ) // ' from previ uos run found,' // &1719 TRIM( var ) // ' from previous run found,' // & 1718 1720 '&but this file cannot be extended' // & 1719 1721 ' due to mismatch in cross' // & … … 1728 1730 IF ( -1.0 /= netcdf_data(i) ) THEN 1729 1731 message_string = 'NetCDF file for cross-sections ' // & 1730 TRIM( var ) // ' from previ uos run found,' // &1732 TRIM( var ) // ' from previous run found,' // & 1731 1733 '&but this file cannot be extended' // & 1732 1734 ' due to mismatch in cross' // & … … 1768 1770 IF ( last_time_coordinate(1) >= simulated_time ) THEN 1769 1771 message_string = 'NetCDF file for cross sections ' // & 1770 TRIM( var ) // ' from previ uos run found,' // &1772 TRIM( var ) // ' from previous run found,' // & 1771 1773 '&but this file cannot be extended becaus' // & 1772 1774 'e the current output time' // & … … 1796 1798 1797 1799 ! 1798 !-- Change the tit elattribute on file1800 !-- Change the title attribute on file 1799 1801 nc_stat = NF90_PUT_ATT( id_set_xz(av), NF90_GLOBAL, 'title', & 1800 1802 TRIM( run_description_header ) ) … … 2181 2183 IF ( TRIM( var_list ) /= TRIM( var_list_old ) ) THEN 2182 2184 message_string = 'NetCDF file for cross-sections ' // & 2183 TRIM( var ) // ' from previ uos run found,' // &2185 TRIM( var ) // ' from previous run found,' // & 2184 2186 '& but this file cannot be extended due to' // & 2185 2187 ' variable mismatch.' // & … … 2214 2216 IF ( ns /= ns_old ) THEN 2215 2217 message_string = 'NetCDF file for cross-sections ' // & 2216 TRIM( var ) // ' from previ uos run found,' // &2218 TRIM( var ) // ' from previous run found,' // & 2217 2219 '&but this file cannot be extended due to' // & 2218 2220 ' mismatch in number of' // & … … 2235 2237 IF ( ( section(i,3) * dx ) /= netcdf_data(i) ) THEN 2236 2238 message_string = 'NetCDF file for cross-sections ' // & 2237 TRIM( var ) // ' from previ uos run found,' // &2239 TRIM( var ) // ' from previous run found,' // & 2238 2240 '&but this file cannot be extended' // & 2239 2241 ' due to mismatch in cross' // & … … 2248 2250 IF ( -1.0 /= netcdf_data(i) ) THEN 2249 2251 message_string = 'NetCDF file for cross-sections ' // & 2250 TRIM( var ) // ' from previ uos run found,' // &2252 TRIM( var ) // ' from previous run found,' // & 2251 2253 '&but this file cannot be extended' // & 2252 2254 ' due to mismatch in cross' // & … … 2288 2290 IF ( last_time_coordinate(1) >= simulated_time ) THEN 2289 2291 message_string = 'NetCDF file for cross sections ' // & 2290 TRIM( var ) // ' from previ uos run found,' // &2292 TRIM( var ) // ' from previous run found,' // & 2291 2293 '&but this file cannot be extended becaus' // & 2292 2294 'e the current output time' // & … … 2316 2318 2317 2319 ! 2318 !-- Change the tit elattribute on file2320 !-- Change the title attribute on file 2319 2321 nc_stat = NF90_PUT_ATT( id_set_yz(av), NF90_GLOBAL, 'title', & 2320 2322 TRIM( run_description_header ) ) … … 2528 2530 IF ( TRIM( var_list ) /= TRIM( var_list_old ) ) THEN 2529 2531 message_string = 'NetCDF file for vertical profiles ' // & 2530 'from previ uos run found,' // &2532 'from previous run found,' // & 2531 2533 '& but this file cannot be extended due to' // & 2532 2534 ' variable mismatch.' // & … … 2562 2564 IF ( last_time_coordinate(1) >= simulated_time ) THEN 2563 2565 message_string = 'NetCDF file for vertical profiles ' // & 2564 'from previ uos run found,' // &2566 'from previous run found,' // & 2565 2567 '&but this file cannot be extended becaus' // & 2566 2568 'e the current output time' // & … … 2743 2745 IF ( TRIM( var_list ) /= TRIM( var_list_old ) ) THEN 2744 2746 message_string = 'NetCDF file for time series ' // & 2745 'from previ uos run found,' // &2747 'from previous run found,' // & 2746 2748 '& but this file cannot be extended due to' // & 2747 2749 ' variable mismatch.' // & … … 2777 2779 IF ( last_time_coordinate(1) >= simulated_time ) THEN 2778 2780 message_string = 'NetCDF file for time series ' // & 2779 'from previ uos run found,' // &2781 'from previous run found,' // & 2780 2782 '&but this file cannot be extended becaus' // & 2781 2783 'e the current output time' // & … … 3099 3101 IF ( TRIM( var_list ) /= TRIM( var_list_old ) ) THEN 3100 3102 message_string = 'NetCDF file for spectra ' // & 3101 'from previ uos run found,' // &3103 'from previous run found,' // & 3102 3104 '& but this file cannot be extended due to' // & 3103 3105 ' variable mismatch.' // & … … 3133 3135 IF ( ns /= ns_old ) THEN 3134 3136 message_string = 'NetCDF file for spectra ' // & 3135 ' from previ uos run found,' // &3137 ' from previous run found,' // & 3136 3138 '&but this file cannot be extended due to' // & 3137 3139 ' mismatch in number of' // & … … 3153 3155 IF ( zu(comp_spectra_level(i)) /= netcdf_data(i) ) THEN 3154 3156 message_string = 'NetCDF file for spectra ' // & 3155 ' from previ uos run found,' // &3157 ' from previous run found,' // & 3156 3158 '&but this file cannot be extended due to' // & 3157 3159 ' mismatch in heights of' // & … … 3191 3193 IF ( last_time_coordinate(1) >= simulated_time ) THEN 3192 3194 message_string = 'NetCDF file for spectra ' // & 3193 'from previ uos run found,' // &3195 'from previous run found,' // & 3194 3196 '&but this file cannot be extended becaus' // & 3195 3197 'e the current output time' // & … … 3228 3230 3229 3231 ! 3230 !-- Change the tit elattribute on file3232 !-- Change the title attribute on file 3231 3233 IF ( averaging_interval_sp /= 0.0 ) THEN 3232 3234 WRITE (time_average_text,'('', '',F7.1,'' s average'')') & … … 3350 3352 IF ( last_time_coordinate(1) >= simulated_time ) THEN 3351 3353 message_string = 'NetCDF file for particles ' // & 3352 'from previ uos run found,' // &3354 'from previous run found,' // & 3353 3355 '&but this file cannot be extended becaus' // & 3354 3356 'e the current output time' // & … … 3508 3510 IF ( TRIM( var_list ) /= TRIM( var_list_old ) ) THEN 3509 3511 message_string = 'NetCDF file for particle time series ' // & 3510 'from previ uos run found,' // &3512 'from previous run found,' // & 3511 3513 '& but this file cannot be extended due to' // & 3512 3514 ' variable mismatch.' // & … … 3542 3544 IF ( last_time_coordinate(1) >= simulated_time ) THEN 3543 3545 message_string = 'NetCDF file for particle time series ' // & 3544 'from previ uos run found,' // &3546 'from previous run found,' // & 3545 3547 '&but this file cannot be extended becaus' // & 3546 3548 'e the current output time' // &
Note: See TracChangeset
for help on using the changeset viewer.
