Changeset 9054
- Timestamp:
- 2017-12-14T16:17:59+01:00 (7 years ago)
- Location:
- branches/UKMO/dev_r4650_general_vert_coord_obsoper_pfts/NEMOGCM/NEMO/OPA_SRC/OBS
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/UKMO/dev_r4650_general_vert_coord_obsoper_pfts/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90
r8430 r9054 1420 1420 nlogchlvars = 1 1421 1421 1422 ! Set the number of extra variables for logchl to 01423 nlogchlextr = 01422 ! Set the number of extra variables for logchl to 1 (STD) 1423 nlogchlextr = 1 1424 1424 1425 1425 IF ( ln_logchlfb ) THEN … … 1490 1490 nlogchlpftvars = 1 ! ??????? ASK DAVID 1491 1491 1492 ! Set the number of extra variables for logchl to 01493 nlogchlpftextr = 01492 ! Set the number of extra variables for logchl to 1 (STD) 1493 nlogchlpftextr = 1 1494 1494 1495 1495 DO pft = 1, nn_logchlpftscc … … 2559 2559 2560 2560 ! Write the logchl data 2561 ! If padd is ever defined and added as an optional argument 2562 ! to the obs_wri_logchl call, then the observed STD values 2563 ! will need adding to padd in order to be written out 2561 2564 DO jlogchlset = 1, nlogchlsets 2562 2565 -
branches/UKMO/dev_r4650_general_vert_coord_obsoper_pfts/NEMOGCM/NEMO/OPA_SRC/OBS/obs_read_logchl.F90
r7713 r9054 82 82 INTEGER :: jj 83 83 INTEGER :: jk 84 INTEGER :: jadd 84 85 INTEGER :: iflag 85 86 INTEGER :: inobf … … 115 116 TYPE(obfbdata), POINTER, DIMENSION(:) :: & 116 117 & inpfiles 118 LOGICAL :: ll_get_std ! Logical for getting STD 117 119 real(wp), DIMENSION(knumfiles) :: & 118 120 & djulini, & … … 120 122 INTEGER :: iobs 121 123 INTEGER :: iobstot 124 INTEGER :: iaddref_std 122 125 INTEGER :: ios 123 126 INTEGER :: ioserrcount … … 205 208 CALL ctl_stop( 'File format unknown' ) 206 209 ENDIF 210 211 !------------------------------------------------------------------ 212 ! Find the references to additional entries, if any 213 !------------------------------------------------------------------ 214 ! STD 215 iaddref_std = 0 216 ll_get_std = .FALSE. 217 DO jadd = 1,inpfiles(jj) % nadd 218 IF ( TRIM(inpfiles(jj) % caddname(jadd)) == "STD" ) THEN 219 iaddref_std = jadd 220 ll_get_std = .TRUE. 221 EXIT 222 ENDIF 223 END DO 207 224 208 225 !------------------------------------------------------------------ … … 417 434 logchldata%rmod(iobs,1) = fbrmdi 418 435 ENDIF 436 437 ! Copy in STD 438 IF ( ll_get_std ) THEN 439 logchldata%rext(iobs,1) = inpfiles(jj)%padd(1,ji,iaddref_std,1) 440 ELSE 441 IF ( jk == 1 ) & 442 & CALL ctl_warn( & 443 & "No STD values for logchl observations, setting to zero.") 444 logchldata%rext(iobs,1) = 0. 445 ENDIF 419 446 ENDIF 420 447 ENDIF -
branches/UKMO/dev_r4650_general_vert_coord_obsoper_pfts/NEMOGCM/NEMO/OPA_SRC/OBS/obs_write.F90
r8105 r9054 976 976 nadd = padd%inum 977 977 ELSE 978 nadd = 0978 nadd = 1 979 979 ENDIF 980 980 … … 1008 1008 fbdata%caddunit(1,1) = 'mg/m3' 1009 1009 fbdata%cgrid(1) = 'T' 1010 DO ja = 1, nadd 1011 fbdata%caddname(1+ja) = padd%cdname(ja) 1012 fbdata%caddlong(1+ja,1) = padd%cdlong(ja,1) 1013 fbdata%caddunit(1+ja,1) = padd%cdunit(ja,1) 1014 END DO 1010 IF ( PRESENT( padd ) ) THEN 1011 DO ja = 1, nadd 1012 fbdata%caddname(1+ja) = padd%cdname(ja) 1013 fbdata%caddlong(1+ja,1) = padd%cdlong(ja,1) 1014 fbdata%caddunit(1+ja,1) = padd%cdunit(ja,1) 1015 END DO 1016 ELSE 1017 fbdata%caddname(2) = 'STD' 1018 fbdata%caddlong(2) = 'Standard deviation of LOGCHL' 1019 fbdata%caddunit(2) = 'mg/m3' 1020 ENDIF 1015 1021 1016 1022 WRITE(cfname, FMT="(A,'_fdbk_',I4.4,'.nc')") TRIM(cprefix), nproc … … 1075 1081 fbdata%iobsk(1,jo,1) = 0 1076 1082 DO ja = 1, nadd 1077 fbdata%padd(1,jo,1+ja,1) = & 1078 & logchldata%rext(jo,padd%ipoint(ja)) 1083 IF ( PRESENT( padd ) ) THEN 1084 fbdata%padd(1,jo,1+ja,1) = & 1085 & logchldata%rext(jo,padd%ipoint(ja)) 1086 ELSE 1087 fbdata%padd(1,jo,1+ja,1) = & 1088 & logchldata%rext(jo,1) 1089 ENDIF 1079 1090 END DO 1080 1091 DO je = 1, next
Note: See TracChangeset
for help on using the changeset viewer.