Changeset 11259 for branches/UKMO/dev_r5518_obs_oper_update_kd490/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_prof.F90
- Timestamp:
- 2019-07-11T18:29:19+02:00 (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/UKMO/dev_r5518_obs_oper_update_kd490/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_prof.F90
r9306 r11259 46 46 & kvars, kextr, kstp, ddobsini, ddobsend, & 47 47 & ldvar, ldignmis, ldsatt, & 48 & ldmod, kdailyavtypes )48 & ldmod, cdvars, kdailyavtypes ) 49 49 !!--------------------------------------------------------------------- 50 50 !! … … 80 80 REAL(dp), INTENT(IN) :: ddobsini ! Obs. ini time in YYYYMMDD.HHMMSS 81 81 REAL(dp), INTENT(IN) :: ddobsend ! Obs. end time in YYYYMMDD.HHMMSS 82 CHARACTER(len=8), DIMENSION(kvars), INTENT(IN) :: cdvars 82 83 INTEGER, DIMENSION(imaxavtypes), OPTIONAL :: & 83 84 & kdailyavtypes ! Types of daily average observations … … 86 87 CHARACTER(LEN=15), PARAMETER :: cpname='obs_rea_prof' 87 88 CHARACTER(len=8) :: clrefdate 88 CHARACTER(len=8), DIMENSION(:), ALLOCATABLE :: clvars 89 CHARACTER(len=8), DIMENSION(:), ALLOCATABLE :: clvarsin 89 90 INTEGER :: jvar 90 91 INTEGER :: ji … … 221 222 222 223 IF ( jj == 1 ) THEN 223 ALLOCATE( clvars ( inpfiles(jj)%nvar ) )224 ALLOCATE( clvarsin( inpfiles(jj)%nvar ) ) 224 225 DO ji = 1, inpfiles(jj)%nvar 225 clvars(ji) = inpfiles(jj)%cname(ji) 226 clvarsin(ji) = inpfiles(jj)%cname(ji) 227 IF ( clvarsin(ji) /= cdvars(ji) ) THEN 228 CALL ctl_stop( 'Feedback file variables do not match', & 229 & ' expected variable names for this type' ) 230 ENDIF 226 231 END DO 227 232 ELSE 228 233 DO ji = 1, inpfiles(jj)%nvar 229 IF ( inpfiles(jj)%cname(ji) /= clvars (ji) ) THEN234 IF ( inpfiles(jj)%cname(ji) /= clvarsin(ji) ) THEN 230 235 CALL ctl_stop( 'Feedback file variables not consistent', & 231 236 & ' with previous files for this type' ) … … 506 511 profdata%nprof = 0 507 512 profdata%nvprot(:) = 0 508 profdata%cvars(:) = clvars (:)513 profdata%cvars(:) = clvarsin(:) 509 514 iprof = 0 510 515 … … 805 810 ! Deallocate temporary data 806 811 !----------------------------------------------------------------------- 807 DEALLOCATE( ifileidx, iprofidx, zdat, clvars )812 DEALLOCATE( ifileidx, iprofidx, zdat, clvarsin ) 808 813 809 814 !-----------------------------------------------------------------------
Note: See TracChangeset
for help on using the changeset viewer.