Changeset 11259 for branches/UKMO/dev_r5518_obs_oper_update_kd490/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_surf.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_surf.F90
r11255 r11259 40 40 SUBROUTINE obs_rea_surf( surfdata, knumfiles, cdfilenames, & 41 41 & kvars, kextr, kstp, ddobsini, ddobsend, & 42 & ldignmis, ldmod, ldnightav )42 & ldignmis, ldmod, ldnightav, cdvars ) 43 43 !!--------------------------------------------------------------------- 44 44 !! … … 73 73 REAL(dp), INTENT(IN) :: ddobsini ! Obs. ini time in YYYYMMDD.HHMMSS 74 74 REAL(dp), INTENT(IN) :: ddobsend ! Obs. end time in YYYYMMDD.HHMMSS 75 CHARACTER(len=8), DIMENSION(kvars), INTENT(IN) :: cdvars 75 76 76 77 !! * Local declarations 77 78 CHARACTER(LEN=11), PARAMETER :: cpname='obs_rea_surf' 78 79 CHARACTER(len=8) :: clrefdate 79 CHARACTER(len=8), DIMENSION(:), ALLOCATABLE :: clvars 80 CHARACTER(len=8), DIMENSION(:), ALLOCATABLE :: clvarsin 80 81 INTEGER :: ji 81 82 INTEGER :: jj … … 192 193 193 194 IF ( jj == 1 ) THEN 194 ALLOCATE( clvars ( inpfiles(jj)%nvar ) )195 ALLOCATE( clvarsin( inpfiles(jj)%nvar ) ) 195 196 DO ji = 1, inpfiles(jj)%nvar 196 clvars(ji) = inpfiles(jj)%cname(ji) 197 clvarsin(ji) = inpfiles(jj)%cname(ji) 198 IF ( clvarsin(ji) /= cdvars(ji) ) THEN 199 CALL ctl_stop( 'Feedback file variables do not match', & 200 & ' expected variable names for this type' ) 201 ENDIF 197 202 END DO 198 203 ELSE 199 204 DO ji = 1, inpfiles(jj)%nvar 200 IF ( inpfiles(jj)%cname(ji) /= clvars (ji) ) THEN205 IF ( inpfiles(jj)%cname(ji) /= clvarsin(ji) ) THEN 201 206 CALL ctl_stop( 'Feedback file variables not consistent', & 202 207 & ' with previous files for this type' ) … … 369 374 370 375 iobs = 0 371 surfdata%cvars(:) = clvars (:)376 surfdata%cvars(:) = clvarsin(:) 372 377 IF ( ldmod .AND. ( TRIM( surfdata%cvars(1) ) == 'SLA' ) ) THEN 373 378 surfdata%cext(1) = 'SSH' … … 511 516 ! Deallocate temporary data 512 517 !----------------------------------------------------------------------- 513 DEALLOCATE( ifileidx, isurfidx, zdat, clvars )518 DEALLOCATE( ifileidx, isurfidx, zdat, clvarsin ) 514 519 515 520 !-----------------------------------------------------------------------
Note: See TracChangeset
for help on using the changeset viewer.