Changeset 8455

Timestamp:

2017-08-23T12:57:45+02:00 (6 years ago)

Author:

dford

Message:

Update getting chlorophyll, pCO2 and fCO2 from MEDUSA.

File:

• branches/UKMO/dev_r5518_obs_oper_update_medusa/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 (modified) (4 diffs)

branches/UKMO/dev_r5518_obs_oper_update_medusa/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90

@@ -646 +646 @@
 #elif defined key_medusa && defined key_foam_medusa
       USE trc, ONLY :  &           ! MEDUSA chlorophyll, fCO2 and pCO2
-         & MEDUSA_CHL, &
-         & MEDUSA_FCO2, &
-         & MEDUSA_PCO2, &
-         & MEDUSA_FILL_FLT
+         & trn
+      USE par_medusa, ONLY: &
+         & jpchn, &
+         & jpchd
+#if defined key_roam
+      USE sms_medusa, ONLY: &
+         & f2_pco2w, &
+         & f2_fco2w
+#endif
 #elif defined key_fabm
       USE fabm
@@ -792 +797 @@
                zsurfvar(:,:) = HADOCC_CHL(:,:,1)    ! (not log) chlorophyll from HadOCC
 #elif defined key_medusa && defined key_foam_medusa
-               zsurfvar(:,:) = MEDUSA_CHL(:,:,1)    ! (not log) chlorophyll from HadOCC
+               zsurfvar(:,:) = trn(:,:,1,jpchn) + trn(:,:,1,jpchd)
 #elif defined key_fabm
                chl_3d(:,:,:) = fabm_get_bulk_diagnostic_data(model, jp_fabmdia_chltot)
@@ -829 +834 @@
                      &           ' as HADOCC_FCO2(:,:) == HADOCC_FILL_FLT' )
                ENDIF
-#elif defined key_medusa && defined key_foam_medusa
-               zsurfmask(:,:) = MEDUSA_FCO2(:,:)    ! fCO2 from MEDUSA
-               IF ( ( MINVAL( MEDUSA_FCO2 ) == MEDUSA_FILL_FLT ) .AND. &
-                  & ( MAXVAL( MEDUSA_FCO2 ) == MEDUSA_FILL_FLT ) ) THEN
-                  zsurfvar(:,:) = obfillflt
-                  zsurfmask(:,:) = 0
-                  CALL ctl_warn( ' MEDUSA fCO2 values masked out for observation operator', &
-                     &           ' as MEDUSA_FCO2(:,:) == MEDUSA_FILL_FLT' )
-               ENDIF
+#elif defined key_medusa && defined key_foam_medusa && defined key_roam
+               zsurfvar(:,:) = f2_fco2w(:,:)
 #elif defined key_fabm
                ! First, get pCO2 from FABM
@@ -875 +873 @@
                      &           ' as HADOCC_PCO2(:,:) == HADOCC_FILL_FLT' )
                ENDIF
-#elif defined key_medusa && defined key_foam_medusa
-               zsurfvar(:,:) = MEDUSA_PCO2(:,:)    ! pCO2 from MEDUSA
-               IF ( ( MINVAL( MEDUSA_PCO2 ) == MEDUSA_FILL_FLT ) .AND. &
-                  & ( MAXVAL( MEDUSA_PCO2 ) == MEDUSA_FILL_FLT ) ) THEN
-                  zsurfvar(:,:) = obfillflt
-                  zsurfmask(:,:) = 0
-                  CALL ctl_warn( ' MEDUSA pCO2 values masked out for observation operator', &
-                     &           ' as MEDUSA_PCO2(:,:) == MEDUSA_FILL_FLT' )
-               ENDIF
+#elif defined key_medusa && defined key_foam_medusa && defined key_roam
+               zsurfvar(:,:) = f2_pco2w(:,:)
 #elif defined key_fabm
                pco2_3d(:,:,:) = fabm_get_bulk_diagnostic_data(model, jp_fabm_o3pc)