Changeset 1428
- Timestamp:
- 2009-05-07T16:09:50+02:00 (15 years ago)
- Location:
- branches/dev_004_VVL/NEMO/OPA_SRC
- Files:
-
- 3 edited
-
DOM/dommsk.F90 (modified) (1 diff)
-
SOL/solisl.F90 (modified) (10 diffs)
-
TRA/tradmp.F90 (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/dev_004_VVL/NEMO/OPA_SRC/DOM/dommsk.F90
r1273 r1428 397 397 ! ! Sound strait : strong slip (fmask > 2) 398 398 ij0 = 115 ; ij1 = 115 399 ii0 = 145 ; ii1 = 146 ; fmask( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , 1:jpk ) = 4.0e0399 ii0 = 145 ; ii1 = 146 ; fmask( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , 1:jpk ) = 3.0e0 400 400 ij0 = 116 ; ij1 = 116 401 ii0 = 145 ; ii1 = 146 ; fmask( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , 1:jpk ) = 4.0e0401 ii0 = 145 ; ii1 = 146 ; fmask( mi0(ii0):mi1(ii1) , mj0(ij0):mj1(ij1) , 1:jpk ) = 3.0e0 402 402 ! 403 403 ENDIF -
branches/dev_004_VVL/NEMO/OPA_SRC/SOL/solisl.F90
r1152 r1428 558 558 !! * Local declarations 559 559 INTEGER :: ji, jj, jni, jnj, jl ! dummy loop indices 560 INTEGER :: ios ! temporary integers 561 INTEGER :: & 562 inum ! temporary logical unit 560 INTEGER :: ios ! temporary integers 561 INTEGER :: inum ! temporary logical unit 563 562 REAL(wp), DIMENSION(jpi,jpj,2) :: zwx 564 563 REAL(wp), DIMENSION(jpisl*jpisl) :: ztab … … 599 598 ENDIF 600 599 601 CALL restclo(numisl)602 603 600 ELSE 604 601 605 CALL iom_close( inum )606 607 602 ! II. Island matrix computation 608 603 ! ============================= … … 685 680 ! -------------------------------------- 686 681 687 CALL restput( numisl, 'aisl' , jpisl, jpisl, 1, 0, aisl )688 CALL restput( numisl, 'aislm1', jpisl, jpisl, 1, 0, aislm1 )689 CALL restclo( numisl)682 CALL iom_rstput( 0, 0, inum, 'aisl' , aisl ) 683 CALL iom_rstput( 0, 0, inum, 'aislm1', aislm1 ) 684 CALL iom_close ( inum ) 690 685 691 686 ENDIF … … 741 736 INTEGER :: iimlu, ijmlu, inmlu, iju 742 737 INTEGER :: ii, ij, icile, icut, inmax, indic 743 INTEGER :: itime744 738 REAL(wp) :: zepsr, zeplu, zgwgt 745 REAL(wp) :: zep(jpisl), z dept(1), zprec(4)746 REAL(wp) :: zd ate0, zdt739 REAL(wp) :: zep(jpisl), zprec(4) 740 REAL(wp) :: zdt 747 741 REAL(wp) :: t2p1(jpi,1,1) 748 742 INTEGER :: iloc … … 796 790 END DO 797 791 ENDIF 792 CALL iom_close( inum ) 793 ! 798 794 ELSE 799 795 ! islands FILE does not EXIST : icut=999 800 796 icut = 999 801 797 ENDIF 802 803 CALL iom_close( inum )804 798 805 799 ! the read precision is not the required one : icut=888 … … 1071 1065 ! =============================== 1072 1066 1073 CALL ymds2ju( 0, 1, 1, 0.e0, zdate0 )1074 1067 zprec(1) = FLOAT(jpi) 1075 1068 zprec(2) = FLOAT(jpj) 1076 1069 zprec(3) = FLOAT(jpisl) 1077 1070 IF(lwp) WRITE(numout,*) clname 1078 zdept(1) = 0. 1079 itime = 0 1080 CALL restini( 'NONE', jpi, jpj, glamt, gphit, 1, zdept, & 1081 & clname, itime, zdate0, rdt, numisl, domain_id=nidom ) 1071 CALL iom_open ( clname, numisl, ldwrt = .TRUE., kiolib = jprstlib ) 1082 1072 IF( icile == 0 .AND. icut /= 0 ) THEN 1083 1073 IF(lwp) THEN … … 1087 1077 ENDIF 1088 1078 zprec(4) = epsisl 1089 CALL restput(numisl,'PRECISION',1,1,4,0,zprec)1079 CALL iom_rstput( 0, 0, numisl, 'PRECISION' , zprec ) 1090 1080 DO jni = 1, jpisl 1091 1081 IF(jni < 10) THEN … … 1096 1086 WRITE(clisl,'("island",I3)') jni 1097 1087 ENDIF 1098 CALL restput( numisl, clisl, jpi, jpj, 1, 0, bsfisl(:,:,jni) ) 1099 END DO 1088 CALL iom_rstput( 0, 0, numisl, clisl , bsfisl(:,:,jni) ) 1089 END DO 1090 CALL iom_close( numisl ) 1100 1091 ENDIF 1101 1092 … … 1120 1111 1121 1112 zprec(4) = zepsr 1122 CALL restput( numisl, 'PRECISION', 1, 1, 1, 0, zprec )1113 CALL iom_rstput( 0, 0, numisl, 'PRECISION' , zprec ) 1123 1114 DO jni = 1, jpisl 1124 1115 IF( jni < 10 ) THEN … … 1129 1120 WRITE(clisl,'("island",I3)') jni 1130 1121 ENDIF 1131 CALL restput( numisl, clisl, jpi, jpj, 1, 0, bsfisl(:,:,jni) )1132 END DO 1133 CALL restclo(numisl)1122 CALL iom_rstput( 0, 0, numisl, clisl , bsfisl(:,:,jni) ) 1123 END DO 1124 CALL iom_close( numisl ) 1134 1125 CALL ctl_stop( ' ' ) 1135 1126 ENDIF -
branches/dev_004_VVL/NEMO/OPA_SRC/TRA/tradmp.F90
r1217 r1428 329 329 USE ioipsl 330 330 !! 331 INTEGER :: ji, jj, jk ! dummy loop indices 332 INTEGER :: itime 333 INTEGER :: ii0, ii1, ij0, ij1 ! " " 334 INTEGER :: idmp ! logical unit for file restoring damping term 335 INTEGER :: icot ! logical unit for file distance to the coast 336 CHARACTER (len=32) :: clname3 337 REAL(wp) :: zdate0, zinfl, zlon ! temporary scalars 331 INTEGER :: ji, jj, jk ! dummy loop indices 332 INTEGER :: ii0, ii1, ij0, ij1 ! " " 333 INTEGER :: idmp ! logical unit for file restoring damping term 334 INTEGER :: icot ! logical unit for file distance to the coast 335 REAL(wp) :: zinfl, zlon ! temporary scalars 338 336 REAL(wp) :: zlat, zlat0, zlat1, zlat2 ! " " 339 337 REAL(wp) :: zsdmp, zbdmp ! " " … … 558 556 IF( ndmpf == 1 ) THEN 559 557 IF(lwp) WRITE(numout,*) ' create damping.coeff.nc file' 560 itime = 0 561 clname3 = 'damping.coeff' 562 CALL ymds2ju( 0 , 1 , 1 , 0.e0 , zdate0 ) 563 CALL restini( 'NONE', jpi , jpj , glamt, gphit, & 564 & jpk , gdept_0, clname3, itime, zdate0, & 565 & rdt , idmp, domain_id=nidom ) 566 CALL restput( idmp, 'Resto', jpi, jpj, jpk, & 567 & 0 , resto ) 568 CALL restclo( idmp ) 558 CALL iom_open ( 'damping.coeff', inum0, ldwrt = .TRUE., kiolib = jprstlib ) 559 CALL iom_rstput( 0, 0, inum0, 'Resto', resto ) 560 CALL iom_close ( inum0 ) 569 561 ENDIF 570 562 !
Note: See TracChangeset
for help on using the changeset viewer.
