Changeset 3615 for palm/trunk/UTIL
- Timestamp:
- Dec 10, 2018 7:21:03 AM (6 years ago)
- Location:
- palm/trunk/UTIL/inifor/src
- Files:
-
- 4 edited
-
inifor.f90 (modified) (7 diffs)
-
inifor_grid.f90 (modified) (22 diffs)
-
inifor_io.f90 (modified) (18 diffs)
-
inifor_transform.f90 (modified) (8 diffs)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/UTIL/inifor/src/inifor.f90
r3613 r3615 26 26 ! ----------------- 27 27 ! $Id$ 28 ! bugfix: abort replaced by inifor_abort 29 ! 30 ! 3613 2018-12-07 18:20:37Z eckhard 28 31 ! Moved version output to setup_parameters() 29 32 ! … … 177 180 message = "Input buffers for group '" // TRIM(group % kind) // & 178 181 "' could not be preprocessed sucessfully." 179 CALL abort('main loop', message)182 CALL inifor_abort('main loop', message) 180 183 END IF 181 184 … … 216 219 217 220 message = "'" // TRIM(output_var % kind) // "' is not a soil variable" 218 CALL abort("main loop", message)221 CALL inifor_abort("main loop", message) 219 222 220 223 END SELECT … … 310 313 311 314 CASE DEFAULT 312 CALL abort('main loop', message)315 CALL inifor_abort('main loop', message) 313 316 314 317 END SELECT … … 348 351 349 352 CASE DEFAULT 350 CALL abort('main loop', message)353 CALL inifor_abort('main loop', message) 351 354 352 355 END SELECT … … 419 422 "' is not a valid '" // TRIM(output_var % kind) //& 420 423 "' variable kind." 421 CALL abort('main loop', message)424 CALL inifor_abort('main loop', message) 422 425 END SELECT 423 426 CALL run_control('time', 'comp') … … 426 429 message = "Averaging of large-scale forcing profiles " //& 427 430 "has not been implemented, yet." 428 CALL abort('main loop', message)431 CALL inifor_abort('main loop', message) 429 432 430 433 CASE DEFAULT 431 434 message = "Processing task '" // TRIM(output_var % task) //& 432 435 "' not recognized." 433 CALL abort('', message)436 CALL inifor_abort('', message) 434 437 435 438 END SELECT -
palm/trunk/UTIL/inifor/src/inifor_grid.f90
r3614 r3615 26 26 ! ----------------- 27 27 ! $Id$ 28 ! bugfix: abort replaced by inifor_abort 29 ! 30 ! 3614 2018-12-10 07:05:46Z raasch 28 31 ! unused variables removed 29 32 ! … … 412 415 message = "Averaging of large-scale forcing profiles " // & 413 416 "has not been implemented, yet." 414 CALL abort('setup_parameters', message)417 CALL inifor_abort('setup_parameters', message) 415 418 END IF 416 419 … … 1188 1191 1189 1192 message = "Interpolation quantity '" // kind // "' is not supported." 1190 CALL abort('setup_interpolation', message)1193 CALL inifor_abort('setup_interpolation', message) 1191 1194 1192 1195 END SELECT … … 1289 1292 IF (.NOT.PRESENT(z)) THEN 1290 1293 message = "z has not been passed but is required for 'boundary' grids" 1291 CALL abort('init_grid_definition', message)1294 CALL inifor_abort('init_grid_definition', message) 1292 1295 END IF 1293 1296 … … 1346 1349 IF (.NOT.PRESENT(z)) THEN 1347 1350 message = "z has not been passed but is required for 'palm' grids" 1348 CALL abort('init_grid_definition', message)1351 CALL inifor_abort('init_grid_definition', message) 1349 1352 END IF 1350 1353 1351 1354 IF (.NOT.PRESENT(zw)) THEN 1352 1355 message = "zw has not been passed but is required for 'palm' grids" 1353 CALL abort('init_grid_definition', message)1356 CALL inifor_abort('init_grid_definition', message) 1354 1357 END IF 1355 1358 … … 1472 1475 CASE DEFAULT 1473 1476 message = "Grid kind '" // TRIM(kind) // "' is not recognized." 1474 CALL abort('init_grid_definition', message)1477 CALL inifor_abort('init_grid_definition', message) 1475 1478 1476 1479 END SELECT … … 1559 1562 message = "Averaging grid kind '" // TRIM(avg_grid % kind) // & 1560 1563 "' is not supported. Use 'scalar', 'u', or 'v'." 1561 CALL abort('get_cosmo_averaging_region', message)1564 CALL inifor_abort('get_cosmo_averaging_region', message) 1562 1565 1563 1566 END SELECT … … 1609 1612 message = "Averaging grid kind '" // TRIM(avg_grid % kind) // & 1610 1613 "' is not supported. Use 'scalar', 'u', or 'v'." 1611 CALL abort('get_cosmo_averaging_region', message)1614 CALL inifor_abort('get_cosmo_averaging_region', message) 1612 1615 1613 1616 END SELECT … … 1682 1685 IF ( dz(1) == -1.0_dp ) THEN 1683 1686 message = 'missing dz' 1684 CALL abort( 'stretched_z', message)1687 CALL inifor_abort( 'stretched_z', message) 1685 1688 ELSEIF ( dz(1) <= 0.0_dp ) THEN 1686 1689 WRITE( message, * ) 'dz=', dz(1),' <= 0.0' 1687 CALL abort( 'stretched_z', message)1690 CALL inifor_abort( 'stretched_z', message) 1688 1691 ENDIF 1689 1692 … … 1718 1721 'dz_stretch_level_end + 1 = ', & 1719 1722 number_stretch_level_end+1 1720 CALL abort( 'stretched_z', message)1723 CALL inifor_abort( 'stretched_z', message) 1721 1724 ENDIF 1722 1725 … … 1731 1734 'dz_stretch_level_start = ', & 1732 1735 number_stretch_level_start 1733 CALL abort( 'stretched_z', message)1736 CALL inifor_abort( 'stretched_z', message) 1734 1737 ENDIF 1735 1738 … … 1744 1747 'values for dz_stretch_level_end = ', & 1745 1748 number_stretch_level_end 1746 CALL abort( 'stretched_z', message)1749 CALL inifor_abort( 'stretched_z', message) 1747 1750 ENDIF 1748 1751 … … 1782 1785 'dz_stretch_level_start + 4*MAX(dz(n),dz(n+1)) '//& 1783 1786 'to allow for smooth grid stretching' 1784 CALL abort('stretched_z', message)1787 CALL inifor_abort('stretched_z', message) 1785 1788 ENDIF 1786 1789 … … 1792 1795 WRITE( message, * ) 'Eeach dz_stretch_level_start has to be ',& 1793 1796 'larger than ', dz(1) * 1.5 1794 CALL abort( 'stretched_z', message)1797 CALL inifor_abort( 'stretched_z', message) 1795 1798 ENDIF 1796 1799 … … 2016 2019 ELSE 2017 2020 message = 'Two adjacent values of dz must be different' 2018 CALL abort( 'calculate_stretching_factor', message)2021 CALL inifor_abort( 'calculate_stretching_factor', message) 2019 2022 ENDIF 2020 2023 … … 2032 2035 ' &or lower limit = ', & 2033 2036 stretch_factor_lower_limit 2034 CALL abort( 'calculate_stretching_factor', message )2037 CALL inifor_abort( 'calculate_stretching_factor', message ) 2035 2038 2036 2039 ENDIF … … 2316 2319 IF (TRIM(cfg % start_date) == '') THEN 2317 2320 message = 'Simulation start date has not been set.' 2318 CALL abort('setup_variable_tables', message)2321 CALL inifor_abort('setup_variable_tables', message) 2319 2322 END IF 2320 2323 … … 3605 3608 CASE DEFAULT 3606 3609 message = "Variable kind '" // TRIM(kind) // "' not recognized." 3607 CALL abort ('init_nc_var', message)3610 CALL inifor_abort ('init_nc_var', message) 3608 3611 3609 3612 END SELECT … … 3738 3741 message = "Rotation method '" // TRIM(cfg % rotation_method) // & 3739 3742 "' not recognized." 3740 CALL abort('preprocess', message)3743 CALL inifor_abort('preprocess', message) 3741 3744 3742 3745 END SELECT … … 3926 3929 CASE DEFAULT 3927 3930 message = "Invalid averaging period '" // TRIM(str(dt)) // " hours" 3928 CALL abort('preprocess', message)3931 CALL inifor_abort('preprocess', message) 3929 3932 3930 3933 END SELECT … … 3971 3974 CASE DEFAULT 3972 3975 message = "Invalid averaging period '" // TRIM(str(dt)) // " hours" 3973 CALL abort('preprocess', message)3976 CALL inifor_abort('preprocess', message) 3974 3977 3975 3978 END SELECT … … 3978 3981 CASE DEFAULT 3979 3982 message = "IO group kind '" // TRIM(group % kind) // "' is not supported." 3980 CALL abort('prerpocess', message)3983 CALL inifor_abort('prerpocess', message) 3981 3984 3982 3985 END SELECT -
palm/trunk/UTIL/inifor/src/inifor_io.f90
r3557 r3615 26 26 ! ----------------- 27 27 ! $Id$ 28 ! bugfix: abort replaced by inifor_abort 29 ! 30 ! 3557 2018-11-22 16:01:22Z eckhard 28 31 ! Updated documentation, removed unused subroutine write_netcdf_variable_2d() 29 32 ! … … 147 150 message = "Failed to read '" // TRIM(in_var % name) // & 148 151 "' from file '" // TRIM(in_file) // "'." 149 CALL abort('get_netcdf_variable', message)152 CALL inifor_abort('get_netcdf_variable', message) 150 153 151 154 END IF … … 191 194 message = "Failed to read '" // TRIM(in_var % name) // & 192 195 "' from file '" // TRIM(in_file) // "'." 193 CALL abort('get_netcdf_variable', message)196 CALL inifor_abort('get_netcdf_variable', message) 194 197 195 198 END IF … … 229 232 message = "Failed to read '" // TRIM(coordname) // & 230 233 "' from file '" // TRIM(filename) // "'." 231 CALL abort('get_netcdf_dim_vector', message)234 CALL inifor_abort('get_netcdf_dim_vector', message) 232 235 233 236 END IF … … 288 291 " dimensions because only two- and and three-dimensional" // & 289 292 " variables are supported." 290 CALL abort('get_netcdf_start_and_count', message)293 CALL inifor_abort('get_netcdf_start_and_count', message) 291 294 292 295 END IF … … 429 432 430 433 CASE( '-clon', '-clat' ) 431 CALL abort('parse_command_line_arguments', message)434 CALL inifor_abort('parse_command_line_arguments', message) 432 435 433 436 CASE( '-path', '-p', '--path' ) … … 504 507 CASE DEFAULT 505 508 message = "unknown option '" // TRIM(option) // "'." 506 CALL abort('parse_command_line_arguments', message)509 CALL inifor_abort('parse_command_line_arguments', message) 507 510 508 511 END SELECT … … 560 563 IF (.NOT. all_files_present) THEN 561 564 message = "INIFOR configuration invalid; some input files are missing." 562 CALL abort( 'validate_config', message )565 CALL inifor_abort( 'validate_config', message ) 563 566 END IF 564 567 … … 572 575 "or omit the -i/--init-mode/-mode option entirely, which corresponds "//& 573 576 "to the latter." 574 CALL abort( 'validate_config', message )577 CALL inifor_abort( 'validate_config', message ) 575 578 END SELECT 576 579 … … 584 587 "or omit the -f/--forcing-mode option entirely, which corresponds "//& 585 588 "to the latter." 586 CALL abort( 'validate_config', message )589 CALL inifor_abort( 'validate_config', message ) 587 590 END SELECT 588 591 … … 595 598 "or omit the --averaging-mode option entirely, which corresponds "//& 596 599 "to the latter." 597 CALL abort( 'validate_config', message )600 CALL inifor_abort( 'validate_config', message ) 598 601 END SELECT 599 602 … … 601 604 message = "You specified only one component of the geostrophic " // & 602 605 "wind. Please specify either both or none." 603 CALL abort( 'validate_config', message )606 CALL inifor_abort( 'validate_config', message ) 604 607 END IF 605 608 … … 921 924 "' contains " // & 922 925 TRIM( str(SIZE(group % in_var_list)) ) // "." 923 CALL abort('read_input_variables | accumulation', message)926 CALL inifor_abort('read_input_variables | accumulation', message) 924 927 END IF 925 928 … … 1007 1010 CASE DEFAULT 1008 1011 message = "Invalid step '" // TRIM(str(step)) 1009 CALL abort('select_buffer', message)1012 CALL inifor_abort('select_buffer', message) 1010 1013 END SELECT 1011 1014 END FUNCTION select_buffer … … 1036 1039 message = "Failed to read '" // TRIM(var) // & 1037 1040 "' from file '" // TRIM(input_file) // "'." 1038 CALL abort('get_pressure_var', message)1041 CALL inifor_abort('get_pressure_var', message) 1039 1042 1040 1043 END IF … … 1066 1069 message = "Failed to read '" // TRIM(attribute) // & 1067 1070 "' from file '" // TRIM(filename) // "'." 1068 CALL abort('get_netcdf_attribute', message)1071 CALL inifor_abort('get_netcdf_attribute', message) 1069 1072 1070 1073 END IF … … 1193 1196 message = "Variable kind '" // TRIM(var % kind) // & 1194 1197 "' not recognized." 1195 CALL abort('update_output', message)1198 CALL inifor_abort('update_output', message) 1196 1199 1197 1200 END SELECT … … 1214 1217 message = "NetCDF API call failed with error: " // & 1215 1218 TRIM( nf90_strerror(status) ) 1216 CALL abort('io.check', message)1219 CALL inifor_abort('io.check', message) 1217 1220 END IF 1218 1221 -
palm/trunk/UTIL/inifor/src/inifor_transform.f90
r3614 r3615 26 26 ! ----------------- 27 27 ! $Id$ 28 ! bugfix: abort replaced by inifor_abort 29 ! 30 ! 3614 2018-12-10 07:05:46Z raasch 28 31 ! unused variables removed 29 32 ! … … 184 187 TRIM(str(UBOUND(outvar, 3))) // ") than input variable ("//& 185 188 TRIM(str(UBOUND(invar, 3))) // ")." 186 CALL abort('interpolate_2d', message)189 CALL inifor_abort('interpolate_2d', message) 187 190 END IF 188 191 … … 223 226 NEW_LINE(' ') // "ii has " // str(SIZE(ii)) // " elements, " // & 224 227 NEW_LINE(' ') // "jj has " // str(SIZE(jj)) // "." 225 CALL abort('average_2d', message)228 CALL inifor_abort('average_2d', message) 226 229 END IF 227 230 … … 848 851 849 852 message = "PALM-4U grid extends above COSMO-DE model top." 850 CALL abort('find_vertical_neighbours_and_weights', message)853 CALL inifor_abort('find_vertical_neighbours_and_weights', message) 851 854 852 855 ELSE IF (point_is_below_grid) THEN … … 873 876 message = "Index " // TRIM(str(k_intermediate)) // & 874 877 " is above intermediate grid range." 875 CALL abort('find_vertical_neighbours', message)878 CALL inifor_abort('find_vertical_neighbours', message) 876 879 END IF 877 880 … … 982 985 983 986 message = "PALM-4U grid extends above COSMO-DE model top." 984 CALL abort('find_vertical_neighbours_and_weights_average', message)987 CALL inifor_abort('find_vertical_neighbours_and_weights_average', message) 985 988 986 989 ELSE IF (point_is_below_grid) THEN … … 1010 1013 message = "Index " // TRIM(str(k_intermediate)) // & 1011 1014 " is above intermediate grid range." 1012 CALL abort('find_vertical_neighbours', message)1015 CALL inifor_abort('find_vertical_neighbours', message) 1013 1016 END IF 1014 1017 … … 1108 1111 message = "Horizontal weight wl = " // TRIM(real_to_str(wl)) // & 1109 1112 " is out bounds." 1110 CALL abort('compute_horizontal_interp_weights', message)1113 CALL inifor_abort('compute_horizontal_interp_weights', message) 1111 1114 END IF 1112 1115 IF (wp > 1.0_dp .OR. wp < 0.0_dp) THEN 1113 1116 message = "Horizontal weight wp = " // TRIM(real_to_str(wp)) // & 1114 1117 " is out bounds." 1115 CALL abort('compute_horizontal_interp_weights', message)1118 CALL inifor_abort('compute_horizontal_interp_weights', message) 1116 1119 END IF 1117 1120
Note: See TracChangeset
for help on using the changeset viewer.
