Changeset 15509

Timestamp:

2021-11-15T15:36:22+01:00 (2 years ago)

Author:

jcastill

Message:

Updates for FABM 1.0

File:

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

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

@@ -907 +907 @@
 #elif defined key_fabm
       USE par_fabm                 ! FABM parameters
-      USE fabm, ONLY: &
-         & fabm_get_interior_diagnostic_data
 #endif
 #if defined key_spm
@@ -1110 +1108 @@
 #elif defined key_fabm
                ! Alkalinity from ERSEM
-               zprofvar(:,:,:,1) = fabm_get_interior_diagnostic_data(model, jp_fabm_o3ta)
+               zprofvar(:,:,:,1) = model%get_interior_diagnostic_data(jp_fabm_o3ta)
 #else
                CALL ctl_stop( ' Trying to run palk observation operator', &
@@ -1421 +1419 @@
 #elif defined key_fabm
                ! First, get pCO2 from FABM
-               pco2_3d(:,:,:) = fabm_get_interior_diagnostic_data(model, jp_fabm_o3pc)
+               pco2_3d(:,:,:) = model%get_interior_diagnostic_data(jp_fabm_o3pc)
                zsurfvar(:,:) = pco2_3d(:,:,1)
                ! Now, convert pCO2 to fCO2, based on SST in K. This follows the standard methodology of:
@@ -1460 +1458 @@
                zsurfvar(:,:) = f2_pco2w(:,:)
 #elif defined key_fabm
-               pco2_3d(:,:,:) = fabm_get_interior_diagnostic_data(model, jp_fabm_o3pc)
+               pco2_3d(:,:,:) = model%get_interior_diagnostic_data(jp_fabm_o3pc)
                zsurfvar(:,:) = pco2_3d(:,:,1)
 #else