Changeset 4329 for palm/trunk/SOURCE/nesting_offl_mod.f90
- Timestamp:
- Dec 10, 2019 3:46:36 PM (4 years ago)
- File:
-
- 1 edited
-
palm/trunk/SOURCE/nesting_offl_mod.f90 (modified) (22 diffs)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/nesting_offl_mod.f90
r4286 r4329 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Renamed wall_flags_0 to wall_flags_static_0 28 ! 29 ! 4286 2019-10-30 16:01:14Z resler 27 30 ! Fix wrong checks of time from dynamic driver in nesting_offl_mod 28 31 ! … … 188 191 nysv, nysg, nyn, nyng, nzb, nz, nzt, & 189 192 topo_top_ind, & 190 wall_flags_ 0193 wall_flags_static_0 191 194 192 195 USE kinds … … 863 866 volume_flow_l(1) = volume_flow_l(1) + u(k,j,i) * dzw(k) * dy & 864 867 * MERGE( 1.0_wp, 0.0_wp, & 865 BTEST( wall_flags_ 0(k,j,i), 1 ) )868 BTEST( wall_flags_static_0(k,j,i), 1 ) ) 866 869 ENDDO 867 870 ENDDO … … 873 876 volume_flow_l(1) = volume_flow_l(1) - u(k,j,i) * dzw(k) * dy & 874 877 * MERGE( 1.0_wp, 0.0_wp, & 875 BTEST( wall_flags_ 0(k,j,i), 1 ) )878 BTEST( wall_flags_static_0(k,j,i), 1 ) ) 876 879 ENDDO 877 880 ENDDO … … 883 886 volume_flow_l(2) = volume_flow_l(2) + v(k,j,i) * dzw(k) * dx & 884 887 * MERGE( 1.0_wp, 0.0_wp, & 885 BTEST( wall_flags_ 0(k,j,i), 2 ) )888 BTEST( wall_flags_static_0(k,j,i), 2 ) ) 886 889 ENDDO 887 890 ENDDO … … 893 896 volume_flow_l(2) = volume_flow_l(2) - v(k,j,i) * dzw(k) * dx & 894 897 * MERGE( 1.0_wp, 0.0_wp, & 895 BTEST( wall_flags_ 0(k,j,i), 2 ) )898 BTEST( wall_flags_static_0(k,j,i), 2 ) ) 896 899 ENDDO 897 900 ENDDO … … 998 1001 fac_dt ) * & 999 1002 MERGE( 1.0_wp, 0.0_wp, & 1000 BTEST( wall_flags_ 0(k,j,0), 1 ) )1003 BTEST( wall_flags_static_0(k,j,0), 1 ) ) 1001 1004 u(k,j,-1) = u(k,j,0) 1002 1005 ENDDO … … 1010 1013 fac_dt ) * & 1011 1014 MERGE( 1.0_wp, 0.0_wp, & 1012 BTEST( wall_flags_ 0(k,j,-1), 3 ) )1015 BTEST( wall_flags_static_0(k,j,-1), 3 ) ) 1013 1016 ENDDO 1014 1017 w(nzt,j,-1) = w(nzt-1,j,-1) … … 1021 1024 fac_dt ) * & 1022 1025 MERGE( 1.0_wp, 0.0_wp, & 1023 BTEST( wall_flags_ 0(k,j,-1), 2 ) )1026 BTEST( wall_flags_static_0(k,j,-1), 2 ) ) 1024 1027 ENDDO 1025 1028 v_ref_l(nzb+1:nzt) = v_ref_l(nzb+1:nzt) + v(nzb+1:nzt,j,-1) … … 1077 1080 fac_dt ) * & 1078 1081 MERGE( 1.0_wp, 0.0_wp, & 1079 BTEST( wall_flags_ 0(k,j,nxr+1), 1 ) )1082 BTEST( wall_flags_static_0(k,j,nxr+1), 1 ) ) 1080 1083 ENDDO 1081 1084 u_ref_l(nzb+1:nzt) = u_ref_l(nzb+1:nzt) + u(nzb+1:nzt,j,nxr+1) … … 1087 1090 fac_dt ) * & 1088 1091 MERGE( 1.0_wp, 0.0_wp, & 1089 BTEST( wall_flags_ 0(k,j,nxr+1), 3 ) )1092 BTEST( wall_flags_static_0(k,j,nxr+1), 3 ) ) 1090 1093 ENDDO 1091 1094 w(nzt,j,nxr+1) = w(nzt-1,j,nxr+1) … … 1098 1101 fac_dt ) * & 1099 1102 MERGE( 1.0_wp, 0.0_wp, & 1100 BTEST( wall_flags_ 0(k,j,nxr+1), 2 ) )1103 BTEST( wall_flags_static_0(k,j,nxr+1), 2 ) ) 1101 1104 ENDDO 1102 1105 v_ref_l(nzb+1:nzt) = v_ref_l(nzb+1:nzt) + v(nzb+1:nzt,j,nxr+1) … … 1155 1158 fac_dt ) * & 1156 1159 MERGE( 1.0_wp, 0.0_wp, & 1157 BTEST( wall_flags_ 0(k,0,i), 2 ) )1160 BTEST( wall_flags_static_0(k,0,i), 2 ) ) 1158 1161 v(k,-1,i) = v(k,0,i) 1159 1162 ENDDO … … 1167 1170 fac_dt ) * & 1168 1171 MERGE( 1.0_wp, 0.0_wp, & 1169 BTEST( wall_flags_ 0(k,-1,i), 3 ) )1172 BTEST( wall_flags_static_0(k,-1,i), 3 ) ) 1170 1173 ENDDO 1171 1174 w(nzt,-1,i) = w(nzt-1,-1,i) … … 1178 1181 fac_dt ) * & 1179 1182 MERGE( 1.0_wp, 0.0_wp, & 1180 BTEST( wall_flags_ 0(k,-1,i), 1 ) )1183 BTEST( wall_flags_static_0(k,-1,i), 1 ) ) 1181 1184 ENDDO 1182 1185 u_ref_l(nzb+1:nzt) = u_ref_l(nzb+1:nzt) + u(nzb+1:nzt,-1,i) … … 1236 1239 fac_dt ) * & 1237 1240 MERGE( 1.0_wp, 0.0_wp, & 1238 BTEST( wall_flags_ 0(k,nyn+1,i), 2 ) )1241 BTEST( wall_flags_static_0(k,nyn+1,i), 2 ) ) 1239 1242 ENDDO 1240 1243 v_ref_l(nzb+1:nzt) = v_ref_l(nzb+1:nzt) + v(nzb+1:nzt,nyn+1,i) … … 1246 1249 fac_dt ) * & 1247 1250 MERGE( 1.0_wp, 0.0_wp, & 1248 BTEST( wall_flags_ 0(k,nyn+1,i), 3 ) )1251 BTEST( wall_flags_static_0(k,nyn+1,i), 3 ) ) 1249 1252 ENDDO 1250 1253 w(nzt,nyn+1,i) = w(nzt-1,nyn+1,i) … … 1257 1260 fac_dt ) * & 1258 1261 MERGE( 1.0_wp, 0.0_wp, & 1259 BTEST( wall_flags_ 0(k,nyn+1,i), 1 ) )1262 BTEST( wall_flags_static_0(k,nyn+1,i), 1 ) ) 1260 1263 1261 1264 ENDDO … … 1315 1318 fac_dt ) * & 1316 1319 MERGE( 1.0_wp, 0.0_wp, & 1317 BTEST( wall_flags_ 0(nzt+1,j,i), 1 ) )1320 BTEST( wall_flags_static_0(nzt+1,j,i), 1 ) ) 1318 1321 u_ref_l(nzt+1) = u_ref_l(nzt+1) + u(nzt+1,j,i) 1319 1322 ENDDO … … 1331 1334 fac_dt ) * & 1332 1335 MERGE( 1.0_wp, 0.0_wp, & 1333 BTEST( wall_flags_ 0(nzt+1,j,i), 2 ) )1336 BTEST( wall_flags_static_0(nzt+1,j,i), 2 ) ) 1334 1337 v_ref_l(nzt+1) = v_ref_l(nzt+1) + v(nzt+1,j,i) 1335 1338 ENDDO … … 1347 1350 fac_dt ) * & 1348 1351 MERGE( 1.0_wp, 0.0_wp, & 1349 BTEST( wall_flags_ 0(nzt,j,i), 3 ) )1352 BTEST( wall_flags_static_0(nzt,j,i), 3 ) ) 1350 1353 w(nzt+1,j,i) = w(nzt,j,i) 1351 1354 ENDDO … … 2130 2133 !-- After boundary data is initialized, mask topography at the 2131 2134 !-- boundaries for the velocity components. 2132 u = MERGE( u, 0.0_wp, BTEST( wall_flags_ 0, 1 ) )2133 v = MERGE( v, 0.0_wp, BTEST( wall_flags_ 0, 2 ) )2134 w = MERGE( w, 0.0_wp, BTEST( wall_flags_ 0, 3 ) )2135 u = MERGE( u, 0.0_wp, BTEST( wall_flags_static_0, 1 ) ) 2136 v = MERGE( v, 0.0_wp, BTEST( wall_flags_static_0, 2 ) ) 2137 w = MERGE( w, 0.0_wp, BTEST( wall_flags_static_0, 3 ) ) 2135 2138 ! 2136 2139 !-- Initial calculation of the boundary layer depth from the prescribed
Note: See TracChangeset
for help on using the changeset viewer.
