Changeset 5506
- Timestamp:
- 2015-06-29T17:19:38+02:00 (9 years ago)
- Location:
- trunk/NEMOGCM/NEMO
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/NEMOGCM/NEMO/OPA_SRC/DIA/diafwb.F90
r5385 r5506 166 166 CASE ( 1 ) ! ORCA_R1 configurations 167 167 ! ! ======================= 168 ! This dirty section will be suppressed by simplification process: all this will come back in input files 169 ! Currently these hard-wired indices relate to the original (pre-v3.6) configuration 170 ! which had a grid-size of 362x292. 171 ! This grid has been extended southwards for use with the under ice-shelf options (isf) introduced in v3.6. 172 ! The original domain can still be used optionally if the isf code is not activated. 173 ! An adjustment (isrow) is made to the hard-wired indices if the extended domain (362x332) is being used. 174 ! 175 IF ( jpjglo == 292 ) THEN ; isrow = 0 ! Using pre-v3.6 files or adjusted start row from isf-extended grid 176 ELSEIF( jpjglo == 332 ) THEN ; isrow = 40 ! Using full isfextended domain. 177 ENDIF ! Adjust jindices to account for more southerly starting latitude 168 ! This dirty section will be suppressed by simplification process: 169 ! all this will come back in input files 170 ! Currently these hard-wired indices relate to configuration with 171 ! extend grid (jpjglo=332) 172 isrow = 332 - jpjglo 173 ! 178 174 ii0 = 283 ; ii1 = 283 179 ij0 = 2 01 + isrow ; ij1 = 201 +isrow175 ij0 = 241 - isrow ; ij1 = 241 - isrow 180 176 ! ! ======================= 181 177 CASE DEFAULT ! ORCA R05 or R025 … … 223 219 CASE ( 1 ) ! ORCA_R1 configurations 224 220 ! ! ======================= 225 ! 226 ! 227 IF ( jpjglo == 292 ) THEN ; isrow = 0228 ELSEIF( jpjglo == 332 ) THEN ; isrow = 39229 ENDIF221 ! This dirty section will be suppressed by simplification process: 222 ! all this will come back in input files 223 ! Currently these hard-wired indices relate to configuration with 224 ! extend grid (jpjglo=332) 225 isrow = 332 - jpjglo 230 226 ii0 = 282 ; ii1 = 282 231 ij0 = 2 01 + isrow ; ij1 = 201 +isrow227 ij0 = 240 - isrow ; ij1 = 240 - isrow 232 228 ! ! ======================= 233 229 CASE DEFAULT ! ORCA R05 or R025 … … 275 271 CASE ( 1 ) ! ORCA_R1 configurations 276 272 ! ! ======================= 277 ! 278 ! 279 IF ( jpjglo == 292 ) THEN ; isrow = 0280 ELSEIF( jpjglo == 332 ) THEN ; isrow = 39281 ENDIF273 ! This dirty section will be suppressed by simplification process: 274 ! all this will come back in input files 275 ! Currently these hard-wired indices relate to configuration with 276 ! extend grid (jpjglo=332) 277 isrow = 332 - jpjglo 282 278 ii0 = 331 ; ii1 = 331 283 ij0 = 176 + isrow ; ij1 = 176 +isrow279 ij0 = 215 - isrow ; ij1 = 215 - isrow 284 280 ! ! ======================= 285 281 CASE DEFAULT ! ORCA R05 or R025 … … 327 323 CASE ( 1 ) ! ORCA_R1 configurations 328 324 ! ! ======================= 329 ! 330 ! 331 IF ( jpjglo == 292 ) THEN ; isrow = 0332 ELSEIF( jpjglo == 332 ) THEN ; isrow = 39333 ENDIF325 ! This dirty section will be suppressed by simplification process: 326 ! all this will come back in input files 327 ! Currently these hard-wired indices relate to configuration with 328 ! extend grid (jpjglo=332) 329 isrow = 332 - jpjglo 334 330 ii0 = 297 ; ii1 = 297 335 ij0 = 2 30 + isrow ; ij1 = 230 +isrow331 ij0 = 269 - isrow ; ij1 = 269 - isrow 336 332 ! ! ======================= 337 333 CASE DEFAULT ! ORCA R05 or R025 -
trunk/NEMOGCM/NEMO/OPA_SRC/DOM/closea.F90
r4162 r5506 72 72 !!---------------------------------------------------------------------- 73 73 INTEGER :: jc ! dummy loop indices 74 INTEGER :: isrow ! local index 74 75 !!---------------------------------------------------------------------- 75 76 … … 91 92 CASE ( 1 ) ! ORCA_R1 configuration 92 93 ! ! ======================= 94 ! This dirty section will be suppressed by simplification process: 95 ! all this will come back in input files 96 ! Currently these hard-wired indices relate to configuration with 97 ! extend grid (jpjglo=332) 98 isrow = 332 - jpjglo 99 ! 93 100 ncsnr(1) = 1 ; ncstt(1) = 0 ! Caspian Sea 94 ncsi1(1) = 332 ; ncsj1(1) = 2 0395 ncsi2(1) = 344 ; ncsj2(1) = 2 35101 ncsi1(1) = 332 ; ncsj1(1) = 243 - isrow 102 ncsi2(1) = 344 ; ncsj2(1) = 275 - isrow 96 103 ncsir(1,1) = 1 ; ncsjr(1,1) = 1 97 104 ! -
trunk/NEMOGCM/NEMO/OPA_SRC/DOM/domhgr.F90
r5385 r5506 162 162 ! ! ===================== 163 163 ! This dirty section will be suppressed by simplification process: all this will come back in input files 164 ! Currently these hard-wired indices relate to the original (pre-v3.6) configuration 164 ! Currently these hard-wired indices relate to configuration with 165 ! extend grid (jpjglo=332) 165 166 ! which had a grid-size of 362x292. 166 ! This grid has been extended southwards for use with the under ice-shelf options (isf) introduced in v3.6.167 ! The original domain can still be used optionally if the isf code is not activated.168 ! An adjustment (isrow) is made to the hard-wired indices if the extended domain (362x332) is being used.169 167 ! 170 IF ( jpjglo == 292 ) THEN ; isrow = 0 ! Using pre-v3.6 files or adjusted start row from isf-extended grid 171 ELSEIF( jpjglo == 332 ) THEN ; isrow = 40 ! Using full isfextended domain. 172 ENDIF 168 isrow = 332 - jpjglo 173 169 ! 174 170 ii0 = 282 ; ii1 = 283 ! Gibraltar Strait (e2u = 20 km) 175 ij0 = 201 + isrow ; ij1 = 2 01 +isrow ; e2u( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) = 20.e3171 ij0 = 201 + isrow ; ij1 = 241 - isrow ; e2u( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) = 20.e3 176 172 IF(lwp) WRITE(numout,*) 177 173 IF(lwp) WRITE(numout,*) ' orca_r1: Gibraltar : e2u reduced to 20 km' 178 174 179 175 ii0 = 314 ; ii1 = 315 ! Bhosporus Strait (e2u = 10 km) 180 ij0 = 208 + isrow ; ij1 = 2 08 +isrow ; e2u( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) = 10.e3176 ij0 = 208 + isrow ; ij1 = 248 - isrow ; e2u( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) = 10.e3 181 177 IF(lwp) WRITE(numout,*) 182 178 IF(lwp) WRITE(numout,*) ' orca_r1: Bhosporus : e2u reduced to 10 km' 183 179 184 180 ii0 = 44 ; ii1 = 44 ! Lombok Strait (e1v = 13 km) 185 ij0 = 124 + isrow ; ij1 = 1 25 +isrow ; e1v( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) = 13.e3181 ij0 = 124 + isrow ; ij1 = 165 - isrow ; e1v( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) = 13.e3 186 182 IF(lwp) WRITE(numout,*) 187 183 IF(lwp) WRITE(numout,*) ' orca_r1: Lombok : e1v reduced to 10 km' 188 184 189 185 ii0 = 48 ; ii1 = 48 ! Sumba Strait (e1v = 8 km) [closed from bathy_11 on] 190 ij0 = 124 + isrow ; ij1 = 1 25 +isrow ; e1v( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) = 8.e3186 ij0 = 124 + isrow ; ij1 = 165 - isrow ; e1v( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) = 8.e3 191 187 IF(lwp) WRITE(numout,*) 192 188 IF(lwp) WRITE(numout,*) ' orca_r1: Sumba : e1v reduced to 8 km' 193 189 194 190 ii0 = 53 ; ii1 = 53 ! Ombai Strait (e1v = 13 km) 195 ij0 = 124 + isrow ; ij1 = 1 25 +isrow ; e1v( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) = 13.e3191 ij0 = 124 + isrow ; ij1 = 165 - isrow ; e1v( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) = 13.e3 196 192 IF(lwp) WRITE(numout,*) 197 193 IF(lwp) WRITE(numout,*) ' orca_r1: Ombai : e1v reduced to 13 km' 198 194 199 195 ii0 = 56 ; ii1 = 56 ! Timor Passage (e1v = 20 km) 200 ij0 = 124 + isrow ; ij1 = 1 25 +isrow ; e1v( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) = 20.e3196 ij0 = 124 + isrow ; ij1 = 145 - isrow ; e1v( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) = 20.e3 201 197 IF(lwp) WRITE(numout,*) 202 198 IF(lwp) WRITE(numout,*) ' orca_r1: Timor Passage : e1v reduced to 20 km' 203 199 204 200 ii0 = 55 ; ii1 = 55 ! West Halmahera Strait (e1v = 30 km) 205 ij0 = 141 + isrow ; ij1 = 1 42 +isrow ; e1v( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) = 30.e3201 ij0 = 141 + isrow ; ij1 = 182 - isrow ; e1v( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) = 30.e3 206 202 IF(lwp) WRITE(numout,*) 207 203 IF(lwp) WRITE(numout,*) ' orca_r1: W Halmahera : e1v reduced to 30 km' 208 204 209 205 ii0 = 58 ; ii1 = 58 ! East Halmahera Strait (e1v = 50 km) 210 ij0 = 141 + isrow ; ij1 = 1 42 +isrow ; e1v( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) = 50.e3206 ij0 = 141 + isrow ; ij1 = 182 - isrow ; e1v( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) ) = 50.e3 211 207 IF(lwp) WRITE(numout,*) 212 208 IF(lwp) WRITE(numout,*) ' orca_r1: E Halmahera : e1v reduced to 50 km' -
trunk/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90
r5385 r5506 402 402 IF( cp_cfg == "orca" .AND. jp_cfg == 1 ) THEN ! ORCA R1 configuration 403 403 ! ! Increased lateral friction near of some straits 404 ! This dirty section will be suppressed by simplification process: all this will come back in input files 405 ! Currently these hard-wired indices relate to the original (pre-v3.6) configuration 406 ! which had a grid-size of 362x292. 407 ! This grid has been extended southwards for use with the under ice-shelf options (isf) introduced in v3.6. 408 ! The original domain can still be used optionally if the isf code is not activated. 409 ! An adjustment (isrow) is made to the hard-wired indices if the extended domain (362x332) is being used. 410 ! 411 IF ( jpjglo == 292 ) THEN ; isrow = 0 ! Using pre-v3.6 files or adjusted start row from isf-extended grid 412 ELSEIF( jpjglo == 332 ) THEN ; isrow = 40 ! Using full isfextended domain. 413 ENDIF 414 404 ! This dirty section will be suppressed by simplification process: 405 ! all this will come back in input files 406 ! Currently these hard-wired indices relate to configuration with 407 ! extend grid (jpjglo=332) 408 ! 409 isrow = 332 - jpjglo 410 ! 415 411 IF(lwp) WRITE(numout,*) 416 412 IF(lwp) WRITE(numout,*) ' orca_r1: increase friction near the following straits : ' 417 413 IF(lwp) WRITE(numout,*) ' Gibraltar ' 418 414 ii0 = 282 ; ii1 = 283 ! Gibraltar Strait 419 ij0 = 201 + isrow ; ij1 = 2 01 +isrow ; fmask( mi0(ii0):mi1(ii1),mj0(ij0):mj1(ij1),1:jpk ) = 2._wp415 ij0 = 201 + isrow ; ij1 = 241 - isrow ; fmask( mi0(ii0):mi1(ii1),mj0(ij0):mj1(ij1),1:jpk ) = 2._wp 420 416 421 417 IF(lwp) WRITE(numout,*) ' Bhosporus ' 422 418 ii0 = 314 ; ii1 = 315 ! Bhosporus Strait 423 ij0 = 208 + isrow ; ij1 = 2 08 +isrow ; fmask( mi0(ii0):mi1(ii1),mj0(ij0):mj1(ij1),1:jpk ) = 2._wp419 ij0 = 208 + isrow ; ij1 = 248 - isrow ; fmask( mi0(ii0):mi1(ii1),mj0(ij0):mj1(ij1),1:jpk ) = 2._wp 424 420 425 421 IF(lwp) WRITE(numout,*) ' Makassar (Top) ' 426 422 ii0 = 48 ; ii1 = 48 ! Makassar Strait (Top) 427 ij0 = 149 + isrow ; ij1 = 1 50 +isrow ; fmask( mi0(ii0):mi1(ii1),mj0(ij0):mj1(ij1),1:jpk ) = 3._wp423 ij0 = 149 + isrow ; ij1 = 190 - isrow ; fmask( mi0(ii0):mi1(ii1),mj0(ij0):mj1(ij1),1:jpk ) = 3._wp 428 424 429 425 IF(lwp) WRITE(numout,*) ' Lombok ' 430 426 ii0 = 44 ; ii1 = 44 ! Lombok Strait 431 ij0 = 124 + isrow ; ij1 = 1 25 +isrow ; fmask( mi0(ii0):mi1(ii1),mj0(ij0):mj1(ij1),1:jpk ) = 2._wp427 ij0 = 124 + isrow ; ij1 = 165 - isrow ; fmask( mi0(ii0):mi1(ii1),mj0(ij0):mj1(ij1),1:jpk ) = 2._wp 432 428 433 429 IF(lwp) WRITE(numout,*) ' Ombai ' 434 430 ii0 = 53 ; ii1 = 53 ! Ombai Strait 435 ij0 = 124 + isrow ; ij1 = 1 25 +isrow ; fmask( mi0(ii0):mi1(ii1),mj0(ij0):mj1(ij1),1:jpk ) = 2._wp431 ij0 = 124 + isrow ; ij1 = 165 - isrow ; fmask( mi0(ii0):mi1(ii1),mj0(ij0):mj1(ij1),1:jpk ) = 2._wp 436 432 437 433 IF(lwp) WRITE(numout,*) ' Timor Passage ' 438 434 ii0 = 56 ; ii1 = 56 ! Timor Passage 439 ij0 = 124 + isrow ; ij1 = 1 25 +isrow ; fmask( mi0(ii0):mi1(ii1),mj0(ij0):mj1(ij1),1:jpk ) = 2._wp435 ij0 = 124 + isrow ; ij1 = 165 - isrow ; fmask( mi0(ii0):mi1(ii1),mj0(ij0):mj1(ij1),1:jpk ) = 2._wp 440 436 441 437 IF(lwp) WRITE(numout,*) ' West Halmahera ' 442 438 ii0 = 58 ; ii1 = 58 ! West Halmahera Strait 443 ij0 = 141 + isrow ; ij1 = 1 42 +isrow ; fmask( mi0(ii0):mi1(ii1),mj0(ij0):mj1(ij1),1:jpk ) = 3._wp439 ij0 = 141 + isrow ; ij1 = 182 - isrow ; fmask( mi0(ii0):mi1(ii1),mj0(ij0):mj1(ij1),1:jpk ) = 3._wp 444 440 445 441 IF(lwp) WRITE(numout,*) ' East Halmahera ' 446 442 ii0 = 55 ; ii1 = 55 ! East Halmahera Strait 447 ij0 = 141 + isrow ; ij1 = 1 42 +isrow ; fmask( mi0(ii0):mi1(ii1),mj0(ij0):mj1(ij1),1:jpk ) = 3._wp443 ij0 = 141 + isrow ; ij1 = 182 - isrow ; fmask( mi0(ii0):mi1(ii1),mj0(ij0):mj1(ij1),1:jpk ) = 3._wp 448 444 ! 449 445 ENDIF -
trunk/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90
r5385 r5506 1123 1123 IF( cp_cfg == "orca" .AND. jp_cfg == 1 ) THEN ! ORCA R1 configuration 1124 1124 ! ! ===================== 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 1125 ! This dirty section will be suppressed by simplification process: 1126 ! all this will come back in input files 1127 ! Currently these hard-wired indices relate to configuration with 1128 ! extend grid (jpjglo=332) 1127 1129 ! 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 1130 isrow = 332 - jpjglo 1135 1131 ! 1136 1132 ii0 = 282 ; ii1 = 283 ! Gibraltar Strait (e2u was modified) 1137 ij0 = 2 01 + isrow ; ij1 = 201 +isrow1133 ij0 = 241 - isrow ; ij1 = 241 - isrow 1138 1134 DO jk = 1, jpkm1 1139 1135 DO jj = mj0(ij0), mj1(ij1) … … 1156 1152 ! 1157 1153 ii0 = 314 ; ii1 = 315 ! Bhosporus Strait (e2u was modified) 1158 ij0 = 2 08 + isrow ; ij1 = 208 +isrow1154 ij0 = 248 - isrow ; ij1 = 248 - isrow 1159 1155 DO jk = 1, jpkm1 1160 1156 DO jj = mj0(ij0), mj1(ij1) … … 1177 1173 ! 1178 1174 ii0 = 44 ; ii1 = 44 ! Lombok Strait (e1v was modified) 1179 ij0 = 1 24 + isrow ; ij1 = 125 +isrow1175 ij0 = 164 - isrow ; ij1 = 165 - isrow 1180 1176 DO jk = 1, jpkm1 1181 1177 DO jj = mj0(ij0), mj1(ij1) … … 1193 1189 ! 1194 1190 ii0 = 48 ; ii1 = 48 ! Sumba Strait (e1v was modified) [closed from bathy_11 on] 1195 ij0 = 1 24 + isrow ; ij1 = 125 +isrow1191 ij0 = 164 - isrow ; ij1 = 165 - isrow 1196 1192 DO jk = 1, jpkm1 1197 1193 DO jj = mj0(ij0), mj1(ij1) … … 1209 1205 ! 1210 1206 ii0 = 53 ; ii1 = 53 ! Ombai Strait (e1v was modified) 1211 ij0 = 1 24 + isrow ; ij1 = 125 +isrow1207 ij0 = 164 - isrow ; ij1 = 165 - isrow 1212 1208 DO jk = 1, jpkm1 1213 1209 DO jj = mj0(ij0), mj1(ij1) … … 1224 1220 END DO 1225 1221 ! 1226 ii0 = 56 1227 ij0 = 1 24 + isrow ; ij1 = 125 +isrow1222 ii0 = 56 ; ii1 = 56 ! Timor Passage (e1v was modified) 1223 ij0 = 164 - isrow ; ij1 = 165 - isrow 1228 1224 DO jk = 1, jpkm1 1229 1225 DO jj = mj0(ij0), mj1(ij1) … … 1240 1236 END DO 1241 1237 ! 1242 ii0 = 55 1243 ij0 = 1 41 + isrow ; ij1 = 142 +isrow1238 ii0 = 55 ; ii1 = 55 ! West Halmahera Strait (e1v was modified) 1239 ij0 = 181 - isrow ; ij1 = 182 - isrow 1244 1240 DO jk = 1, jpkm1 1245 1241 DO jj = mj0(ij0), mj1(ij1) … … 1256 1252 END DO 1257 1253 ! 1258 ii0 = 58 1259 ij0 = 1 41 + isrow ; ij1 = 142 +isrow1254 ii0 = 58 ; ii1 = 58 ! East Halmahera Strait (e1v was modified) 1255 ij0 = 181 - isrow ; ij1 = 182 - isrow 1260 1256 DO jk = 1, jpkm1 1261 1257 DO jj = mj0(ij0), mj1(ij1) -
trunk/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90
r5385 r5506 484 484 CALL iom_close( inum ) 485 485 mbathy(:,:) = INT( bathy(:,:) ) 486 !487 ! CL : add Amazon deeper488 IF( cp_cfg == "orca" .AND. jp_cfg == 1 ) THEN ! ORCA R1 configuration489 ii0 = 230 ; ii1 = 245 ! Amazon area490 ij0 = 140 ; ij1 = 155 ! no ocean shallower than 30 meters491 DO ji = mi0(ii0), mi1(ii1)492 DO jj = mj0(ij0), mj1(ij1)493 IF( bathy(ji,jj) .LE. 30. .AND. bathy(ji,jj) .GT. 0.0 ) bathy(ji,jj) = 30._wp494 END DO495 END DO496 IF(lwp) WRITE(numout,*)497 IF(lwp) WRITE(numout,*) ' orca_r1: Amazon area not shallower than 30 meters for: '498 IF(lwp) WRITE(numout,*) ' Longitude index ',ii0, ii0499 IF(lwp) WRITE(numout,*) ' Latitude index ',ij0, ij0500 ENDIF501 486 ! ! ===================== 502 487 IF( cp_cfg == "orca" .AND. jp_cfg == 2 ) THEN ! ORCA R2 configuration -
trunk/NEMOGCM/NEMO/TOP_SRC/TRP/trcdmp.F90
r5385 r5506 185 185 INTEGER, INTENT( in ) :: kt ! ocean time-step index 186 186 ! 187 INTEGER :: ji, jj, jk, jn, jl, jc ! dummy loop indicesa 187 INTEGER :: ji , jj, jk, jn, jl, jc ! dummy loop indicesa 188 INTEGER :: isrow ! local index 188 189 REAL(wp), POINTER, DIMENSION(:,:,:) :: ztrcdta ! 3D workspace 189 190 … … 201 202 ! 202 203 SELECT CASE ( jp_cfg ) 204 ! ! ======================= 205 CASE ( 1 ) ! eORCA_R1 configuration 206 ! ! ======================= 207 isrow = 332 - jpjglo 208 ! 209 ! Caspian Sea 210 nctsi1(1) = 332 ; nctsj1(1) = 243 - isrow 211 nctsi2(1) = 344 ; nctsj2(1) = 275 - isrow 212 ! 203 213 ! ! ======================= 204 214 CASE ( 2 ) ! ORCA_R2 configuration
Note: See TracChangeset
for help on using the changeset viewer.