Changeset 10388

Timestamp:

2018-12-14T13:47:32+01:00 (6 years ago)

Author:

dford

Message:

Updates for running with FABM-ERSEM. See internal Met Office NEMO ticket 760.

File:

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

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

@@ -862 +862 @@
       !! * Modules used
       USE phycst, ONLY : &         ! Physical constants
+#if defined key_fabm
+         & rt0,          &
+#endif
          & rday
       USE oce, ONLY : &            ! Ocean dynamics and tracers variables
@@ -879 +882 @@
       USE sbc_oce, ONLY : fr_i     ! ice fraction
 #endif
-#if defined key_hadocc
-      USE trc, ONLY :  &           ! HadOCC variables
-         & trn, &
+#if defined key_top
+      USE trc, ONLY :  &           ! Biogeochemical state variables
+         & trn
+#endif
+#if defined key_hadocc
+      USE par_hadocc               ! HadOCC parameters
+      USE trc, ONLY :  &
          & HADOCC_CHL, &
          & HADOCC_FCO2, &
          & HADOCC_PCO2, &
          & HADOCC_FILL_FLT
-      USE par_hadocc
       USE had_bgc_const, ONLY: c2n_p
 #elif defined key_medusa
-      USE trc, ONLY :  &           ! MEDUSA variables
-         & trn
-      USE par_medusa
+      USE par_medusa               ! MEDUSA parameters
       USE sms_medusa, ONLY: &
          & xthetapn, &
@@ -902 +906 @@
 #endif
 #elif defined key_fabm
-      USE fabm
-      USE par_fabm
+      USE par_fabm                 ! FABM parameters
+      USE fabm, ONLY: &
+         & fabm_get_bulk_diagnostic_data
 #endif
 #if defined key_spm
-      USE par_spm, ONLY: &         ! ERSEM/SPM sediments
+      USE par_spm, ONLY: &         ! Sediment parameters
          & jp_spm
-      USE trc, ONLY :  &
-         & trn
 #endif
 
@@ -933 +936 @@
          & zgphi                   ! Model latitudes for prof variables
       LOGICAL :: llog10            ! Perform log10 transform of variable
-
+#if defined key_fabm
+      REAL(wp), POINTER, DIMENSION(:,:,:) :: &
+         & pco2_3d                 ! 3D pCO2 from FABM
+#endif
 
       IF(lwp) THEN