Changeset 1818
- Timestamp:
- 2010-03-25T15:13:55+01:00 (14 years ago)
- Location:
- trunk/NEMO
- Files:
-
- 6 edited
-
LIM_SRC_2/limwri_2.F90 (modified) (1 diff)
-
OPA_SRC/DIA/diadimg.F90 (modified) (6 diffs)
-
OPA_SRC/OBC/obc_oce.F90 (modified) (1 diff)
-
OPA_SRC/OBC/obcini.F90 (modified) (5 diffs)
-
OPA_SRC/OBC/obcrst.F90 (modified) (2 diffs)
-
OPA_SRC/SBC/fldread.F90 (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/NEMO/LIM_SRC_2/limwri_2.F90
r1715 r1818 313 313 CALL histwrite( kid, "iicetemp", kt, sist(:,:) - rt0, jpi*jpj, (/1/) ) 314 314 CALL histwrite( kid, "ioceflxb", kt, fbif , jpi*jpj, (/1/) ) 315 CALL histwrite( kid, "iicevel v", kt, u_ice , jpi*jpj, (/1/) )316 CALL histwrite( kid, "iicevel u", kt, v_ice , jpi*jpj, (/1/) )315 CALL histwrite( kid, "iicevelu", kt, u_ice , jpi*jpj, (/1/) ) 316 CALL histwrite( kid, "iicevelv", kt, v_ice , jpi*jpj, (/1/) ) 317 317 CALL histwrite( kid, "isstempe", kt, sst_m , jpi*jpj, (/1/) ) 318 318 CALL histwrite( kid, "isssalin", kt, sss_m , jpi*jpj, (/1/) ) -
trunk/NEMO/OPA_SRC/DIA/diadimg.F90
r1715 r1818 10 10 USE dom_oce ! ocean space and time domain 11 11 USE in_out_manager ! I/O manager 12 USE daymod ! calendar 12 13 13 14 IMPLICIT NONE … … 21 22 !!---------------------------------------------------------------------- 22 23 !! OPA 9.0 , LOCEAN-IPSL (2005) 23 !! $ Id$24 !! $Header$ 24 25 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 25 26 !!---------------------------------------------------------------------- … … 56 57 INTEGER :: jk, jn ! dummy loop indices 57 58 INTEGER :: irecl4, & ! record length in bytes 58 & inum, & ! logical unit 59 & irec ! current record to be written 59 & inum, & ! logical unit (set to 14) 60 & irec, & ! current record to be written 61 & irecend ! record number where nclit... are stored 60 62 REAL(sp) :: zdx,zdy,zspval,zwest,ztimm 61 63 REAL(sp) :: zsouth … … 69 71 !! * Initialisations 70 72 71 irecl4 = MAX(jpi*jpj*sp , 84+ 18*sp + (jpk+8)*jpnij*sp)73 irecl4 = MAX(jpi*jpj*sp , 84+(18+1+jpk)*sp ) 72 74 73 75 zspval=0.0_sp ! special values on land … … 101 103 102 104 IF ( ln_dimgnnn ) THEN 105 irecl4 = MAX(jpi*jpj*sp , 84+(18+jpk)*sp + 8*jpnij*sp ) 103 106 WRITE(clname,'(a,a,i3.3)') TRIM(cd_name),'.',narea 104 CALL ctl_opn( inum, clname, 'REPLACE', 'UNFORMATTED', 'DIRECT', irecl4, numout, lwp)107 CALL ctl_opn(inum, clname,'UNKNOWN','UNFORMATTED','DIRECT',irecl4,numout,lwp) 105 108 WRITE(inum,REC=1 ) clver, cd_text, irecl4, & 106 109 & jpi,jpj, klev, 1 , 1 , & … … 127 130 ENDIF 128 131 ELSE 132 clver='@!03' ! dimg string identifier 133 ! note that version @!02 is optimized with respect to record length. 134 ! The vertical dep variable is reduced to klev instead of klev*jpnij : 135 ! this is OK for jpnij < 181 (jpk=46) 136 ! for more processors, irecl4 get huge and that's why we switch to '@!03': 137 ! In this case we just add an extra integer to the standard dimg structure, 138 ! which is a record number where the arrays nlci etc... starts (1 per record) 139 129 140 !! Standard dimgproc (1 file per variable, all procs. write to this file ) 130 141 !! * Open file 131 CALL ctl_opn( inum, cd_name, 'REPLACE', 'UNFORMATTED', 'DIRECT', irecl4, numout, lwp)142 CALL ctl_opn(inum, cd_name,'UNKNOWN','UNFORMATTED','DIRECT',irecl4,numout,lwp) 132 143 133 144 !! * Write header on record #1 145 irecend=1 + klev*jpnij 134 146 IF(lwp) WRITE(inum,REC=1 ) clver, cd_text, irecl4, & 135 & jpi,jpj, klev *jpnij, 1 , 1 , &147 & jpi,jpj, klev, 1 , 1 , & 136 148 & zwest, zsouth, zdx, zdy, zspval, & 137 & (z4dep(1:klev),jn=1,jpnij), &149 & z4dep(1:klev), & 138 150 & ztimm, & 139 & narea, jpnij,jpiglo,jpjglo,jpizoom, jpjzoom, & ! extension to dimg for mpp output 140 & nlcit,nlcjt, nldit, nldjt, nleit, nlejt, nimppt, njmppt ! 151 & narea, jpnij,jpiglo,jpjglo,jpizoom, jpjzoom, irecend 152 IF (lwp ) THEN 153 WRITE(inum,REC=irecend + 1 ) nlcit 154 WRITE(inum,REC=irecend + 2 ) nlcjt 155 WRITE(inum,REC=irecend + 3 ) nldit 156 WRITE(inum,REC=irecend + 4 ) nldjt 157 WRITE(inum,REC=irecend + 5 ) nleit 158 WRITE(inum,REC=irecend + 6 ) nlejt 159 WRITE(inum,REC=irecend + 7 ) nimppt 160 WRITE(inum,REC=irecend + 8 ) njmppt 161 ENDIF 162 ! & ! extension to dimg for mpp output 163 ! & nlcit,nlcjt, nldit, nldjt, nleit, nlejt, nimppt, njmppt ! 141 164 142 165 !! * Write klev levels -
trunk/NEMO/OPA_SRC/OBC/obc_oce.F90
r1601 r1818 27 27 ! 28 28 ! !!* Namelist namobc: open boundary condition * 29 INTEGER :: nn_nbobc = 2 !: number of open boundaries ( 1=< nbobc =< 4 )30 29 INTEGER :: nn_obcdta = 0 !: = 0 use the initial state as obc data 31 30 ! ! = 1 read obc data in obcxxx.dta files -
trunk/NEMO/OPA_SRC/OBC/obcini.F90
r1633 r1818 70 70 71 71 ! convert DOCTOR namelist name into the OLD names 72 nbobc = nn_nbobc73 72 nobc_dta = nn_obcdta 74 73 cffile = cn_obcdta … … 101 100 IF(lwp) WRITE(numout,*) 'obc_init : initialization of open boundaries' 102 101 IF(lwp) WRITE(numout,*) '~~~~~~~~' 103 IF(lwp) WRITE(numout,*) ' Number of open boundaries n n_nbobc = ', nn_nbobc102 IF(lwp) WRITE(numout,*) ' Number of open boundaries nbobc = ', nbobc 104 103 IF(lwp) WRITE(numout,*) 105 104 … … 306 305 IF( lp_obc_east ) THEN 307 306 !... (jpjed,jpjefm1),jpieob 307 bmask(nie0p1:nie1p1,nje0:nje1m1) = 0.e0 308 308 309 309 ! ... initilization to zero … … 341 341 IF( lp_obc_north ) THEN 342 342 ! ... jpjnob,(jpind,jpisfm1) 343 bmask(nin0:nin1m1,njn0p1:njn1p1) = 0.e0 343 344 344 345 ! ... initilization to zero … … 440 441 END DO 441 442 END IF 442 443 443 444 IF( lp_obc_north ) THEN ! ... North open boundary lateral surface 444 445 DO jj = njn0, njn1 -
trunk/NEMO/OPA_SRC/OBC/obcrst.F90
r1715 r1818 96 96 ! ------------- 97 97 98 CALL ctl_opn( inum, 'restart.obc.output', ' REPLACE', 'UNFORMATTED', 'DIRECT', nreclo, numout, lwp )98 CALL ctl_opn( inum, 'restart.obc.output', 'UNKNOWN', 'UNFORMATTED', 'DIRECT', nreclo, numout, lwp ) 99 99 100 100 ! 1.2 Write header … … 322 322 ! 0.1 Open files 323 323 ! --------------- 324 CALL ctl_opn( inum, 'restart.obc', ' REPLACE', 'UNFORMATTED', 'DIRECT', nreclo, numout, lwp )324 CALL ctl_opn( inum, 'restart.obc', 'UNKNOWN', 'UNFORMATTED', 'DIRECT', nreclo, numout, lwp ) 325 325 326 326 ! 1. Read -
trunk/NEMO/OPA_SRC/SBC/fldread.F90
r1730 r1818 368 368 369 369 ! if previous year/month/day file does not exist, we switch to the current year/month/day 370 IF( llprev .AND. sdjf%num == 0 ) THEN370 IF( llprev .AND. sdjf%num <= 0 ) THEN 371 371 CALL ctl_warn( 'previous year/month/day file: '//TRIM(sdjf%clname)//' not present -> back to current year/month/day') 372 372 ! we force to read the first record of the current year/month/day instead of last record of previous year/month/day … … 399 399 ENDIF 400 400 401 IF( sdjf%num == 0 ) CALL fld_clopn( sdjf, nyear, nmonth, nday ) ! make sure current year/month/day file is opened401 IF( sdjf%num <= 0 ) CALL fld_clopn( sdjf, nyear, nmonth, nday ) ! make sure current year/month/day file is opened 402 402 403 403 sdjf%nswap_sec = nsec_year + nsec1jan000 - 1 ! force read/update the after data in the following part of fld_read
Note: See TracChangeset
for help on using the changeset viewer.
