Changeset 13760
- Timestamp:
- 2020-11-09T18:33:48+01:00 (3 years ago)
- Location:
- NEMO/branches/2020/dev_r13747_ENHANCE-04_dford_OBSOP_BGC/src/OCE/OBS
- Files:
-
- 4 edited
-
obs_oper.F90 (modified) (1 diff)
-
obs_prep.F90 (modified) (1 diff)
-
obs_read_prof.F90 (modified) (1 diff)
-
obs_write.F90 (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2020/dev_r13747_ENHANCE-04_dford_OBSOP_BGC/src/OCE/OBS/obs_oper.F90
r13758 r13760 285 285 CALL obs_int_h2d_init( 1, 1, k2dint, zlam, zphi, & 286 286 & zglam(:,:,iobs), zgphi(:,:,iobs), & 287 & zmask(:,:,1,iobs), zweig1, zmsk _1)287 & zmask(:,:,1,iobs), zweig1, zmsk ) 288 288 289 289 ENDIF -
NEMO/branches/2020/dev_r13747_ENHANCE-04_dford_OBSOP_BGC/src/OCE/OBS/obs_prep.F90
r13758 r13760 408 408 & inlavobs(jvar), ld_nea, & 409 409 & ibdyvobs(jvar), ld_bound_reject, & 410 & iqc_cutoff )410 & iqc_cutoff, Kmm ) 411 411 412 412 CALL obs_mpp_sum_integer( iosdvobs(jvar), iosdvobsmpp(jvar) ) -
NEMO/branches/2020/dev_r13747_ENHANCE-04_dford_OBSOP_BGC/src/OCE/OBS/obs_read_prof.F90
r13758 r13760 702 702 & inpfiles(jj)%padd(ij,ji,1,jvar) 703 703 ENDIF 704 IF ( profdata%lclim ) THEN705 profdata%var(jvar)%vclm(ivart(jvar)) = fbrmdi706 ENDIF707 704 ! Count number of profile var1 data as function of type 708 705 itypvar( profdata%ntyp(iprof) + 1, jvar ) = & -
NEMO/branches/2020/dev_r13747_ENHANCE-04_dford_OBSOP_BGC/src/OCE/OBS/obs_write.F90
r13758 r13760 187 187 & ( TRIM(profdata%cvars(1)) /= 'UVEL' ) ) THEN 188 188 CALL alloc_obfbdata( fbdata, 1, profdata%nprof, ilevel, & 189 & 1 + iadd _clm + iadd, iext, .TRUE. )189 & 1 + iadd, iext, .TRUE. ) 190 190 fbdata%cname(1) = profdata%cvars(1) 191 191 fbdata%coblong(1) = cllongname … … 193 193 fbdata%caddlong(1,1) = 'Model interpolated ' // TRIM(cllongname) 194 194 fbdata%caddunit(1,1) = clunits 195 IF ( profdata%lclim ) THEN196 fbdata%caddlong(2,1) = 'Climatological interpolated ' // TRIM(cllongname)197 fbdata%caddunit(2,1) = clunits198 ENDIF199 195 fbdata%cgrid(:) = clgrid 200 196 DO je = 1, iext … … 204 200 END DO 205 201 DO ja = 1, iadd 206 fbdata%caddname(1+ iadd_clm+ja) = padd%cdname(ja)207 fbdata%caddlong(1+ iadd_clm+ja,1) = padd%cdlong(ja,1)208 fbdata%caddunit(1+ iadd_clm+ja,1) = padd%cdunit(ja,1)202 fbdata%caddname(1+ja) = padd%cdname(ja) 203 fbdata%caddlong(1+ja,1) = padd%cdlong(ja,1) 204 fbdata%caddunit(1+ja,1) = padd%cdunit(ja,1) 209 205 END DO 210 206 ENDIF … … 358 354 CHARACTER(LEN=40) :: clfname ! netCDF filename 359 355 CHARACTER(LEN=10) :: clfiletype 360 CHARACTER(LEN=ilenlong) , DIMENSION(surfdata%nvar):: cllongname ! Long name of variable361 CHARACTER(LEN=ilenunit) , DIMENSION(surfdata%nvar):: clunits ! Units of variable362 CHARACTER(LEN=ilengrid) , DIMENSION(surfdata%nvar):: clgrid ! Grid of variable356 CHARACTER(LEN=ilenlong) :: cllongname ! Long name of variable 357 CHARACTER(LEN=ilenunit) :: clunits ! Units of variable 358 CHARACTER(LEN=ilengrid) :: clgrid ! Grid of variable 363 359 CHARACTER(LEN=12), PARAMETER :: cpname = 'obs_wri_surf' 364 360 CHARACTER(LEN=12) :: clfmt ! writing format … … 420 416 CASE('SST') 421 417 422 clfiletype 423 cllongname (1)= 'Sea surface temperature'424 clunits (1)= 'Degree centigrade'425 clgrid (1)= 'T'418 clfiletype = 'sstfb' 419 cllongname = 'Sea surface temperature' 420 clunits = 'Degree centigrade' 421 clgrid = 'T' 426 422 427 423 CASE('ICECONC') 428 424 429 clfiletype 430 cllongname (1)= 'Sea ice concentration'431 clunits (1)= 'Fraction'432 clgrid (1)= 'T'425 clfiletype = 'sicfb' 426 cllongname = 'Sea ice concentration' 427 clunits = 'Fraction' 428 clgrid = 'T' 433 429 434 430 CASE('SSS') 435 431 436 clfiletype = 'sssfb' 437 cllongname(1) = 'Sea surface salinity' 438 clunits(1) = 'psu' 439 clgrid(1) = 'T' 440 END DO 432 clfiletype = 'sssfb' 433 cllongname = 'Sea surface salinity' 434 clunits = 'psu' 435 clgrid = 'T' 441 436 442 437 CASE DEFAULT … … 451 446 IF ( TRIM(surfdata%cvars(1)) /= 'SLA' ) THEN 452 447 453 CALL alloc_obfbdata( fbdata, surfdata%nvar, surfdata%nsurf, 1, & 454 & 1 + iadd_std + iadd_clm + iadd, iext, .TRUE. ) 455 456 DO jv = 1, surfdata%nvar 457 fbdata%cname(jv) = surfdata%cvars(jv) 458 fbdata%coblong(jv) = cllongname(jv) 459 fbdata%cobunit(jv) = clunits(jv) 460 END DO 448 CALL alloc_obfbdata( fbdata, 1, surfdata%nsurf, 1, & 449 & 1 + iadd, iext, .TRUE. ) 450 451 fbdata%cname(1) = surfdata%cvars(1) 452 fbdata%coblong(1) = cllongname 453 fbdata%cobunit(1) = clunits 461 454 DO je = 1, iext 462 455 fbdata%cextname(je) = pext%cdname(je) 463 456 fbdata%cextlong(je) = pext%cdlong(je,1) 464 457 fbdata%cextunit(je) = pext%cdunit(je,1) 465 END DO 466 DO jv = 1, surfdata%nvar 467 IF ( TRIM(surfdata%cvars(1)) == 'ICECONC' ) THEN 468 fbdata%caddlong(1,jv) = 'Model interpolated ICE' 469 ELSE 470 fbdata%caddlong(1,jv) = 'Model interpolated ' // TRIM(surfdata%cvars(jv)) 471 ENDIF 472 fbdata%caddunit(1,jv) = clunits(jv) 473 fbdata%cgrid(jv) = clgrid(jv) 474 END DO 458 END DO 459 IF ( TRIM(surfdata%cvars(1)) == 'ICECONC' ) THEN 460 fbdata%caddlong(1,1) = 'Model interpolated ICE' 461 ELSE 462 fbdata%caddlong(1,1) = 'Model interpolated ' // TRIM(surfdata%cvars(1)) 463 ENDIF 464 fbdata%caddunit(1,1) = clunits 465 fbdata%cgrid(1) = clgrid 475 466 DO ja = 1, iadd 476 fbdata%caddname(1+iadd_mdt+iadd_std+iadd_clm+ja) = padd%cdname(ja) 477 DO jv = 1, surfdata%nvar 478 fbdata%caddlong(1+iadd_mdt+iadd_std+iadd_clm+ja,jv) = padd%cdlong(ja,jv) 479 fbdata%caddunit(1+iadd_mdt+iadd_std+iadd_clm+ja,jv) = padd%cdunit(ja,jv) 480 END DO 467 fbdata%caddname(1+ja) = padd%cdname(ja) 468 fbdata%caddlong(1+ja,1) = padd%cdlong(ja,1) 469 fbdata%caddunit(1+ja,1) = padd%cdunit(ja,1) 481 470 END DO 482 471 ENDIF
Note: See TracChangeset
for help on using the changeset viewer.
