Changeset 5385 for trunk/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90
- Timestamp:
- 2015-06-09T15:50:42+02:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90
r5120 r5385 1039 1039 INTEGER :: ji, jj, jk ! dummy loop indices 1040 1040 INTEGER :: ij0, ij1, ii0, ii1 ! dummy loop indices 1041 INTEGER :: isrow ! index for ORCA1 starting row 1041 1042 !! acc 1042 1043 !! Hmm with the time splitting these "fixes" seem to do more harm than good. Temporarily disabled for … … 1122 1123 IF( cp_cfg == "orca" .AND. jp_cfg == 1 ) THEN ! ORCA R1 configuration 1123 1124 ! ! ===================== 1124 ! 1125 ii0 = 281 ; ii1 = 282 ! Gibraltar Strait (e2u was modified) 1126 ij0 = 200 ; ij1 = 200 1125 ! This dirty section will be suppressed by simplification process: all this will come back in input files 1126 ! Currently these hard-wired indices relate to the original (pre-v3.6) configuration 1127 ! which had a grid-size of 362x292. 1128 ! This grid has been extended southwards for use with the under ice-shelf options (isf) introduced in v3.6. 1129 ! The original domain can still be used optionally if the isf code is not activated. 1130 ! An adjustment (isrow) is made to the hard-wired indices if the extended domain (362x332) is being used. 1131 ! 1132 IF ( jpjglo == 292 ) THEN ; isrow = 0 ! Using pre-v3.6 files or adjusted start row from isf-extended grid 1133 ELSEIF( jpjglo == 332 ) THEN ; isrow = 40 ! Using full isfextended domain. 1134 ENDIF 1135 ! 1136 ii0 = 282 ; ii1 = 283 ! Gibraltar Strait (e2u was modified) 1137 ij0 = 201 + isrow ; ij1 = 201 + isrow 1127 1138 DO jk = 1, jpkm1 1128 1139 DO jj = mj0(ij0), mj1(ij1) … … 1144 1155 END DO 1145 1156 ! 1146 ii0 = 314 ; ii1 = 315 ! Bhosporus Strait (e2u was modified)1147 ij0 = 208 ; ij1 = 2081157 ii0 = 314 ; ii1 = 315 ! Bhosporus Strait (e2u was modified) 1158 ij0 = 208 + isrow ; ij1 = 208 + isrow 1148 1159 DO jk = 1, jpkm1 1149 1160 DO jj = mj0(ij0), mj1(ij1) … … 1165 1176 END DO 1166 1177 ! 1167 ii0 = 44 ; ii1 = 44 ! Lombok Strait (e1v was modified)1168 ij0 = 124 ; ij1 = 1251178 ii0 = 44 ; ii1 = 44 ! Lombok Strait (e1v was modified) 1179 ij0 = 124 + isrow ; ij1 = 125 + isrow 1169 1180 DO jk = 1, jpkm1 1170 1181 DO jj = mj0(ij0), mj1(ij1) … … 1181 1192 END DO 1182 1193 ! 1183 ii0 = 48 ; ii1 = 48 ! Sumba Strait (e1v was modified) [closed from bathy_11 on]1184 ij0 = 124 ; ij1 = 1251194 ii0 = 48 ; ii1 = 48 ! Sumba Strait (e1v was modified) [closed from bathy_11 on] 1195 ij0 = 124 + isrow ; ij1 = 125 + isrow 1185 1196 DO jk = 1, jpkm1 1186 1197 DO jj = mj0(ij0), mj1(ij1) … … 1197 1208 END DO 1198 1209 ! 1199 ii0 = 53 ; ii1 = 53 ! Ombai Strait (e1v was modified)1200 ij0 = 124 ; ij1 = 1251210 ii0 = 53 ; ii1 = 53 ! Ombai Strait (e1v was modified) 1211 ij0 = 124 + isrow ; ij1 = 125 + isrow 1201 1212 DO jk = 1, jpkm1 1202 1213 DO jj = mj0(ij0), mj1(ij1) … … 1213 1224 END DO 1214 1225 ! 1215 ii0 = 56 ; ii1 = 56 ! Timor Passage (e1v was modified)1216 ij0 = 124 ; ij1 = 1251226 ii0 = 56 ; ii1 = 56 ! Timor Passage (e1v was modified) 1227 ij0 = 124 + isrow ; ij1 = 125 + isrow 1217 1228 DO jk = 1, jpkm1 1218 1229 DO jj = mj0(ij0), mj1(ij1) … … 1229 1240 END DO 1230 1241 ! 1231 ii0 = 55 ; ii1 = 55 ! West Halmahera Strait (e1v was modified)1232 ij0 = 141 ; ij1 = 1421242 ii0 = 55 ; ii1 = 55 ! West Halmahera Strait (e1v was modified) 1243 ij0 = 141 + isrow ; ij1 = 142 + isrow 1233 1244 DO jk = 1, jpkm1 1234 1245 DO jj = mj0(ij0), mj1(ij1) … … 1245 1256 END DO 1246 1257 ! 1247 ii0 = 58 ; ii1 = 58 ! East Halmahera Strait (e1v was modified)1248 ij0 = 141 ; ij1 = 1421258 ii0 = 58 ; ii1 = 58 ! East Halmahera Strait (e1v was modified) 1259 ij0 = 141 + isrow ; ij1 = 142 + isrow 1249 1260 DO jk = 1, jpkm1 1250 1261 DO jj = mj0(ij0), mj1(ij1)
Note: See TracChangeset
for help on using the changeset viewer.