Changeset 3614 for palm/trunk
- Timestamp:
- Dec 10, 2018 7:05:46 AM (6 years ago)
- Location:
- palm/trunk
- Files:
-
- 12 edited
-
SOURCE/biometeorology_mod.f90 (modified) (5 diffs)
-
SOURCE/chem_photolysis_mod.f90 (modified) (2 diffs)
-
SOURCE/date_and_time_mod.f90 (modified) (3 diffs)
-
SOURCE/large_scale_forcing_nudging_mod.f90 (modified) (2 diffs)
-
SOURCE/netcdf_data_input_mod.f90 (modified) (6 diffs)
-
SOURCE/ocean_mod.f90 (modified) (5 diffs)
-
SOURCE/plant_canopy_model_mod.f90 (modified) (2 diffs)
-
SOURCE/surface_output_mod.f90 (modified) (6 diffs)
-
SOURCE/urban_surface_mod.f90 (modified) (11 diffs)
-
UTIL/inifor/src/inifor_control.f90 (modified) (6 diffs)
-
UTIL/inifor/src/inifor_grid.f90 (modified) (2 diffs)
-
UTIL/inifor/src/inifor_transform.f90 (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/biometeorology_mod.f90
r3593 r3614 27 27 ! ----------------- 28 28 ! $Id$ 29 ! unused variables removed 30 ! 31 ! 3593 2018-12-03 13:51:13Z kanani 29 32 ! Bugfix: additional tmrt_grid allocation in case bio_mrt not selected as ouput, 30 33 ! replace degree symbol by degree_C … … 157 160 LOGICAL :: aver_v = .FALSE. !< switch: do v averaging in this module? 158 161 LOGICAL :: aver_w = .FALSE. !< switch: do w averaging in this module? 159 LOGICAL :: aver_mrt = .FALSE. !< switch: do mrt averaging in this module?160 162 LOGICAL :: average_trigger_perct = .FALSE. !< update averaged input on call to bio_perct? 161 163 LOGICAL :: average_trigger_utci = .FALSE. !< update averaged input on call to bio_utci? … … 1076 1078 ONLY: message_string 1077 1079 1078 USE netcdf_data_input_mod, & 1079 ONLY: netcdf_data_input_uvem, uvem_projarea_f, uvem_radiance_f, & 1080 uvem_irradiance_f, uvem_integration_f, building_obstruction_f 1080 USE netcdf_data_input_mod, & 1081 ONLY: netcdf_data_input_uvem 1081 1082 1082 1083 IMPLICIT NONE … … 3930 3931 3931 3932 USE indices, & 3932 ONLY: n xlg, nxrg, nyng, nysg, nys, nyn, nxl, nxr3933 ONLY: nys, nyn, nxl, nxr 3933 3934 3934 3935 … … 4034 4035 ! 4035 4036 ! 4036 DO i = nxl, nxr !nxlg, nxrg4037 DO j = nys, nyn !nysg, nyng4037 DO i = nxl, nxr 4038 DO j = nys, nyn 4038 4039 ! 4039 4040 ! !-- extract obstruction from IBSET-Integer_Array ------------------' -
palm/trunk/SOURCE/chem_photolysis_mod.f90
r3298 r3614 26 26 ! ----------------- 27 27 ! $Id$ 28 ! unused variables removed 29 ! 30 ! 3298 2018-10-02 12:21:11Z kanani 28 31 ! Moved USE radiation_model_mod from MODULE section into Subroutine 29 32 ! in order to use constant photolysis without radiation module (forkel) … … 136 139 137 140 138 REAL(wp) :: time_photolysis = 0.0_wp, & !< time since last call of photolysis code139 dt_photolysis = 0.0_wp, & !< hotolysis model timestep140 skip_time_do_photolysis = 0.0_wp !< Radiation model is not called before this time141 142 141 REAL(wp) :: cosz = 0.7_wp !< cosine of Zenith angle (45 deg, if not specified otherwise) 143 142 -
palm/trunk/SOURCE/date_and_time_mod.f90
r3467 r3614 25 25 ! ----------------- 26 26 ! $Id$ 27 ! further tabs removed 28 ! 29 ! 3467 2018-10-30 19:05:21Z suehring 27 30 ! Tabs removed 28 31 ! … … 509 512 SELECT CASE(TRIM(daytype_mdh)) 510 513 511 CASE ("workday") 512 513 index_hh = nmonth+ nday + hh 514 515 CASE ("weekend") 516 517 index_hh = nmonth+ nday + nhour + hh 518 519 CASE ("holiday") 520 521 index_hh = nmonth+ nday + 2*nhour + hh 514 CASE ("workday") 515 516 index_hh = nmonth+ nday + hh 517 518 CASE ("weekend") 519 520 index_hh = nmonth+ nday + nhour + hh 521 522 CASE ("holiday") 523 524 index_hh = nmonth+ nday + 2*nhour + hh 525 522 526 END SELECT 523 527 … … 566 570 ELSE 567 571 568 DO i_mon=1,index_mm569 570 sum_dd=sum_dd+days(i_mon)571 572 ENDDO572 DO i_mon=1,index_mm 573 574 sum_dd=sum_dd+days(i_mon) 575 576 ENDDO 573 577 574 index_hh=(sum_dd*nhour)+(index_dd*nhour)+(hh)578 index_hh=(sum_dd*nhour)+(index_dd*nhour)+(hh) 575 579 576 580 ENDIF -
palm/trunk/SOURCE/large_scale_forcing_nudging_mod.f90
r3428 r3614 25 25 ! ----------------- 26 26 ! $Id$ 27 ! unused variables removed 28 ! 29 ! 3428 2018-10-25 12:32:05Z gronemeier 27 30 ! Rename td_XXX_lpt to td_XXX_thetal 28 31 ! … … 456 459 SUBROUTINE lsf_init 457 460 458 USE control_parameters, &459 ONLY: bc_lr_cyc, bc_ns_cyc460 461 461 IMPLICIT NONE 462 462 -
palm/trunk/SOURCE/netcdf_data_input_mod.f90
r3560 r3614 25 25 ! ----------------- 26 26 ! $Id$ 27 ! unused variables removed 28 ! 29 ! 3560 2018-11-23 09:20:21Z raasch 27 30 ! Some formatting adjustment 28 31 ! … … 1267 1270 1268 1271 USE chem_modules, & 1269 ONLY: do_emis, mode_emis, time_fac_type, & 1270 surface_csflux_name 1272 ONLY: mode_emis, time_fac_type, surface_csflux_name 1271 1273 1272 1274 USE control_parameters, & … … 1274 1276 1275 1277 USE indices, & 1276 ONLY: n z, nx, ny, nxl, nxr, nys, nyn, nzb, nzt1278 ONLY: nx, ny, nxl, nxr, nys, nyn 1277 1279 1278 1280 IMPLICIT NONE … … 1281 1283 TYPE(chem_emis_val_type), ALLOCATABLE, DIMENSION(:), INTENT(INOUT) :: emt 1282 1284 1283 CHARACTER (LEN=80) :: units='' !< units of chemistry inputs1284 1285 1285 INTEGER(iwp) :: ispec !< index for number of emission species in input 1286 1286 1287 INTEGER(iwp), ALLOCATABLE, DIMENSION(:) :: dum_var !< value of variable read from netcdf input1288 INTEGER(iwp) :: errno !< error number NF90_???? function1289 INTEGER(iwp) :: id_var !< variable id1290 ! INTEGER(iwp) :: id_emis !< NetCDF id of input file1291 1287 INTEGER(iwp) :: num_vars !< number of variables in netcdf input file 1292 INTEGER(iwp) :: len_dims,len_dims_2 !< Length of dimensions 1293 1294 INTEGER(iwp) :: max_string_length=25 !< Variable for the maximum length of a string 1295 1296 CHARACTER(LEN=100), DIMENSION(:), ALLOCATABLE :: var_names !< Name of Variables 1288 INTEGER(iwp) :: len_dims !< Length of dimension 1297 1289 1298 1290 REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) :: dum_var_3d !< variable for storing temporary data of 3-dimensional … … 1562 1554 1563 1555 USE control_parameters, & 1564 ONLY: bc_lr_cyc, bc_ns_cyc, land_surface, plant_canopy, & 1565 urban_surface 1556 ONLY: land_surface, plant_canopy, urban_surface 1566 1557 1567 1558 USE indices, & 1568 ONLY: nbgp, nx , nxl, nxr,ny, nyn, nys1559 ONLY: nbgp, nxl, nxr, nyn, nys 1569 1560 1570 1561 … … 2406 2397 2407 2398 USE control_parameters, & 2408 ONLY: bc_lr_cyc, bc_ns_cyc,message_string, topography2399 ONLY: message_string, topography 2409 2400 2410 2401 USE indices, & 2411 ONLY: nbgp, nx , nxl, nxr, ny, nyn, nys, nzb2402 ONLY: nbgp, nxl, nxr, ny, nyn, nys, nzb 2412 2403 2413 2404 -
palm/trunk/SOURCE/ocean_mod.f90
r3568 r3614 25 25 ! ----------------- 26 26 ! $Id$ 27 ! unused variables removed 28 ! 29 ! 3568 2018-11-27 16:07:59Z raasch 27 30 ! bugifx: calculate equation of state for seawater even if salinity is switched 28 31 ! off … … 512 515 SUBROUTINE ocean_parin 513 516 514 USE control_parameters, &515 ONLY: message_string516 517 517 IMPLICIT NONE 518 518 … … 706 706 707 707 USE control_parameters, & 708 ONLY: data_output_pr , message_string708 ONLY: data_output_pr 709 709 710 710 USE indices … … 1172 1172 USE indices, & 1173 1173 ONLY: nxlg, nxrg, nyng, nysg, nzb, nzt 1174 1175 USE pmc_interface, &1176 ONLY: nested_run1177 1174 1178 1175 IMPLICIT NONE … … 2160 2157 2161 2158 USE indices, & 2162 ONLY: n xl, nxr, nys, nysv, nyn, nzb, nzt2159 ONLY: nzb, nzt 2163 2160 2164 2161 IMPLICIT NONE -
palm/trunk/SOURCE/plant_canopy_model_mod.f90
r3589 r3614 27 27 ! ----------------- 28 28 ! $Id$ 29 ! unused variables removed 30 ! 31 ! 3589 2018-11-30 15:09:51Z suehring 29 32 ! Formatting adjustments 30 33 ! … … 879 882 880 883 USE control_parameters, & 881 ONLY: message_string, ocean_mode , urban_surface884 ONLY: message_string, ocean_mode 882 885 883 886 USE netcdf_data_input_mod, & -
palm/trunk/SOURCE/surface_output_mod.f90
r3572 r3614 25 25 ! ----------------- 26 26 ! $Id$ 27 ! unused variables removed 28 ! 29 ! 3572 2018-11-28 11:40:28Z suehring 27 30 ! Added short- and longwave radiation flux arrays (e.g. diffuse, direct, 28 31 ! reflected, resedual) for all surfaces (M. Salim) … … 166 169 167 170 INTEGER(iwp) :: i !< grid index in x-direction, also running variable for counting non-average data output 168 INTEGER(iwp) :: ilen !< string length169 171 INTEGER(iwp) :: j !< grid index in y-direction, also running variable for counting average data output 170 172 INTEGER(iwp) :: k !< grid index in z-direction 171 173 INTEGER(iwp) :: l !< running index for surface-element orientation 172 174 INTEGER(iwp) :: m !< running index for surface elements 173 INTEGER(iwp) :: n_out !< running index for number of output variables174 175 INTEGER(iwp) :: npg !< counter variable for all surface elements ( or polygons ) 175 176 INTEGER(iwp) :: point_index_count !< local counter variable for point index … … 875 876 INTEGER(iwp) :: av !< id indicating average or non-average data output 876 877 INTEGER(iwp) :: i !< loop index 877 INTEGER(iwp) :: l !< running index for surface-element orientation878 INTEGER(iwp) :: m !< running index for surface elements879 878 INTEGER(iwp) :: n_out !< counter variables for surface output 880 879 … … 2264 2263 CHARACTER(LEN=100) :: trimvar !< dummy variable for current output variable 2265 2264 2266 INTEGER(iwp) :: l !< running index for surface-element orientation2267 INTEGER(iwp) :: m !< running index for surface elements2268 2265 INTEGER(iwp) :: n_out !< counter variables for surface output 2269 2266 … … 3513 3510 SUBROUTINE surface_output_parin 3514 3511 3515 USE control_parameters, &3516 ONLY: message_string3517 3518 3512 IMPLICIT NONE 3519 3513 … … 3565 3559 3566 3560 USE control_parameters, & 3567 ONLY: averaging_interval, dt_data_output, dt_data_output_av, & 3568 message_string, skip_time_data_output, & 3569 skip_time_data_output_av 3561 ONLY: averaging_interval, dt_data_output, message_string 3570 3562 3571 3563 IMPLICIT NONE -
palm/trunk/SOURCE/urban_surface_mod.f90
r3607 r3614 28 28 ! ----------------- 29 29 ! $Id$ 30 ! unused variables removed 31 ! 32 ! 3607 2018-12-07 11:56:58Z suehring 30 33 ! Output of radiation-related quantities migrated to radiation_model_mod. 31 34 ! … … 960 963 961 964 962 !-- arrays for time averages963 !-- Attention: the variable rad_net_av is also used in the 3d field variable in radiation_model_mod.f90. It may be better to rename it964 REAL(wp), DIMENSION(:), ALLOCATABLE :: wghf_eb_av !< average of wghf_eb965 REAL(wp), DIMENSION(:), ALLOCATABLE :: wshf_eb_av !< average of wshf_eb966 REAL(wp), DIMENSION(:,:), ALLOCATABLE :: t_wall_av !< Average of t_wall967 REAL(wp), DIMENSION(:), ALLOCATABLE :: wghf_eb_green_av !< average of wghf_eb_green968 REAL(wp), DIMENSION(:,:), ALLOCATABLE :: t_green_av !< Average of t_green969 REAL(wp), DIMENSION(:), ALLOCATABLE :: wghf_eb_window_av !< average of wghf_eb_window970 REAL(wp), DIMENSION(:,:), ALLOCATABLE :: t_window_av !< Average of t_window971 REAL(wp), DIMENSION(:), ALLOCATABLE :: qsws_eb_av !< average of qsws_eb972 REAL(wp), DIMENSION(:), ALLOCATABLE :: qsws_veg_av !< average of qsws_veg973 REAL(wp), DIMENSION(:), ALLOCATABLE :: qsws_liq_av !< average of qsws_liq974 REAL(wp), DIMENSION(:,:), ALLOCATABLE :: swc_av !< Average of swc975 976 977 965 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 978 966 !-- anthropogenic heat sources … … 1061 1049 1062 1050 #endif 1063 REAL(wp), DIMENSION(:), ALLOCATABLE, TARGET :: t_surf_wall_av !< average of wall surface temperature (K)1064 REAL(wp), DIMENSION(:), ALLOCATABLE, TARGET :: t_surf_window_av !< average of window surface temperature (K)1065 REAL(wp), DIMENSION(:), ALLOCATABLE, TARGET :: t_surf_green_av !< average of green wall surface temperature (K)1066 1067 !-- Temporal tendencies for time stepping1068 REAL(wp), DIMENSION(:), ALLOCATABLE :: tt_surface_wall_m !< surface temperature tendency of wall (K)1069 REAL(wp), DIMENSION(:), ALLOCATABLE :: tt_surface_window_m !< surface temperature tendency of window (K)1070 REAL(wp), DIMENSION(:), ALLOCATABLE :: tt_surface_green_m !< surface temperature tendency of green wall (K)1071 1051 1072 1052 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! … … 1077 1057 #if defined( __nopointer ) 1078 1058 REAL(wp), DIMENSION(:,:), ALLOCATABLE, TARGET :: t_wall_h !< Wall temperature (K) 1079 REAL(wp), DIMENSION(:,:), ALLOCATABLE, TARGET :: t_wall_h_av !< Average of t_wall1080 1059 REAL(wp), DIMENSION(:,:), ALLOCATABLE, TARGET :: t_wall_h_p !< Prog. wall temperature (K) 1081 1060 REAL(wp), DIMENSION(:,:), ALLOCATABLE, TARGET :: t_window_h !< Window temperature (K) 1082 REAL(wp), DIMENSION(:,:), ALLOCATABLE, TARGET :: t_window_h_av !< Average of t_window1083 1061 REAL(wp), DIMENSION(:,:), ALLOCATABLE, TARGET :: t_window_h_p !< Prog. window temperature (K) 1084 1062 REAL(wp), DIMENSION(:,:), ALLOCATABLE, TARGET :: t_green_h !< Green temperature (K) 1085 REAL(wp), DIMENSION(:,:), ALLOCATABLE, TARGET :: t_green_h_av !< Average of t_green1086 1063 REAL(wp), DIMENSION(:,:), ALLOCATABLE, TARGET :: t_green_h_p !< Prog. green temperature (K) 1087 1064 REAL(wp), DIMENSION(:,:), ALLOCATABLE, TARGET :: swc_h !< soil water content green building layer … … 1096 1073 1097 1074 TYPE(t_wall_vertical), DIMENSION(0:3), TARGET :: t_wall_v !< Wall temperature (K) 1098 TYPE(t_wall_vertical), DIMENSION(0:3), TARGET :: t_wall_v_av !< Average of t_wall1099 1075 TYPE(t_wall_vertical), DIMENSION(0:3), TARGET :: t_wall_v_p !< Prog. wall temperature (K) 1100 1076 TYPE(t_wall_vertical), DIMENSION(0:3), TARGET :: t_window_v !< Window temperature (K) 1101 TYPE(t_wall_vertical), DIMENSION(0:3), TARGET :: t_window_v_av !< Average of t_window1102 1077 TYPE(t_wall_vertical), DIMENSION(0:3), TARGET :: t_window_v_p !< Prog. window temperature (K) 1103 1078 TYPE(t_wall_vertical), DIMENSION(0:3), TARGET :: t_green_v !< Green temperature (K) 1104 TYPE(t_wall_vertical), DIMENSION(0:3), TARGET :: t_green_v_av !< Average of t_green1105 1079 TYPE(t_wall_vertical), DIMENSION(0:3), TARGET :: t_green_v_p !< Prog. green temperature (K) 1106 1080 TYPE(t_wall_vertical), DIMENSION(0:3), TARGET :: swc_v !< Wall swc 1107 TYPE(t_wall_vertical), DIMENSION(0:3), TARGET :: swc_v_av !< Average of swc1108 1081 TYPE(t_wall_vertical), DIMENSION(0:3), TARGET :: swc_v_p !< Prog. swc 1109 1082 1110 1083 #else 1111 1084 REAL(wp), DIMENSION(:,:), POINTER :: t_wall_h, t_wall_h_p 1112 REAL(wp), DIMENSION(:,:), ALLOCATABLE, TARGET :: t_wall_h_ av, t_wall_h_1, t_wall_h_21085 REAL(wp), DIMENSION(:,:), ALLOCATABLE, TARGET :: t_wall_h_1, t_wall_h_2 1113 1086 REAL(wp), DIMENSION(:,:), POINTER :: t_window_h, t_window_h_p 1114 REAL(wp), DIMENSION(:,:), ALLOCATABLE, TARGET :: t_window_h_ av, t_window_h_1, t_window_h_21087 REAL(wp), DIMENSION(:,:), ALLOCATABLE, TARGET :: t_window_h_1, t_window_h_2 1115 1088 REAL(wp), DIMENSION(:,:), POINTER :: t_green_h, t_green_h_p 1116 REAL(wp), DIMENSION(:,:), ALLOCATABLE, TARGET :: t_green_h_ av, t_green_h_1, t_green_h_21089 REAL(wp), DIMENSION(:,:), ALLOCATABLE, TARGET :: t_green_h_1, t_green_h_2 1117 1090 REAL(wp), DIMENSION(:,:), POINTER :: swc_h, rootfr_h, wilt_h, fc_h, swc_sat_h, swc_h_p, swc_res_h 1118 1091 REAL(wp), DIMENSION(:,:), ALLOCATABLE, TARGET :: swc_h_1, rootfr_h_1, & … … 1121 1094 1122 1095 TYPE(t_wall_vertical), DIMENSION(:), POINTER :: t_wall_v, t_wall_v_p 1123 TYPE(t_wall_vertical), DIMENSION(0:3), TARGET :: t_wall_v_ av, t_wall_v_1, t_wall_v_21096 TYPE(t_wall_vertical), DIMENSION(0:3), TARGET :: t_wall_v_1, t_wall_v_2 1124 1097 TYPE(t_wall_vertical), DIMENSION(:), POINTER :: t_window_v, t_window_v_p 1125 TYPE(t_wall_vertical), DIMENSION(0:3), TARGET :: t_window_v_ av, t_window_v_1, t_window_v_21098 TYPE(t_wall_vertical), DIMENSION(0:3), TARGET :: t_window_v_1, t_window_v_2 1126 1099 TYPE(t_wall_vertical), DIMENSION(:), POINTER :: t_green_v, t_green_v_p 1127 TYPE(t_wall_vertical), DIMENSION(0:3), TARGET :: t_green_v_ av, t_green_v_1, t_green_v_21100 TYPE(t_wall_vertical), DIMENSION(0:3), TARGET :: t_green_v_1, t_green_v_2 1128 1101 TYPE(t_wall_vertical), DIMENSION(:), POINTER :: swc_v, swc_v_p 1129 TYPE(t_wall_vertical), DIMENSION(0:3), TARGET :: swc_v_ av, swc_v_1, swc_v_21102 TYPE(t_wall_vertical), DIMENSION(0:3), TARGET :: swc_v_1, swc_v_2 1130 1103 #endif 1131 1132 !-- Wall temporal tendencies for time stepping1133 REAL(wp), DIMENSION(:,:), ALLOCATABLE :: tt_wall_m !< t_wall prognostic array1134 REAL(wp), DIMENSION(:,:), ALLOCATABLE :: tt_window_m !< t_window prognostic array1135 REAL(wp), DIMENSION(:,:), ALLOCATABLE :: tt_green_m !< t_green prognostic array1136 1104 1137 1105 !-- Surface and material parameters classes (surface_type) … … 2850 2818 REAL(wp), DIMENSION(nzb:nzt+1,nys:nyn,nxl:nxr) :: temp_pf !< temp array for urban surface output procedure 2851 2819 2852 CHARACTER (len=varnamelength) :: var , surfid2820 CHARACTER (len=varnamelength) :: var 2853 2821 INTEGER(iwp), PARAMETER :: nd = 5 2854 2822 CHARACTER(len=6), DIMENSION(0:nd-1), PARAMETER :: dirname = (/ '_roof ', '_south', '_north', '_west ', '_east ' /) … … 2856 2824 INTEGER(iwp), DIMENSION(0:nd-1), PARAMETER :: diridx = (/ -1, 1, 0, 3, 2 /) 2857 2825 !< index for surf_*_v: 0:3 = (North, South, East, West) 2858 INTEGER(iwp) :: ids,idsint,idsidx,is urf,isvf,isurfs,isurflt,ipcgb2859 INTEGER(iwp) :: i s,js,ks,i,j,k,iwl,istat, l, m2826 INTEGER(iwp) :: ids,idsint,idsidx,isvf 2827 INTEGER(iwp) :: i,j,k,iwl,istat, l, m 2860 2828 2861 2829 found = .TRUE. … … 7499 7467 INTEGER(iwp), DIMENSION(0:17, nysg:nyng, nxlg:nxrg) :: usm_par 7500 7468 REAL(wp), DIMENSION(1:14, nysg:nyng, nxlg:nxrg) :: usm_val 7501 INTEGER(iwp) :: k, l, d,iw, jw, kw, it, ip, ii, ij, m7469 INTEGER(iwp) :: k, l, iw, jw, kw, it, ip, ii, ij, m 7502 7470 INTEGER(iwp) :: i, j 7503 7471 INTEGER(iwp) :: nz, roof, dirwe, dirsn … … 8145 8113 IMPLICIT NONE 8146 8114 8147 INTEGER(iwp) :: i, j, k, l, d,m !< running indices8115 INTEGER(iwp) :: i, j, k, l, m !< running indices 8148 8116 8149 8117 INTEGER(iwp) :: i_off !< offset to determine index of surface element, seen from atmospheric grid point, for x … … 8153 8121 LOGICAL :: spinup !true during spinup 8154 8122 8155 REAL(wp) :: u1,v1,w1 !< near wall u,v,w8156 8123 REAL(wp) :: stend_wall !< surface tendency 8157 8124 -
palm/trunk/UTIL/inifor/src/inifor_control.f90
r3557 r3614 26 26 ! ----------------- 27 27 ! $Id$ 28 ! abort renamed inifor_abort to avoid intrinsic problem in Fortran 29 ! 30 ! 3557 2018-11-22 16:01:22Z eckhard 28 31 ! Updated documentation 29 32 ! … … 78 81 !> You can use this routine to log events across INIFOR's code to log. For 79 82 !> warnings and abort messages, you may use the dedicated routines warn() and 80 !> abort() in this module. Both use report() and add specific behaviour to it. 83 !> inifor_abort() in this module. Both use report() and add specific behaviour 84 !> to it. 81 85 !------------------------------------------------------------------------------! 82 86 SUBROUTINE report(routine, message, debug) … … 138 142 ! ------------ 139 143 !> 140 !> abort() prepends "ERROR:" the given 'message' and prints the result to the141 !> terminal, writes it to the INIFOR logfile, and exits INIFOR.144 !> inifor_abort() prepends "ERROR:" the given 'message' and prints the result to 145 !> stdout, writes it to the INIFOR logfile, and exits INIFOR. 142 146 !> 143 147 !> You can use this routine for messaging issues, that are critical and prevent 144 148 !> INIFOR from continueing. 145 149 !------------------------------------------------------------------------------! 146 SUBROUTINE abort(routine, message)150 SUBROUTINE inifor_abort(routine, message) 147 151 148 152 CHARACTER(LEN=*), INTENT(IN) :: routine !< name of calling subroutine or function … … 152 156 STOP 153 157 154 END SUBROUTINE abort158 END SUBROUTINE inifor_abort 155 159 156 160 … … 218 222 219 223 CASE DEFAULT 220 CALL abort('run_control', "Time Budget '" // TRIM(mode) // "' is not supported.")224 CALL inifor_abort('run_control', "Time Budget '" // TRIM(mode) // "' is not supported.") 221 225 222 226 END SELECT … … 248 252 249 253 CASE DEFAULT 250 CALL abort('run_control', "Mode '" // TRIM(mode) // "' is not supported.")254 CALL inifor_abort('run_control', "Mode '" // TRIM(mode) // "' is not supported.") 251 255 252 256 END SELECT -
palm/trunk/UTIL/inifor/src/inifor_grid.f90
r3613 r3614 26 26 ! ----------------- 27 27 ! $Id$ 28 ! unused variables removed 29 ! 30 ! 3613 2018-12-07 18:20:37Z eckhard 28 31 ! Average initial profiles only over PALM domain region, not the 29 32 ! geostrophic-wind averaging region … … 1520 1523 LOGICAL :: level_based_averaging 1521 1524 1522 INTEGER :: i, j1523 1524 1525 ALLOCATE( avg_grid % x(1) ) 1525 1526 ALLOCATE( avg_grid % y(1) ) -
palm/trunk/UTIL/inifor/src/inifor_transform.f90
r3613 r3614 26 26 ! ----------------- 27 27 ! $Id$ 28 ! unused variables removed 29 ! 30 ! 3613 2018-12-07 18:20:37Z eckhard 28 31 ! Use averaged heights profile for level-based averaging instead of modified 29 32 ! COSMO heights array … … 398 401 399 402 REAL(dp) :: drhodz, dz, zk, rhok 400 INTEGER :: k , k_min403 INTEGER :: k_min 401 404 402 405 k_min = avg_grid % k_min
Note: See TracChangeset
for help on using the changeset viewer.
