Changeset 3767 for palm/trunk
- Timestamp:
- Feb 27, 2019 8:18:02 AM (6 years ago)
- Location:
- palm/trunk/SOURCE
- Files:
-
- 12 edited
-
bulk_cloud_model_mod.f90 (modified) (3 diffs)
-
chemistry_model_mod.f90 (modified) (3 diffs)
-
gust_mod.f90 (modified) (4 diffs)
-
land_surface_model_mod.f90 (modified) (2 diffs)
-
module_interface.f90 (modified) (11 diffs)
-
ocean_mod.f90 (modified) (4 diffs)
-
radiation_model_mod.f90 (modified) (3 diffs)
-
read_restart_data_mod.f90 (modified) (3 diffs)
-
salsa_mod.f90 (modified) (3 diffs)
-
surface_mod.f90 (modified) (3 diffs)
-
urban_surface_mod.f90 (modified) (3 diffs)
-
user_module.f90 (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/bulk_cloud_model_mod.f90
r3724 r3767 25 25 ! ----------------- 26 26 ! $Id$ 27 ! unused variable for file index removed from rrd-subroutines parameter list 28 ! 29 ! 3724 2019-02-06 16:28:23Z kanani 27 30 ! Correct double-used log_point_s unit 28 31 ! … … 1710 1713 !> This routine reads the respective restart data for the bulk cloud module. 1711 1714 !------------------------------------------------------------------------------! 1712 SUBROUTINE bcm_rrd_local( i, k, nxlf, nxlc, nxl_on_file, nxrf, nxrc,&1715 SUBROUTINE bcm_rrd_local( k, nxlf, nxlc, nxl_on_file, nxrf, nxrc, & 1713 1716 nxr_on_file, nynf, nync, nyn_on_file, nysf, & 1714 1717 nysc, nys_on_file, tmp_2d, tmp_3d, found ) … … 1724 1727 IMPLICIT NONE 1725 1728 1726 INTEGER(iwp) :: i !<1727 1729 INTEGER(iwp) :: k !< 1728 1730 INTEGER(iwp) :: nxlc !< -
palm/trunk/SOURCE/chemistry_model_mod.f90
r3738 r3767 27 27 ! ----------------- 28 28 ! $Id$ 29 ! unused variable for file index removed from rrd-subroutines parameter list 30 ! 31 ! 3738 2019-02-12 17:00:45Z suehring 29 32 ! Clean-up debug prints 30 33 ! … … 2583 2586 !------------------------------------------------------------------------------! 2584 2587 2585 SUBROUTINE chem_rrd_local( i, k, nxlf, nxlc, nxl_on_file, nxrf, nxrc,&2586 nxr_on_file, nynf, nync, nyn_on_file, nysf, nysc,&2587 nys_on_file, tmp_3d, found )2588 SUBROUTINE chem_rrd_local( k, nxlf, nxlc, nxl_on_file, nxrf, nxrc, & 2589 nxr_on_file, nynf, nync, nyn_on_file, nysf, nysc, & 2590 nys_on_file, tmp_3d, found ) 2588 2591 2589 2592 USE control_parameters … … 2597 2600 CHARACTER (LEN=20) :: spc_name_av !< 2598 2601 2599 INTEGER(iwp) :: i, lsp !<2602 INTEGER(iwp) :: lsp !< 2600 2603 INTEGER(iwp) :: k !< 2601 2604 INTEGER(iwp) :: nxlc !< -
palm/trunk/SOURCE/gust_mod.f90
r3725 r3767 25 25 ! ----------------- 26 26 ! $Id$ 27 ! unused variable for file index removed from rrd-subroutines parameter list 28 ! 29 ! 3725 2019-02-07 10:11:02Z raasch 27 30 ! dummy statement modified to avoid compiler warnings about unused variables 28 31 ! … … 549 552 !> This routine reads the respective restart data for the gust module. 550 553 !------------------------------------------------------------------------------! 551 SUBROUTINE gust_rrd_local( i, k, nxlf, nxlc, nxl_on_file, nxrf, nxrc,&554 SUBROUTINE gust_rrd_local( k, nxlf, nxlc, nxl_on_file, nxrf, nxrc, & 552 555 nxr_on_file, nynf, nync, nyn_on_file, nysf, & 553 556 nysc, nys_on_file, tmp_2d, tmp_3d, found ) … … 565 568 IMPLICIT NONE 566 569 567 INTEGER(iwp) :: i !<568 570 INTEGER(iwp) :: k !< 569 571 INTEGER(iwp) :: nxlc !< … … 590 592 !-- You may remove them. 591 593 IF ( dummy_logical ) THEN 592 idum = i + k + nxlc + nxlf + nxrc + nxrf + nync + nynf + nysc + nysf +&594 idum = k + nxlc + nxlf + nxrc + nxrf + nync + nynf + nysc + nysf + & 593 595 tmp_2d(nys_on_file,nxl_on_file) + tmp_3d(nzb,nys_on_file,nxl_on_file) 594 596 ENDIF -
palm/trunk/SOURCE/land_surface_model_mod.f90
r3715 r3767 25 25 ! ----------------- 26 26 ! $Id$ 27 ! unused variable for file index removed from rrd-subroutines parameter list 28 ! 29 ! 3715 2019-02-04 17:34:55Z suehring 27 30 ! Revise check for saturation moisture 28 31 ! … … 6544 6547 !> Soubroutine reads lsm data from restart file(s) 6545 6548 !------------------------------------------------------------------------------! 6546 SUBROUTINE lsm_rrd_local( i, k, nxlf, nxlc, nxl_on_file, nxrf, nxrc,&6549 SUBROUTINE lsm_rrd_local( k, nxlf, nxlc, nxl_on_file, nxrf, nxrc, & 6547 6550 nxr_on_file, nynf, nync, nyn_on_file, nysf, nysc, & 6548 6551 nys_on_file, tmp_2d, found ) -
palm/trunk/SOURCE/module_interface.f90
r3766 r3767 25 25 ! ----------------- 26 26 ! $Id$ 27 ! unused variable file_index removed from subroutine parameter list 28 ! 29 ! 3766 2019-02-26 16:23:41Z raasch 27 30 ! first argument removed from module_interface_rrd_*, statement added to avoid 28 31 ! compiler warning about unused variable, file reformatted with respect to coding … … 1157 1160 !> Read module-specific restart data specific to local MPI ranks 1158 1161 !------------------------------------------------------------------------------! 1159 SUBROUTINE module_interface_rrd_local( file_index, map_index,&1162 SUBROUTINE module_interface_rrd_local( map_index, & 1160 1163 nxlf, nxlc, nxl_on_file, & 1161 1164 nxrf, nxrc, nxr_on_file, & … … 1165 1168 1166 1169 1167 INTEGER(iwp), INTENT(IN) :: file_index !<1168 1170 INTEGER(iwp), INTENT(IN) :: map_index !< 1169 1171 INTEGER(iwp), INTENT(IN) :: nxlc !< … … 1190 1192 1191 1193 IF ( .NOT. found ) CALL bcm_rrd_local( & 1192 file_index, map_index,&1194 map_index, & 1193 1195 nxlf, nxlc, nxl_on_file, & 1194 1196 nxrf, nxrc, nxr_on_file, & … … 1199 1201 1200 1202 IF ( .NOT. found ) CALL chem_rrd_local( & 1201 file_index, map_index,&1203 map_index, & 1202 1204 nxlf, nxlc, nxl_on_file, & 1203 1205 nxrf, nxrc, nxr_on_file, & … … 1208 1210 1209 1211 IF ( .NOT. found ) CALL gust_rrd_local( & 1210 file_index, map_index,&1212 map_index, & 1211 1213 nxlf, nxlc, nxl_on_file, & 1212 1214 nxrf, nxrc, nxr_on_file, & … … 1217 1219 1218 1220 IF ( .NOT. found ) CALL lsm_rrd_local( & 1219 file_index, map_index,&1221 map_index, & 1220 1222 nxlf, nxlc, nxl_on_file, & 1221 1223 nxrf, nxrc, nxr_on_file, & … … 1226 1228 1227 1229 IF ( .NOT. found ) CALL ocean_rrd_local( & 1228 file_index, map_index, & 1230 map_index, & 1231 nxlf, nxlc, nxl_on_file, & 1232 nxrf, nxrc, nxr_on_file, & 1233 nynf, nync, nyn_on_file, & 1234 nysf, nysc, nys_on_file, & 1235 tmp_3d, found & 1236 ) ! ToDo: change interface to pass variable 1237 1238 IF ( .NOT. found ) CALL radiation_rrd_local( & 1239 map_index, & 1229 1240 nxlf, nxlc, nxl_on_file, & 1230 1241 nxrf, nxrc, nxr_on_file, & … … 1234 1245 ) ! ToDo: change interface to pass variable 1235 1246 1236 IF ( .NOT. found ) CALL radiation_rrd_local( &1237 file_index, map_index, &1238 nxlf, nxlc, nxl_on_file, &1239 nxrf, nxrc, nxr_on_file, &1240 nynf, nync, nyn_on_file, &1241 nysf, nysc, nys_on_file, &1242 tmp_2d, tmp_3d, found &1243 ) ! ToDo: change interface to pass variable1244 1245 1247 IF ( .NOT. found ) CALL salsa_rrd_local( & 1246 file_index, map_index,&1248 map_index, & 1247 1249 nxlf, nxlc, nxl_on_file, & 1248 1250 nxrf, nxrc, nxr_on_file, & … … 1253 1255 1254 1256 IF ( .NOT. found ) CALL usm_rrd_local( & 1255 file_index, map_index,&1257 map_index, & 1256 1258 nxlf, nxlc, nxl_on_file, & 1257 nxrf, nxr c, nxr_on_file,&1258 nynf, nyn c, nyn_on_file,&1259 nxrf, nxr_on_file, & 1260 nynf, nyn_on_file, & 1259 1261 nysf, nysc, nys_on_file, & 1260 1262 found & … … 1265 1267 1266 1268 IF ( .NOT. found ) CALL user_rrd_local( & 1267 file_index, map_index,&1269 map_index, & 1268 1270 nxlf, nxlc, nxl_on_file, & 1269 1271 nxrf, nxrc, nxr_on_file, & -
palm/trunk/SOURCE/ocean_mod.f90
r3719 r3767 25 25 ! ----------------- 26 26 ! $Id$ 27 ! unused variable for file index and tmp_2d removed from rrd-subroutine parameter 28 ! list 29 ! 30 ! 3719 2019-02-06 13:10:18Z kanani 27 31 ! Changed log_point to log_point_s, otherwise this overlaps with 28 32 ! 'all progn.equations' cpu measurement. … … 1864 1868 !> This routine reads the respective restart data for the ocean module. 1865 1869 !------------------------------------------------------------------------------! 1866 SUBROUTINE ocean_rrd_local( i, k, nxlf, nxlc, nxl_on_file, nxrf, nxrc,&1870 SUBROUTINE ocean_rrd_local( k, nxlf, nxlc, nxl_on_file, nxrf, nxrc, & 1867 1871 nxr_on_file, nynf, nync, nyn_on_file, nysf, & 1868 nysc, nys_on_file, tmp_ 2d, tmp_3d, found )1872 nysc, nys_on_file, tmp_3d, found ) 1869 1873 1870 1874 USE averaging, & … … 1882 1886 IMPLICIT NONE 1883 1887 1884 INTEGER(iwp) :: i !<1885 1888 INTEGER(iwp) :: k !< 1886 1889 INTEGER(iwp) :: nxlc !< … … 1899 1902 LOGICAL, INTENT(OUT) :: found 1900 1903 1901 REAL(wp), DIMENSION(nys_on_file-nbgp:nyn_on_file+nbgp,nxl_on_file-nbgp:nxr_on_file+nbgp) :: tmp_2d !<1902 1904 REAL(wp), DIMENSION(nzb:nzt+1,nys_on_file-nbgp:nyn_on_file+nbgp,nxl_on_file-nbgp:nxr_on_file+nbgp) :: tmp_3d !< 1903 1905 -
palm/trunk/SOURCE/radiation_model_mod.f90
r3760 r3767 28 28 ! ----------------- 29 29 ! $Id$ 30 ! unused variable for file index removed from rrd-subroutines parameter list 31 ! 32 ! 3760 2019-02-21 18:47:35Z moh.hefny 30 33 ! Bugfix: initialized simulated_time before calculating solar position 31 34 ! to enable restart option with reading in SVF from file(s). … … 11117 11120 !> Subroutine reads local (subdomain) restart data 11118 11121 !------------------------------------------------------------------------------! 11119 SUBROUTINE radiation_rrd_local( i, k, nxlf, nxlc, nxl_on_file, nxrf, nxrc,&11122 SUBROUTINE radiation_rrd_local( k, nxlf, nxlc, nxl_on_file, nxrf, nxrc, & 11120 11123 nxr_on_file, nynf, nync, nyn_on_file, nysf, & 11121 11124 nysc, nys_on_file, tmp_2d, tmp_3d, found ) … … 11133 11136 IMPLICIT NONE 11134 11137 11135 INTEGER(iwp) :: i !<11136 11138 INTEGER(iwp) :: k !< 11137 11139 INTEGER(iwp) :: nxlc !< -
palm/trunk/SOURCE/read_restart_data_mod.f90
r3766 r3767 25 25 ! ----------------- 26 26 ! $Id$ 27 ! unused variables removed from rrd-subroutines parameter list 28 ! 29 ! 3766 2019-02-26 16:23:41Z raasch 27 30 ! first argument removed from module_interface_rrd_* 28 31 ! … … 1791 1794 ! 1792 1795 !-- Read restart data of surfaces 1793 IF ( .NOT. found ) CALL surface_rrd_local( i, k, nxlf,&1794 nxlc, nxl_on_file, nxrf, nxrc,&1795 nxr_on_file, nynf, nync,&1796 IF ( .NOT. found ) CALL surface_rrd_local( k, nxlf, & 1797 nxlc, nxl_on_file, nxrf, & 1798 nxr_on_file, nynf, & 1796 1799 nyn_on_file, nysf, nysc, & 1797 1800 nys_on_file, found ) … … 1800 1803 !-- Read restart data of other modules 1801 1804 IF ( .NOT. found ) CALL module_interface_rrd_local( & 1802 i, k,&1805 k, & 1803 1806 nxlf, nxlc, nxl_on_file, & 1804 1807 nxrf, nxrc, nxr_on_file, & -
palm/trunk/SOURCE/salsa_mod.f90
r3685 r3767 26 26 ! ----------------- 27 27 ! $Id$ 28 ! unused variable for file index removed from rrd-subroutines parameter list 29 ! 30 ! 3685 2019-01-21 01:02:11Z knoop 28 31 ! Some interface calls moved to module_interface + cleanup 29 32 ! … … 2032 2035 !> This routine reads the respective restart data. 2033 2036 !------------------------------------------------------------------------------! 2034 SUBROUTINE salsa_rrd_local( i, k, nxlf, nxlc, nxl_on_file, nxrf, nxrc,&2037 SUBROUTINE salsa_rrd_local( k, nxlf, nxlc, nxl_on_file, nxrf, nxrc, & 2035 2038 nxr_on_file, nynf, nync, nyn_on_file, nysf, & 2036 2039 nysc, nys_on_file, tmp_3d, found ) … … 2043 2046 INTEGER(iwp) :: c !< 2044 2047 INTEGER(iwp) :: g !< 2045 INTEGER(iwp) :: i !<2046 2048 INTEGER(iwp) :: k !< 2047 2049 INTEGER(iwp) :: nxlc !< -
palm/trunk/SOURCE/surface_mod.f90
r3761 r3767 26 26 ! ----------------- 27 27 ! $Id$ 28 ! unused variables removed from rrd-subroutine parameter list 29 ! 30 ! 3761 2019-02-25 15:31:42Z raasch 28 31 ! OpenACC directives added to avoid compiler warnings about unused variables, 29 32 ! unused variable removed … … 3820 3823 !> of cyclic_fill mode. 3821 3824 !------------------------------------------------------------------------------! 3822 SUBROUTINE surface_rrd_local( ii, kk, nxlf, nxlc, nxl_on_file, nxrf, nxrc, &3823 nxr_on_file, nynf, nyn c, nyn_on_file, nysf,&3825 SUBROUTINE surface_rrd_local( kk, nxlf, nxlc, nxl_on_file, nxrf, & 3826 nxr_on_file, nynf, nyn_on_file, nysf, & 3824 3827 nysc, nys_on_file, found ) 3825 3828 … … 3833 3836 INTEGER(iwp) :: m !< running index for surface elements, refers to gathered array encompassing all surface types 3834 3837 INTEGER(iwp) :: mm !< running index for surface elements, refers to individual surface types 3835 INTEGER(iwp) :: ii !< running index over input files3836 3838 INTEGER(iwp) :: kk !< running index over previous input files covering current local domain 3837 3839 INTEGER(iwp) :: nxlc !< index of left boundary on current subdomain 3838 3840 INTEGER(iwp) :: nxlf !< index of left boundary on former subdomain 3839 3841 INTEGER(iwp) :: nxl_on_file !< index of left boundary on former local domain 3840 INTEGER(iwp) :: nxrc !< index of right boundary on current subdomain3841 3842 INTEGER(iwp) :: nxrf !< index of right boundary on former subdomain 3842 3843 INTEGER(iwp) :: nxr_on_file !< index of right boundary on former local domain 3843 INTEGER(iwp) :: nync !< index of north boundary on current subdomain3844 3844 INTEGER(iwp) :: nynf !< index of north boundary on former subdomain 3845 3845 INTEGER(iwp) :: nyn_on_file !< index of norht boundary on former local domain -
palm/trunk/SOURCE/urban_surface_mod.f90
r3748 r3767 28 28 ! ----------------- 29 29 ! $Id$ 30 ! unused variables removed from rrd-subroutines parameter list 31 ! 32 ! 3748 2019-02-18 10:38:31Z suehring 30 33 ! Revise conversion of waste-heat flux (do not divide by air density, will 31 34 ! be done in diffusion_s) … … 6243 6246 !> Soubroutine reads t_surf and t_wall data from restart files 6244 6247 !------------------------------------------------------------------------------! 6245 SUBROUTINE usm_rrd_local( i, k, nxlf, nxlc, nxl_on_file, nxrf, nxrc, & 6246 nxr_on_file, nynf, nync, nyn_on_file, nysf, nysc,& 6247 nys_on_file, found ) 6248 SUBROUTINE usm_rrd_local( k, nxlf, nxlc, nxl_on_file, nxrf, nxr_on_file, nynf, nyn_on_file, & 6249 nysf, nysc, nys_on_file, found ) 6248 6250 6249 6251 … … 6253 6255 IMPLICIT NONE 6254 6256 6257 INTEGER(iwp) :: k !< running index over previous input files covering current local domain 6255 6258 INTEGER(iwp) :: l !< index variable for surface type 6256 INTEGER(iwp) :: i !< running index over input files6257 INTEGER(iwp) :: k !< running index over previous input files covering current local domain6258 6259 INTEGER(iwp) :: ns_h_on_file_usm !< number of horizontal surface elements (urban type) on file 6259 6260 INTEGER(iwp) :: nxlc !< index of left boundary on current subdomain 6260 6261 INTEGER(iwp) :: nxlf !< index of left boundary on former subdomain 6261 6262 INTEGER(iwp) :: nxl_on_file !< index of left boundary on former local domain 6262 INTEGER(iwp) :: nxrc !< index of right boundary on current subdomain6263 6263 INTEGER(iwp) :: nxrf !< index of right boundary on former subdomain 6264 6264 INTEGER(iwp) :: nxr_on_file !< index of right boundary on former local domain 6265 INTEGER(iwp) :: nync !< index of north boundary on current subdomain6266 6265 INTEGER(iwp) :: nynf !< index of north boundary on former subdomain 6267 6266 INTEGER(iwp) :: nyn_on_file !< index of north boundary on former local domain -
palm/trunk/SOURCE/user_module.f90
r3747 r3767 25 25 ! ----------------- 26 26 ! $Id$ 27 ! unused variable for file index removed from rrd-subroutines parameter list 28 ! 29 ! 3747 2019-02-16 15:15:23Z gronemeier 27 30 ! Add routine user_init_arrays 28 31 ! … … 1131 1134 !> calculated in routine rrd_local. 1132 1135 !------------------------------------------------------------------------------! 1133 SUBROUTINE user_rrd_local( i, k, nxlf, nxlc, nxl_on_file, nxrf, nxrc,&1136 SUBROUTINE user_rrd_local( k, nxlf, nxlc, nxl_on_file, nxrf, nxrc, & 1134 1137 nxr_on_file, nynf, nync, nyn_on_file, nysf, & 1135 1138 nysc, nys_on_file, tmp_3d, found ) 1136 1139 1137 1140 1138 INTEGER(iwp) :: i !<1139 1141 INTEGER(iwp) :: k !< 1140 1142 INTEGER(iwp) :: nxlc !<
Note: See TracChangeset
for help on using the changeset viewer.
