Changeset 8653
- Timestamp:
- 2017-10-23T18:32:44+02:00 (6 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
r8157 r8653 646 646 #elif defined key_medusa && defined key_foam_medusa 647 647 USE trc, ONLY : & ! MEDUSA chlorophyll, fCO2 and pCO2 648 & MEDUSA_CHL, & 649 & MEDUSA_FCO2, & 650 & MEDUSA_PCO2, & 651 & MEDUSA_FILL_FLT 648 & trn 649 USE par_medusa, ONLY: & 650 & jpchn, & 651 & jpchd 652 #if defined key_roam 653 USE sms_medusa, ONLY: & 654 & f2_pco2w, & 655 & f2_fco2w 656 #endif 652 657 #elif defined key_fabm 653 658 USE fabm … … 792 797 zsurfvar(:,:) = HADOCC_CHL(:,:,1) ! (not log) chlorophyll from HadOCC 793 798 #elif defined key_medusa && defined key_foam_medusa 794 zsurfvar(:,:) = MEDUSA_CHL(:,:,1) ! (not log) chlorophyll from HadOCC 799 ! Add non-diatom and diatom surface chlorophyll from MEDUSA 800 zsurfvar(:,:) = trn(:,:,1,jpchn) + trn(:,:,1,jpchd) 795 801 #elif defined key_fabm 796 802 chl_3d(:,:,:) = fabm_get_bulk_diagnostic_data(model, jp_fabmdia_chltot) … … 829 835 & ' as HADOCC_FCO2(:,:) == HADOCC_FILL_FLT' ) 830 836 ENDIF 831 #elif defined key_medusa && defined key_foam_medusa 832 zsurfmask(:,:) = MEDUSA_FCO2(:,:) ! fCO2 from MEDUSA 833 IF ( ( MINVAL( MEDUSA_FCO2 ) == MEDUSA_FILL_FLT ) .AND. & 834 & ( MAXVAL( MEDUSA_FCO2 ) == MEDUSA_FILL_FLT ) ) THEN 835 zsurfvar(:,:) = obfillflt 836 zsurfmask(:,:) = 0 837 CALL ctl_warn( ' MEDUSA fCO2 values masked out for observation operator', & 838 & ' as MEDUSA_FCO2(:,:) == MEDUSA_FILL_FLT' ) 839 ENDIF 837 #elif defined key_medusa && defined key_foam_medusa && defined key_roam 838 zsurfvar(:,:) = f2_fco2w(:,:) 840 839 #elif defined key_fabm 841 840 ! First, get pCO2 from FABM … … 875 874 & ' as HADOCC_PCO2(:,:) == HADOCC_FILL_FLT' ) 876 875 ENDIF 877 #elif defined key_medusa && defined key_foam_medusa 878 zsurfvar(:,:) = MEDUSA_PCO2(:,:) ! pCO2 from MEDUSA 879 IF ( ( MINVAL( MEDUSA_PCO2 ) == MEDUSA_FILL_FLT ) .AND. & 880 & ( MAXVAL( MEDUSA_PCO2 ) == MEDUSA_FILL_FLT ) ) THEN 881 zsurfvar(:,:) = obfillflt 882 zsurfmask(:,:) = 0 883 CALL ctl_warn( ' MEDUSA pCO2 values masked out for observation operator', & 884 & ' as MEDUSA_PCO2(:,:) == MEDUSA_FILL_FLT' ) 885 ENDIF 876 #elif defined key_medusa && defined key_foam_medusa && defined key_roam 877 zsurfvar(:,:) = f2_pco2w(:,:) 886 878 #elif defined key_fabm 887 879 pco2_3d(:,:,:) = fabm_get_bulk_diagnostic_data(model, jp_fabm_o3pc) -
branches/UKMO/dev_r5518_obs_oper_update/NEMOGCM/NEMO/OPA_SRC/OBS/obs_oper.F90
r7992 r8653 982 982 surfdataqc%rmod(jobs,1) = zext(1) 983 983 ENDIF 984 985 IF ( zext(1) == obfillflt ) THEN 986 ! If the observation value is a fill value, set QC flag to bad 987 surfdataqc%nqc(jobs) = 4 988 ENDIF 984 989 985 990 END DO
Note: See TracChangeset
for help on using the changeset viewer.