Changeset 258 for palm/trunk/SOURCE
- Timestamp:
- Mar 13, 2009 12:36:03 PM (16 years ago)
- Location:
- palm/trunk/SOURCE
- Files:
-
- 12 edited
-
CURRENT_MODIFICATIONS (modified) (2 diffs)
-
surface_coupler.f90 (modified) (2 diffs)
-
temperton_fft.f90 (modified) (3 diffs)
-
timestep.f90 (modified) (2 diffs)
-
user_actions.f90 (modified) (3 diffs)
-
user_data_output_dvrp.f90 (modified) (2 diffs)
-
user_dvrp_coltab.f90 (modified) (3 diffs)
-
user_init_grid.f90 (modified) (3 diffs)
-
user_init_plant_canopy.f90 (modified) (3 diffs)
-
user_parin.f90 (modified) (2 diffs)
-
user_read_restart_data.f90 (modified) (2 diffs)
-
user_spectra.f90 (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/CURRENT_MODIFICATIONS
r257 r258 29 29 init_1d_model, init_3d_model, init_dvrp, init_grid, init_particles, init_pegrid, 30 30 netcdf, parin, plant_canopy_model, poisfft_hybrid, poismg, read_3d_binary, 31 read_var_list) 31 read_var_list, surface_coupler, temperton_fft, timestep, user_actions, 32 user_data_output_dvrp, user_dvrp_coltab, user_init_grid, user_init_plant_canopy, 33 user_parin, user_read_restart_data, user_spectra ) 32 34 33 35 First constant in array den also defined as type double. (eqn_state_seawater) … … 37 39 user_init_grid, user_parin, write_var_list) 38 40 39 advec_particles, advec_s_bc, buoyancy, calc_spectra, check_for_restart, check_open, check_parameters, coriolis, cpu_log, data_output_2d, data_output_3d, data_output_dvrp, data_output_profiles, data_output_spectra, eqn_state_seawater, fft_xy, flow_statistics, header, init_1d_model, init_3d_model, init_dvrp, init_grid, init_particles, init_pegrid, netcdf, parin, plant_canopy_model, poisfft_hybrid, poismg, read_3d_binary, read_var_list, sort_particles, user_check_parameters, user_header, user_init_grid, user_parin, write_var_list41 advec_particles, advec_s_bc, buoyancy, calc_spectra, check_for_restart, check_open, check_parameters, coriolis, cpu_log, data_output_2d, data_output_3d, data_output_dvrp, data_output_profiles, data_output_spectra, eqn_state_seawater, fft_xy, flow_statistics, header, init_1d_model, init_3d_model, init_dvrp, init_grid, init_particles, init_pegrid, netcdf, parin, plant_canopy_model, poisfft_hybrid, poismg, read_3d_binary, read_var_list, sort_particles, user_check_parameters, user_header, user_init_grid, user_parin, surface_coupler, temperton_fft, timestep, user_actions, user_data_output_dvrp, user_dvrp_coltab, user_init_grid, user_init_plant_canopy, user_parin, user_read_restart_data, user_spectra, write_var_list 40 42 41 43 -
palm/trunk/SOURCE/surface_coupler.f90
r226 r258 2 2 3 3 !------------------------------------------------------------------------------! 4 ! Actualrevisions:4 ! Current revisions: 5 5 ! ----------------- 6 ! 6 ! Output of messages replaced by message handling routine. 7 ! 7 8 ! 8 9 ! Former revisions: … … 52 53 0, comm_inter, status, ierr ) 53 54 IF ( terminate_coupled_remote > 0 ) THEN 54 IF ( myid == 0 ) THEN 55 PRINT*, '+++ surface_coupler:' 56 PRINT*, ' remote model "', TRIM( coupling_mode_remote ), & 57 '" terminated' 58 PRINT*, ' with terminate_coupled_remote = ', & 59 terminate_coupled_remote 60 PRINT*, ' local model "', TRIM( coupling_mode ), & 61 '" has' 62 PRINT*, ' terminate_coupled = ', & 63 terminate_coupled 64 ENDIF 65 CALL local_stop 55 WRITE( message_string, * ) 'remote model "', TRIM( coupling_mode_remote ), & 56 '" terminated', & 57 '&with terminate_coupled_remote = ', & 58 terminate_coupled_remote, & 59 '&local model "', TRIM( coupling_mode ), & 60 '" has', & 61 '&terminate_coupled = ', & 62 terminate_coupled 63 CALL message( 'surface_coupler', 'PA0310', 1, 2, 0, 6, 0 ) 66 64 RETURN 67 65 ENDIF -
palm/trunk/SOURCE/temperton_fft.f90
r4 r258 2 2 3 3 !------------------------------------------------------------------------------! 4 ! Actualrevisions:4 ! Current revisions: 5 5 ! ----------------- 6 ! 6 ! Output of messages replaced by message handling routine. 7 ! 7 8 ! 8 9 ! Former revisions: … … 1884 1885 1885 1886 1887 USE control_parameters 1886 1888 USE pegrid 1887 1889 … … 1945 1947 1946 1948 ! WRITE (nout,'(A,I4,A)') ' n =',n,' - Contains illegal factors' 1947 IF ( myid == 0 ) THEN 1948 PRINT*, '+++ temperton_fft:' 1949 PRINT*, ' number of gridpoints along x or/and y contain illegal ', & 1950 'factors' 1951 PRINT*, ' only factors 8,6,5,4,3,2 are allowed' 1952 ENDIF 1953 CALL local_stop 1954 1949 message_string = 'number of gridpoints along x or/and y ' // & 1950 'contain illegal factors' // & 1951 '&only factors 8,6,5,4,3,2 are allowed' 1952 CALL message( 'temperton_fft', 'PA0311', 1, 2, 0, 6, 0 ) 1955 1953 1956 1954 RETURN -
palm/trunk/SOURCE/timestep.f90
r226 r258 2 2 3 3 !------------------------------------------------------------------------------! 4 ! Actualrevisions:4 ! Current revisions: 5 5 ! ----------------- 6 ! 6 ! Output of messages replaced by message handling routine. 7 ! 7 8 ! 8 9 ! Former revisions: … … 201 202 stop_dt = .TRUE. 202 203 203 IF ( myid == 0 ) THEN 204 PRINT*,'+++ time_step: Time step has reached minimum limit.' 205 PRINT*,' dt = ', dt_3d, ' s Simulation is terminated.' 206 PRINT*,' old_dt = ', old_dt, ' s' 207 PRINT*,' dt_u = ', dt_u, ' s' 208 PRINT*,' dt_v = ', dt_v, ' s' 209 PRINT*,' dt_w = ', dt_w, ' s' 210 PRINT*,' dt_diff = ', dt_diff, ' s' 211 PRINT*,' u_max = ', u_max, ' m/s k=', u_max_ijk(1), & 212 ' j=', u_max_ijk(2), ' i=', u_max_ijk(3) 213 PRINT*,' v_max = ', v_max, ' m/s k=', v_max_ijk(1), & 214 ' j=', v_max_ijk(2), ' i=', v_max_ijk(3) 215 PRINT*,' w_max = ', w_max, ' m/s k=', w_max_ijk(1), & 216 ' j=', w_max_ijk(2), ' i=', w_max_ijk(3) 217 ENDIF 204 WRITE( message_string, * ) 'Time step has reached minimum limit.', & 205 '&dt = ', dt_3d, ' s Simulation is terminated.', & 206 '&old_dt = ', old_dt, ' s', & 207 '&dt_u = ', dt_u, ' s', & 208 '&dt_v = ', dt_v, ' s', & 209 '&dt_w = ', dt_w, ' s', & 210 '&dt_diff = ', dt_diff, ' s', & 211 '&u_max = ', u_max, ' m/s k=', u_max_ijk(1), & 212 ' j=', u_max_ijk(2), ' i=', u_max_ijk(3), & 213 '&v_max = ', v_max, ' m/s k=', v_max_ijk(1), & 214 ' j=', v_max_ijk(2), ' i=', v_max_ijk(3), & 215 '&w_max = ', w_max, ' m/s k=', w_max_ijk(1), & 216 ' j=', w_max_ijk(2), ' i=', w_max_ijk(3) 217 CALL message( 'timestep', 'PA0312', 0, 1, 0, 6, 0 ) 218 218 ! 219 219 !-- In case of coupled runs inform the remote model of the termination -
palm/trunk/SOURCE/user_actions.f90
r226 r258 2 2 3 3 !------------------------------------------------------------------------------! 4 ! Actualrevisions:4 ! Current revisions: 5 5 ! ----------------- 6 ! 6 ! Output of messages replaced by message handling routine. 7 ! 7 8 ! 8 9 ! Former revisions: … … 113 114 114 115 CASE DEFAULT 115 IF ( myid == 0 ) PRINT*, '+++ user_actions: unknown location "', & 116 location, '"' 117 CALL local_stop 116 message_string = 'unknown location "' // location // '"' 117 CALL message( 'user_actions', 'UI0001', 1, 2, 0, 6, 0 ) 118 118 119 119 END SELECT … … 168 168 169 169 CASE ( 'before_timestep', 'after_integration', 'after_timestep' ) 170 IF ( myid == 0 ) THEN 171 PRINT*, '+++ user_actions: location "', location, '" is not ', & 170 message_string = 'location "' // location // '" is not ' // & 172 171 'allowed to be called with parameters "i" and "j"' 173 ENDIF 174 CALL local_stop 172 CALL message( 'user_actions', 'UI0002', 1, 2, 0, 6, 0 ) 175 173 176 174 177 175 CASE DEFAULT 178 IF ( myid == 0 ) PRINT*, '+++ user_actions: unknown location "', & 179 location, '"' 180 CALL local_stop 181 176 message_string = 'unknown location "' // location // '"' 177 CALL message( 'user_actions', 'UI0001', 1, 2, 0, 6, 0 ) 178 182 179 183 180 END SELECT -
palm/trunk/SOURCE/user_data_output_dvrp.f90
r246 r258 2 2 3 3 !------------------------------------------------------------------------------! 4 ! Actualrevisions:4 ! Current revisions: 5 5 ! ----------------- 6 ! Output of messages replaced by message handling routine. 6 7 ! Clipping implemented 7 8 ! … … 58 59 !-- wrong character string that is neither recognized in data_output_dvrp 59 60 !-- nor here in user_data_output_dvrp. 60 IF ( myid == 0 ) THEN61 PRINT*,'+++ (user_)data_output_dvrp: no output possible for: ', &62 output_variable63 ENDIF61 WRITE( message_string, * ) 'no output possible for: ', & 62 output_variable 63 CALL message( 'user_data_output_dvrp', 'UI0003', 0, 0, 0, 6, 0 ) 64 64 65 65 66 END SELECT -
palm/trunk/SOURCE/user_dvrp_coltab.f90
r226 r258 2 2 3 3 !------------------------------------------------------------------------------! 4 ! Actualrevisions:4 ! Current revisions: 5 5 ! ----------------- 6 ! 6 ! Output of messages replaced by message handling routine. 7 ! 7 8 ! 8 9 ! Former revisions: … … 17 18 ! Definition of the colour table to be used by the dvrp software. 18 19 !------------------------------------------------------------------------------! 19 20 21 USE control_parameters 20 22 USE dvrp_variables 21 23 USE pegrid … … 37 39 38 40 CASE DEFAULT 39 IF ( myid == 0 ) PRINT*, '+++ user_dvrp_coltab: unknown mode "', &40 mode, '"'41 CALL local_stop 41 message_string = 'unknown mode "' // mode // '"' 42 CALL message( 'user_dvrp_coltab', 'UI0004', 1, 2, 0, 6, 0 ) 43 42 44 43 45 END SELECT -
palm/trunk/SOURCE/user_init_grid.f90
r256 r258 2 2 3 3 !------------------------------------------------------------------------------! 4 ! Actualrevisions:4 ! Current revisions: 5 5 ! ----------------- 6 ! Output of messages replaced by message handling routine. 6 7 ! add 'single_street_canyon' as standard topography case 7 8 ! -topography_grid_convention … … 48 49 !-- Here the user can define his own topography. 49 50 !-- After definition, please remove the following three lines! 50 PRINT*, '+++ user_init_grid: topography "', & 51 topography, '" not available yet' 52 CALL local_stop 51 message_string = 'topography "' // topography // '" not available yet' 52 CALL message( 'user_init_grid', 'UI0005', 1, 2, 0, 6, 0 ) 53 53 54 54 CASE DEFAULT … … 57 57 !-- wrong character string that is neither recognized in init_grid nor 58 58 !-- here in user_init_grid. 59 PRINT*, '+++ (user_)init_grid: unknown topography "', & 60 topography, '"' 61 CALL local_stop 59 message_string = 'unknown topography "' // topography // '"' 60 CALL message( 'user_init_grid', 'UI0006', 1, 2, 0, 6, 0 ) 62 61 63 62 END SELECT -
palm/trunk/SOURCE/user_init_plant_canopy.f90
r226 r258 2 2 3 3 !------------------------------------------------------------------------------! 4 ! Actualrevisions:4 ! Current revisions: 5 5 ! ----------------- 6 ! 6 ! Output of messages replaced by message handling routine. 7 ! 7 8 ! 8 9 ! Former revisions: … … 59 60 !-- After definition, please 60 61 !-- remove the following three lines! 61 PRINT*, '+++ user_init_plant_canopy: canopy_mode "', &62 canopy_mode, '" not available yet'63 62 message_string = 'canopy_mode "' // canopy_mode // '" not available yet' 63 CALL message( 'user_init_plant_canopy', 'UI0007', 0, 1, 0, 6, 0 ) 64 64 65 CASE DEFAULT 65 66 ! … … 67 68 !-- wrong character string that is neither recognized in init_3d_model nor 68 69 !-- here in user_init_plant_canopy. 69 PRINT*, '+++ user_init_plant_canopy: unknown canopy_mode "', & 70 canopy_mode, '"' 71 CALL local_stop 70 message_string = 'unknown canopy_mode "' // canopy_mode // '"' 71 CALL message( 'user_init_plant_canopy', 'UI0008', 1, 2, 0, 6, 0 ) 72 72 73 73 END SELECT -
palm/trunk/SOURCE/user_parin.f90
r256 r258 2 2 3 3 !------------------------------------------------------------------------------! 4 ! Actualrevisions:4 ! Current revisions: 5 5 ! ----------------- 6 ! Output of messages replaced by message handling routine. 6 7 ! topography_grid_convention moved to inipar 7 8 ! … … 74 75 IF ( TRIM( initializing_actions ) == 'read_restart_data' ) THEN 75 76 IF ( max_pr_user /= max_pr_user_tmp ) THEN 76 PRINT*, '+++ user_parin: the number of user-defined profiles given in'77 PRINT*, ' data_output_pr (', max_pr_user_tmp, ' doe',&78 's not match the one'79 PRINT*, ' found in the restart file (', max_pr_user,&80 ')'81 CALL local_stop77 WRITE( message_string, * ) 'the number of user-defined profiles given in ', & 78 '&data_output_pr (', max_pr_user_tmp, ') doe', & 79 'snot match the one ', & 80 '&found in the restart file (', max_pr_user, & 81 ')' 82 CALL message( 'user_parin', 'UI0009', 1, 2, 0, 6, 0 ) 82 83 ENDIF 83 84 ELSE -
palm/trunk/SOURCE/user_read_restart_data.f90
r226 r258 5 5 6 6 !------------------------------------------------------------------------------! 7 ! Actualrevisions:7 ! Current revisions: 8 8 ! ----------------- 9 ! 9 ! Output of messages replaced by message handling routine. 10 ! 10 11 ! 11 12 ! Former revisions: … … 81 82 ! 82 83 ! CASE DEFAULT 83 ! PRINT*, '+++ user_init: unknown variable named "',&84 ! TRIM( field_char ), '" found in'85 ! PRINT*, 'data from prior run on PE ', myid86 ! CALL local_stop84 ! WRITE( message_string, * ) 'unknown variable named "', & 85 ! TRIM( field_char ), '" found in', & 86 ! '&data from prior run on PE ', myid 87 ! CALL message( 'user_spectra', 'UI0012', 1, 2, 0, 6, 0 ) 87 88 ! 88 89 ! END SELECT -
palm/trunk/SOURCE/user_spectra.f90
r226 r258 2 2 3 3 !------------------------------------------------------------------------------! 4 ! Actualrevisions:4 ! Current revisions: 5 5 ! ----------------- 6 ! 6 ! Output of messages replaced by message handling routine. 7 7 ! 8 8 ! Former revisions: … … 21 21 22 22 USE arrays_3d 23 USE control_parameters 23 24 USE indices 24 25 USE spectrum … … 52 53 53 54 CASE DEFAULT 54 PRINT*, '+++ user_spectra/preprocess: Spectra of ', & 55 TRIM( data_output_sp(m) ), ' can not be calculated' 56 55 message_string = 'Spectra of ' // & 56 TRIM( data_output_sp(m) ) // ' can not be calculated' 57 CALL message( 'user_spectra', 'UI0010', 0, 0, 0, 6, 0 ) 58 57 59 END SELECT 58 60 … … 69 71 70 72 CASE DEFAULT 71 PRINT*, '+++ user_spectra/data_output: Spectra of ', & 72 TRIM( data_output_sp(m) ), ' are not defined' 73 73 message_string = 'Spectra of ' // & 74 TRIM( data_output_sp(m) ) // ' are not defined' 75 CALL message( 'user_spectra', 'UI0011', 0, 0, 0, 6, 0 ) 76 74 77 END SELECT 75 78
Note: See TracChangeset
for help on using the changeset viewer.
