Changeset 13575 for branches/UKMO
- Timestamp:
- 2020-10-09T12:29:11+02:00 (4 years ago)
- Location:
- branches/UKMO/dev_r5518_obs_oper_update/NEMOGCM/NEMO/OPA_SRC/OBS
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/UKMO/dev_r5518_obs_oper_update/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90
r13393 r13575 1129 1129 #elif defined key_fabm 1130 1130 USE par_fabm ! FABM parameters 1131 USE fabm, ONLY: &1132 & fabm_get_interior_diagnostic_data1133 1131 #endif 1134 1132 #if defined key_spm … … 1341 1339 #elif defined key_fabm 1342 1340 ! Alkalinity from ERSEM 1343 zprofvar(:,:,:,1) = fabm_get_interior_diagnostic_data(model,jp_fabm_o3ta)1341 zprofvar(:,:,:,1) = model%get_interior_diagnostic_data(jp_fabm_o3ta) 1344 1342 #else 1345 1343 CALL ctl_stop( ' Trying to run palk observation operator', & … … 1356 1354 #elif defined key_fabm 1357 1355 ! pH from ERSEM 1358 zprofvar(:,:,:,1) = trn(:,:,:,jp_fabm_m1+jp_fabm_o3ph)1356 zprofvar(:,:,:,1) = model%get_interior_diagnostic_data(jp_fabm_o3ph) 1359 1357 #else 1360 1358 CALL ctl_stop( ' Trying to run pph observation operator', & … … 1684 1682 & ' but MEDUSA does not explicitly simulate Kd490' ) 1685 1683 #elif defined key_fabm 1686 ! light_xEPS diagnostic variable 1687 fabm_3d(:,:,:) = fabm_get_interior_diagnostic_data(model, jp_fabm_xeps) 1684 ! light_Kd_band3 diagnostic variable if using spectral optical model 1685 ! light_xEPS diagnostic variable if using standard ERSEM light model 1686 IF ( jp_fabm_kd490 /= -1 ) THEN 1687 fabm_3d(:,:,:) = model%get_interior_diagnostic_data(jp_fabm_kd490) 1688 ELSEIF ( jp_fabm_xeps /= -1 ) THEN 1689 fabm_3d(:,:,:) = model%get_interior_diagnostic_data(jp_fabm_xeps) 1690 ELSE 1691 CALL ctl_stop( ' Trying to run skd490 observation operator', & 1692 & ' but cannot access Kd490 from ERSEM' ) 1693 ENDIF 1688 1694 zsurfvar(:,:,1) = fabm_3d(:,:,1) 1689 1695 #else … … 1706 1712 #elif defined key_fabm 1707 1713 ! First, get pCO2 from FABM 1708 fabm_3d(:,:,:) = fabm_get_interior_diagnostic_data(model,jp_fabm_o3pc)1714 fabm_3d(:,:,:) = model%get_interior_diagnostic_data(jp_fabm_o3pc) 1709 1715 zsurfvar(:,:,1) = fabm_3d(:,:,1) 1710 1716 ! Now, convert pCO2 to fCO2, based on SST in K. This follows the standard methodology of: … … 1745 1751 zsurfvar(:,:,1) = f2_pco2w(:,:) 1746 1752 #elif defined key_fabm 1747 fabm_3d(:,:,:) = fabm_get_interior_diagnostic_data(model,jp_fabm_o3pc)1753 fabm_3d(:,:,:) = model%get_interior_diagnostic_data(jp_fabm_o3pc) 1748 1754 zsurfvar(:,:,1) = fabm_3d(:,:,1) 1749 1755 #else -
branches/UKMO/dev_r5518_obs_oper_update/NEMOGCM/NEMO/OPA_SRC/OBS/obs_write.F90
r13393 r13575 349 349 fbdata%ivlqc(ik,jo,jvar) = IBSET(profdata%var(jvar)%nvqc(jk),2) 350 350 fbdata%ivlqcf(1,ik,jo,jvar) = profdata%var(jvar)%nvqcf(1,jk) 351 fbdata%ivlqcf(2,ik,jo,jvar) = IAND(profdata%var(jvar)%nvqc(jk),b'0000 0000 11111111')351 fbdata%ivlqcf(2,ik,jo,jvar) = IAND(profdata%var(jvar)%nvqc(jk),b'0000000011111111') 352 352 ELSE 353 353 fbdata%ivlqc(ik,jo,jvar) = profdata%var(jvar)%nvqc(jk) … … 743 743 fbdata%ioqc(jo) = 4 744 744 fbdata%ioqcf(1,jo) = 0 745 fbdata%ioqcf(2,jo) = IAND(surfdata%nqc(jo),b'0000 0000 11111111')745 fbdata%ioqcf(2,jo) = IAND(surfdata%nqc(jo),b'0000000011111111') 746 746 ELSE 747 747 fbdata%ioqc(jo) = surfdata%nqc(jo) … … 784 784 fbdata%ivlqc(1,jo,jv) = 4 785 785 fbdata%ivlqcf(1,1,jo,jv) = 0 786 fbdata%ivlqcf(2,1,jo,jv) = IAND(surfdata%nqc(jo),b'0000 0000 11111111')786 fbdata%ivlqcf(2,1,jo,jv) = IAND(surfdata%nqc(jo),b'0000000011111111') 787 787 ELSE 788 788 fbdata%ivqc(jo,jv) = surfdata%nqc(jo)
Note: See TracChangeset
for help on using the changeset viewer.