Changeset 761
- Timestamp:
- 2007-12-10T13:11:07+01:00 (16 years ago)
- Location:
- branches/dev_001_SBC/NEMO/OPA_SRC/IOM
- Files:
-
- 6 edited
-
in_out_manager.F90 (modified) (1 diff, 1 prop)
-
iom.F90 (modified) (11 diffs, 1 prop)
-
iom_def.F90 (modified) (1 diff, 1 prop)
-
iom_ioipsl.F90 (modified) (2 diffs, 1 prop)
-
iom_nf90.F90 (modified) (2 diffs, 1 prop)
-
iom_rstdimg.F90 (modified) (2 diffs, 1 prop)
Legend:
- Unmodified
- Added
- Removed
-
branches/dev_001_SBC/NEMO/OPA_SRC/IOM/in_out_manager.F90
- Property svn:keywords changed from Id to Author Date Id Revision
r699 r761 84 84 !!---------------------------------------------------------------------- 85 85 !! OPA 9.0 , LOCEAN-IPSL (2005) 86 !! $ Id$86 !! $Header: /home/opalod/NEMOCVSROOT/NEMO/OPA_SRC/IOM/in_out_manager.F90,v 1.11 2007/03/02 16:37:06 opalod Exp $ 87 87 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 88 88 !!---------------------------------------------------------------------- -
branches/dev_001_SBC/NEMO/OPA_SRC/IOM/iom.F90
- Property svn:keywords changed from Id to Author Date Id Revision
r699 r761 30 30 PUBLIC iom_open, iom_close, iom_varid, iom_get, iom_gettime, iom_rstput 31 31 32 PRIVATE iom_rp0d, iom_rp1d, iom_rp2d, iom_rp3d 33 PRIVATE iom_g0d, iom_g1d, iom_g2d, iom_g3d, iom_get_123d 34 32 35 INTERFACE iom_get 33 36 MODULE PROCEDURE iom_g0d, iom_g1d, iom_g2d, iom_g3d … … 39 42 !!---------------------------------------------------------------------- 40 43 !! OPA 9.0 , LOCEAN-IPSL (2006) 41 !! $ Id$44 !! $Header: /home/opalod/NEMOCVSROOT/NEMO/OPA_SRC/IOM/iom.F90,v 1.10 2007/06/29 14:10:50 opalod Exp $ 42 45 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 43 46 !!---------------------------------------------------------------------- … … 117 120 iln = LEN_TRIM(clname) 118 121 ils = LEN_TRIM(clsuffix) 119 IF( INDEX( TRIM(clname), TRIM(clsuffix), back = .TRUE. ) /= iln - ils + 1 ) clname = TRIM(clname)//TRIM(clsuffix) 122 IF( iln <= ils .OR. INDEX( TRIM(clname), TRIM(clsuffix), back = .TRUE. ) /= iln - ils + 1 ) & 123 & clname = TRIM(clname)//TRIM(clsuffix) 120 124 cltmpn = clname ! store this name 121 125 ! try to find if the file to be opened already exist … … 246 250 247 251 248 FUNCTION iom_varid ( kiomid, cdvar, kdimsz )252 FUNCTION iom_varid ( kiomid, cdvar, kdimsz, ldstop ) 249 253 !!----------------------------------------------------------------------- 250 254 !! *** FUNCTION iom_varid *** … … 255 259 CHARACTER(len=*) , INTENT(in ) :: cdvar ! name of the variable 256 260 INTEGER, DIMENSION(:), INTENT( out), OPTIONAL :: kdimsz ! size of the dimensions 261 LOGICAL , INTENT(in ), OPTIONAL :: ldstop ! stop if looking for non-existing variable (default = .TRUE.) 257 262 ! 258 263 INTEGER :: iom_varid, iiv, i_nvd 259 264 LOGICAL :: ll_fnd 260 265 CHARACTER(LEN=100) :: clinfo ! info character 266 LOGICAL :: llstop ! local definition of ldstop 261 267 !!----------------------------------------------------------------------- 262 268 iom_varid = 0 ! default definition 269 ! do we call ctl_stop if we look for non-existing variable? 270 IF( PRESENT(ldstop) ) THEN ; llstop = ldstop 271 ELSE ; llstop = .TRUE. 272 ENDIF 263 273 ! 264 274 IF( kiomid > 0 ) THEN … … 280 290 SELECT CASE (iom_file(kiomid)%iolib) 281 291 CASE (jpioipsl ) ; iom_varid = iom_ioipsl_varid( kiomid, cdvar, iiv, kdimsz ) 282 CASE (jpnf90 ) ; iom_varid = iom_nf90_varid (kiomid, cdvar, iiv, kdimsz )283 CASE (jprstdimg) ; iom_varid = 0! all variables are listed in iom_file292 CASE (jpnf90 ) ; iom_varid = iom_nf90_varid ( kiomid, cdvar, iiv, kdimsz ) 293 CASE (jprstdimg) ; iom_varid = -1 ! all variables are listed in iom_file 284 294 CASE DEFAULT 285 295 CALL ctl_stop( TRIM(clinfo)//' accepted IO library are only jpioipsl, jpnf90 and jprstdimg' ) … … 289 299 & 'increase the parameter jpmax_vars') 290 300 ENDIF 301 IF( llstop .AND. iom_varid == -1 ) CALL ctl_stop( TRIM(clinfo)//' not found' ) 291 302 ELSE 292 303 iom_varid = iiv … … 696 707 IF( kiomid > 0 ) THEN 697 708 IF( iom_file(kiomid)%nfid > 0 ) THEN 698 ivid = iom_varid( kiomid, cdvar)709 ivid = iom_varid( kiomid, cdvar, ldstop = .FALSE. ) 699 710 SELECT CASE (iom_file(kiomid)%iolib) 700 711 CASE (jpioipsl ) ; CALL iom_ioipsl_rstput( kt, kwrite, kiomid, cdvar, ivid, ktype, pv_r0d = pvar ) … … 718 729 IF( kiomid > 0 ) THEN 719 730 IF( iom_file(kiomid)%nfid > 0 ) THEN 720 ivid = iom_varid( kiomid, cdvar)731 ivid = iom_varid( kiomid, cdvar, ldstop = .FALSE. ) 721 732 SELECT CASE (iom_file(kiomid)%iolib) 722 733 CASE (jpioipsl ) ; CALL iom_ioipsl_rstput( kt, kwrite, kiomid, cdvar, ivid, ktype, pv_r1d = pvar ) … … 740 751 IF( kiomid > 0 ) THEN 741 752 IF( iom_file(kiomid)%nfid > 0 ) THEN 742 ivid = iom_varid( kiomid, cdvar)753 ivid = iom_varid( kiomid, cdvar, ldstop = .FALSE. ) 743 754 SELECT CASE (iom_file(kiomid)%iolib) 744 755 CASE (jpioipsl ) ; CALL iom_ioipsl_rstput( kt, kwrite, kiomid, cdvar, ivid, ktype, pv_r2d = pvar ) … … 762 773 IF( kiomid > 0 ) THEN 763 774 IF( iom_file(kiomid)%nfid > 0 ) THEN 764 ivid = iom_varid( kiomid, cdvar)775 ivid = iom_varid( kiomid, cdvar, ldstop = .FALSE. ) 765 776 SELECT CASE (iom_file(kiomid)%iolib) 766 777 CASE (jpioipsl ) ; CALL iom_ioipsl_rstput( kt, kwrite, kiomid, cdvar, ivid, ktype, pv_r3d = pvar ) -
branches/dev_001_SBC/NEMO/OPA_SRC/IOM/iom_def.F90
- Property svn:keywords changed from Id to Author Date Id Revision
r699 r761 8 8 !!--------------------------------------------------------------------------------- 9 9 !! OPA 9.0 , LOCEAN-IPSL (2006) 10 !! $ Id$10 !! $Header: /home/opalod/NEMOCVSROOT/NEMO/OPA_SRC/IOM/iom_def.F90,v 1.7 2007/06/05 10:33:38 opalod Exp $ 11 11 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 12 12 !!--------------------------------------------------------------------------------- -
branches/dev_001_SBC/NEMO/OPA_SRC/IOM/iom_ioipsl.F90
- Property svn:keywords changed from Id to Author Date Id Revision
r699 r761 35 35 !!---------------------------------------------------------------------- 36 36 !! OPA 9.0 , LOCEAN-IPSL (2006) 37 !! $ Id$37 !! $Header: /home/opalod/NEMOCVSROOT/NEMO/OPA_SRC/IOM/iom_ioipsl.F90,v 1.8 2007/06/29 14:10:50 opalod Exp $ 38 38 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 39 39 !!---------------------------------------------------------------------- … … 195 195 & 'increase the parameter jpmax_vars') 196 196 ENDIF 197 !!$ ELSE 198 !!$ CALL ctl_warn( trim(clinfo), 'Variable '//trim(cdvar)// & 199 !!$ & ' is not found in the file '//trim(iom_file(kiomid)%name) ) 197 ELSE 198 iom_ioipsl_varid = -1 ! variable not found, return error code: -1 200 199 ENDIF 201 200 ! -
branches/dev_001_SBC/NEMO/OPA_SRC/IOM/iom_nf90.F90
- Property svn:keywords changed from Id to Author Date Id Revision
r699 r761 36 36 !!---------------------------------------------------------------------- 37 37 !! OPA 9.0 , LOCEAN-IPSL (2006) 38 !! $ Id$38 !! $Header: /home/opalod/NEMOCVSROOT/NEMO/OPA_SRC/IOM/iom_nf90.F90,v 1.8 2007/06/29 14:10:50 opalod Exp $ 39 39 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 40 40 !!---------------------------------------------------------------------- … … 206 206 ENDIF 207 207 ENDIF 208 !!$ ELSE 209 !!$ CALL ctl_warn( trim(clinfo), 'Variable '//trim(cdvar)// & 210 !!$ & ' is not found in the file '//trim(iom_file(kiomid)%name) ) 208 ELSE 209 iom_nf90_varid = -1 ! variable not found, return error code: -1 211 210 ENDIF 212 211 ! -
branches/dev_001_SBC/NEMO/OPA_SRC/IOM/iom_rstdimg.F90
- Property svn:keywords changed from Id to Author Date Id Revision
r699 r761 36 36 !!---------------------------------------------------------------------- 37 37 !! OPA 9.0 , LOCEAN-IPSL (2006) 38 !! $ Id$38 !! $Header: /home/opalod/NEMOCVSROOT/NEMO/OPA_SRC/IOM/iom_rstdimg.F90,v 1.9 2007/06/29 14:10:50 opalod Exp $ 39 39 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 40 40 !!---------------------------------------------------------------------- … … 106 106 irecl8= MAX( kdompar(1,1) * kdompar(2,1) * wp, ( 8*jpnij + 15 ) * 4 ) 107 107 IF( jpnij > 1 ) THEN 108 WRITE(cltmp,'(a,a,i4.4,a)') cdname(1:iln-1), '_', narea -1, '.dimg'108 WRITE(cltmp,'(a,a,i4.4,a)') cdname(1:iln-1), '_', narea, '.dimg' 109 109 cdname = TRIM(cltmp) 110 110 ENDIF
Note: See TracChangeset
for help on using the changeset viewer.
