- Timestamp:
- 2015-01-22T14:23:26+01:00 (9 years ago)
- Location:
- trunk/NEMOGCM/NEMO/OPA_SRC
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90
r5015 r5040 365 365 INTEGER :: ji, jj, jl, jk ! dummy loop indices 366 366 INTEGER :: inum ! temporary logical unit 367 INTEGER :: ierror ! error flag 367 368 INTEGER :: ii_bump, ij_bump, ih ! bump center position 368 369 INTEGER :: ii0, ii1, ij0, ij1, ik ! local indices 369 370 REAL(wp) :: r_bump , h_bump , h_oce ! bump characteristics 370 371 REAL(wp) :: zi, zj, zh, zhmin ! local scalars 371 INTEGER , POINTER, DIMENSION(:,:) :: idta ! global domain integer data372 REAL(wp), POINTER, DIMENSION(:,:) :: zdta ! global domain scalar data372 INTEGER , ALLOCATABLE, DIMENSION(:,:) :: idta ! global domain integer data 373 REAL(wp), ALLOCATABLE, DIMENSION(:,:) :: zdta ! global domain scalar data 373 374 !!---------------------------------------------------------------------- 374 375 ! 375 376 IF( nn_timing == 1 ) CALL timing_start('zgr_bat') 376 !377 CALL wrk_alloc( jpidta, jpjdta, idta )378 CALL wrk_alloc( jpidta, jpjdta, zdta )379 377 ! 380 378 IF(lwp) WRITE(numout,*) … … 385 383 ! ! ================== ! 386 384 ! ! global domain level and meter bathymetry (idta,zdta) 385 ! 386 ALLOCATE( idta(jpidta,jpjdta), STAT=ierror ) 387 IF( ierror > 0 ) CALL ctl_stop( 'STOP', 'zgr_bat: unable to allocate idta array' ) 388 ALLOCATE( zdta(jpidta,jpjdta), STAT=ierror ) 389 IF( ierror > 0 ) CALL ctl_stop( 'STOP', 'zgr_bat: unable to allocate zdta array' ) 387 390 ! 388 391 IF( ntopo == 0 ) THEN ! flat basin … … 489 492 WHERE( bathy(:,:) <= 0._wp ) risfdep(:,:) = 0._wp 490 493 END IF 494 ! 495 DEALLOCATE( idta, zdta ) 491 496 ! 492 497 ! ! ================ ! … … 593 598 ENDIF 594 599 ! 595 CALL wrk_dealloc( jpidta, jpjdta, idta )596 CALL wrk_dealloc( jpidta, jpjdta, zdta )597 !598 600 IF( nn_timing == 1 ) CALL timing_stop('zgr_bat') 599 601 ! -
trunk/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn_c2d.h90
r4325 r5040 146 146 INTEGER :: inum, iim, ijm ! local integers 147 147 INTEGER :: ifreq, il1, il2, ij, ii 148 INTEGER :: ijpt0,ijpt1 148 INTEGER :: ijpt0,ijpt1, ierror 149 149 REAL(wp) :: zahmeq, zcoft, zcoff, zmsk 150 150 CHARACTER (len=15) :: clexp 151 INTEGER, POINTER, DIMENSION(:,:) :: icof152 INTEGER, POINTER, DIMENSION(:,:) :: idata151 INTEGER, POINTER, DIMENSION(:,:) :: icof 152 INTEGER, ALLOCATABLE, DIMENSION(:,:) :: idata 153 153 !!---------------------------------------------------------------------- 154 154 ! 155 155 CALL wrk_alloc( jpi , jpj , icof ) 156 CALL wrk_alloc( jpidta, jpjdta, idata )157 156 ! 158 157 IF(lwp) WRITE(numout,*) … … 234 233 ! ===================== equatorial strip (20N-20S) defined at t-points 235 234 235 ALLOCATE( idata(jpidta,jpjdta), STAT=ierror ) 236 IF( ierror > 0 ) CALL ctl_stop( 'STOP', 'ldf_dyn_c2d_orca: unable to allocate idata array' ) 237 ! 236 238 CALL ctl_opn( inum, 'ahmcoef', 'OLD', 'FORMATTED', 'SEQUENTIAL', -1, numout, lwp ) 237 239 READ(inum,9101) clexp, iim, ijm … … 269 271 9201 FORMAT(3x,13(i3,12x)) 270 272 9202 FORMAT(i3,41i3) 271 273 274 DEALLOCATE(idata) 272 275 273 276 ! Set ahm1 and ahm2 ( T- and F- points) (used for laplacian operator) … … 346 349 ! 347 350 CALL wrk_dealloc( jpi , jpj , icof ) 348 CALL wrk_dealloc( jpidta, jpjdta, idata )349 351 ! 350 352 END SUBROUTINE ldf_dyn_c2d_orca … … 374 376 INTEGER :: iim, ijm 375 377 INTEGER :: ifreq, il1, il2, ij, ii 376 INTEGER :: ijpt0,ijpt1 378 INTEGER :: ijpt0,ijpt1, ierror 377 379 REAL(wp) :: zahmeq, zcoft, zcoff, zmsk, zam20s 378 380 CHARACTER (len=15) :: clexp 379 INTEGER, POINTER, DIMENSION(:,:) :: icof380 INTEGER, POINTER, DIMENSION(:,:) :: idata381 INTEGER, POINTER, DIMENSION(:,:) :: icof 382 INTEGER, ALLOCATABLE, DIMENSION(:,:) :: idata 381 383 !!---------------------------------------------------------------------- 382 384 ! 383 385 CALL wrk_alloc( jpi , jpj , icof ) 384 CALL wrk_alloc( jpidta, jpjdta, idata )385 386 ! 386 387 … … 464 465 ! ===================== equatorial strip (20N-20S) defined at t-points 465 466 467 ALLOCATE( idata(jpidta,jpjdta), STAT=ierror ) 468 IF( ierror > 0 ) CALL ctl_stop( 'STOP', 'ldf_dyn_c2d_orca_R1: unable to allocate idata array' ) 469 ! 466 470 CALL ctl_opn( inum, 'ahmcoef', 'UNKNOWN', 'FORMATTED', 'SEQUENTIAL', & 467 471 & 1, numout, lwp ) … … 501 505 9201 FORMAT(3x,13(i3,12x)) 502 506 9202 FORMAT(i3,41i3) 503 507 508 DEALLOCATE(idata) 504 509 505 510 ! Set ahm1 and ahm2 ( T- and F- points) (used for laplacian operator) … … 583 588 ! 584 589 CALL wrk_dealloc( jpi , jpj , icof ) 585 CALL wrk_dealloc( jpidta, jpjdta, idata )586 590 ! 587 591 END SUBROUTINE ldf_dyn_c2d_orca_R1
Note: See TracChangeset
for help on using the changeset viewer.