Changeset 4818 for branches/2014/dev_r4650_UKMO14.11_SETTE_OBSASM
- Timestamp:
- 2014-10-16T18:01:52+02:00 (10 years ago)
- Location:
- branches/2014/dev_r4650_UKMO14.11_SETTE_OBSASM/NEMOGCM
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2014/dev_r4650_UKMO14.11_SETTE_OBSASM/NEMOGCM/NEMO/OPA_SRC/OBS/obs_grid.F90
r2715 r4818 412 412 ENDIF 413 413 414 IF (MAXVAL(ixpos(ipx1:ipx,ipy1:ipy)) == -1) CYCLE! cycle if no lookup points found 414 IF (.NOT. llfourflag) THEN 415 IF (MAXVAL(ixpos(ipx1:ipx,ipy1:ipy)) == -1) CYCLE! cycle if no lookup points found 416 ENDIF 415 417 416 418 jimin = 0 … … 996 998 df = ABS( iypos(ji+1,jj) - iypos(ji,jj) ) 997 999 tmpy1 = df 998 IF ( df < lim xdiff ) numy1 = numy1 + 11000 IF ( df < limydiff ) numy1 = numy1 + 1 999 1001 IF ( df < histsize ) histy1(df+1) = histy1(df+1) + 1 1000 1002 ENDIF … … 1002 1004 df = ABS( iypos(ji,jj+1) - iypos(ji,jj) ) 1003 1005 tmpy2 = df 1004 IF ( df < lim xdiff ) numy2 = numy2+11006 IF ( df < limydiff ) numy2 = numy2+1 1005 1007 IF ( df < histsize ) histy2(df+1) = histy2(df+1)+1 1006 1008 ENDIF -
branches/2014/dev_r4650_UKMO14.11_SETTE_OBSASM/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_prof.F90
r4292 r4818 143 143 INTEGER :: is3dt 144 144 INTEGER :: ip3dt 145 INTEGER :: ios 146 INTEGER :: ioserrcount 145 147 INTEGER, DIMENSION(kvars) :: & 146 148 & iv3dt … … 280 282 & krefdate = irefdate(jj) ) 281 283 284 ioserrcount=0 282 285 IF ( ldavtimset ) THEN 283 286 DO ji = 1, inpfiles(jj)%nobs … … 287 290 ! to be the end of the day 288 291 ! 289 READ( inpfiles(jj)%cdtyp(ji), '(I4)' ) itype 292 READ( inpfiles(jj)%cdtyp(ji), '(I4)', IOSTAT = ios, ERR = 900 ) itype 293 900 IF ( ios /= 0 ) THEN 294 itype = 0 ! Set type to zero if there is a problem in the string conversion 295 ENDIF 290 296 IF ( ANY (idailyavtypes == itype ) ) THEN 291 297 inpfiles(jj)%ptim(ji) = & … … 468 474 itypsmpp(:) = 0 469 475 470 476 ioserrcount = 0 471 477 DO jk = 1, iproftot 472 478 … … 552 558 553 559 ! Instrument type 554 READ( inpfiles(jj)%cdtyp(ji), '(I4)' ) itype 560 READ( inpfiles(jj)%cdtyp(ji), '(I4)', IOSTAT = ios, ERR = 901 ) itype 561 901 IF ( ios /= 0 ) THEN 562 IF (ioserrcount == 0) CALL ctl_warn ( 'Problem converting an instrument type to integer. Setting type to zero' ) 563 ioserrcount = ioserrcount + 1 564 itype = 0 565 ENDIF 566 555 567 profdata%ntyp(iprof) = itype 556 568 -
branches/2014/dev_r4650_UKMO14.11_SETTE_OBSASM/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_seaice.F90
r3651 r4818 120 120 INTEGER :: iobs 121 121 INTEGER :: iobstot 122 INTEGER :: ios 123 INTEGER :: ioserrcount 122 124 CHARACTER(len=8) :: cl_refdate 123 125 … … 335 337 ityp (:) = 0 336 338 itypmpp(:) = 0 337 339 340 ioserrcount=0 341 338 342 DO jk = 1, iobstot 339 343 … … 382 386 383 387 ! Instrument type 384 READ( inpfiles(jj)%cdtyp(ji), '(I4)' ) itype 388 READ( inpfiles(jj)%cdtyp(ji), '(I4)', IOSTAT = ios, ERR = 901 ) itype 389 901 IF ( ios /= 0 ) THEN 390 IF (ioserrcount == 0) CALL ctl_warn ( 'Problem converting an instrument type to integer. Setting type to zero' ) 391 ioserrcount = ioserrcount + 1 392 itype = 0 393 ENDIF 385 394 seaicedata%ntyp(iobs) = itype 386 395 IF ( itype < iseaicemaxtype + 1 ) THEN -
branches/2014/dev_r4650_UKMO14.11_SETTE_OBSASM/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_sla.F90
r3651 r4818 125 125 INTEGER :: iobs 126 126 INTEGER :: iobstot 127 INTEGER :: ios 128 INTEGER :: ioserrcount 127 129 CHARACTER(len=8) :: cl_refdate 128 130 … … 400 402 ityp (:) = 0 401 403 itypmpp(:) = 0 404 405 ioserrcount = 0 402 406 403 407 DO jk = 1, iobstot … … 451 455 452 456 ! Instrument type 453 READ( inpfiles(jj)%cdtyp(ji), '(I4)' ) itype 457 READ( inpfiles(jj)%cdtyp(ji), '(I4)', IOSTAT = ios, ERR = 901 ) itype 458 901 IF ( ios /= 0 ) THEN 459 IF (ioserrcount == 0) CALL ctl_warn ( 'Problem converting an instrument type to integer. Setting type to zero' ) 460 ioserrcount = ioserrcount + 1 461 itype = 0 462 ENDIF 454 463 sladata%ntyp(iobs) = itype 455 464 ityp(itype+1) = ityp(itype+1) + 1 -
branches/2014/dev_r4650_UKMO14.11_SETTE_OBSASM/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_sst.F90
r3651 r4818 120 120 INTEGER :: iobs 121 121 INTEGER :: iobstot 122 INTEGER :: ios 123 INTEGER :: ioserrcount 122 124 CHARACTER(len=8) :: cl_refdate 123 125 … … 335 337 itypmpp(:) = 0 336 338 339 ioserrcount = 0 340 337 341 DO jk = 1, iobstot 338 342 … … 381 385 382 386 ! Instrument type 383 READ( inpfiles(jj)%cdtyp(ji), '(I4)' ) itype 387 READ( inpfiles(jj)%cdtyp(ji), '(I4)', IOSTAT = ios, ERR = 901 ) itype 388 901 IF ( ios /= 0 ) THEN 389 IF (ioserrcount == 0) CALL ctl_warn ( 'Problem converting an instrument type to integer. Setting type to zero' ) 390 ioserrcount = ioserrcount + 1 391 itype = 0 392 ENDIF 384 393 sstdata%ntyp(iobs) = itype 385 394 IF ( itype < isstmaxtype + 1 ) THEN -
branches/2014/dev_r4650_UKMO14.11_SETTE_OBSASM/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_vel.F90
r4292 r4818 130 130 INTEGER :: iproftot 131 131 INTEGER :: iuv3dt 132 INTEGER :: ios 133 INTEGER :: ioserrcount 132 134 INTEGER, DIMENSION(kvars) :: iv3dt 133 135 CHARACTER(len=8) :: cl_refdate … … 459 461 460 462 ! Instrument type 461 READ( inpfiles(jj)%cdtyp(ji), '(I4)' ) itype 463 READ( inpfiles(jj)%cdtyp(ji), '(I4)', IOSTAT = ios, ERR = 901 ) itype 464 901 IF ( ios /= 0 ) THEN 465 IF (ioserrcount == 0) CALL ctl_warn ( 'Problem converting an instrument type to integer. Setting type to zero' ) 466 ioserrcount = ioserrcount + 1 467 itype = 0 468 ENDIF 462 469 profdata%ntyp(iprof) = itype 463 470 -
branches/2014/dev_r4650_UKMO14.11_SETTE_OBSASM/NEMOGCM/NEMO/OPA_SRC/OBS/obs_write.F90
r4781 r4818 945 945 946 946 !! * Arguments 947 TYPE(obfbdata) :: fbdata ! DJL correct for argument?947 TYPE(obfbdata) :: fbdata 948 948 949 949 !! * Local declarations -
branches/2014/dev_r4650_UKMO14.11_SETTE_OBSASM/NEMOGCM/SETTE/sette.sh
r4799 r4818 922 922 set_namelist namelist_cfg nn_it000 1 923 923 set_namelist namelist_cfg nn_itend 75 924 set_namelist namelist_cfg ln_clobber .true. 925 set_namelist namelist_cfg nn_fwb 0 924 set_namelist namelist_cfg nn_fwb 0 925 set_namelist namelist_cfg ln_ctl .false. 926 set_namelist namelist_cfg ln_clobber .true. 926 927 set_namelist namelist_cfg jpni 2 927 928 set_namelist namelist_cfg jpnj 8
Note: See TracChangeset
for help on using the changeset viewer.