Changeset 13240 for branches/UKMO

Timestamp:

2020-07-03T14:18:57+02:00 (4 years ago)

Author:

dford

Message:

Update FABM syntax for v1.0, and fix bug where ERSEM pH was being taken from the wrong place.

File:

• branches/UKMO/dev_r5518_obs_oper_update_utils366_fabmv1/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 (modified) (6 diffs)

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

@@ -1070 +1070 @@
 #elif defined key_fabm
       USE par_fabm                 ! FABM parameters
-      USE fabm, ONLY: &
-         & fabm_get_interior_diagnostic_data
 #endif
 #if defined key_spm
@@ -1282 +1280 @@
 #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', &
@@ -1297 +1295 @@
 #elif defined key_fabm
                ! pH from ERSEM
-               zprofvar(:,:,:,1) = trn(:,:,:,jp_fabm_m1+jp_fabm_o3ph)
+               zprofvar(:,:,:,1) = model%get_interior_diagnostic_data(jp_fabm_o3ph)
 #else
                CALL ctl_stop( ' Trying to run pph observation operator', &
@@ -1610 +1608 @@
 #elif defined key_fabm
                ! light_xEPS diagnostic variable
-               fabm_3d(:,:,:) = fabm_get_interior_diagnostic_data(model, jp_fabm_xeps)
+               fabm_3d(:,:,:) = model%get_interior_diagnostic_data(jp_fabm_xeps)
                zsurfvar(:,:) = fabm_3d(:,:,1)
 #else
@@ -1631 +1629 @@
 #elif defined key_fabm
                ! First, get pCO2 from FABM
-               fabm_3d(:,:,:) = fabm_get_interior_diagnostic_data(model, jp_fabm_o3pc)
+               fabm_3d(:,:,:) = model%get_interior_diagnostic_data(jp_fabm_o3pc)
                zsurfvar(:,:) = fabm_3d(:,:,1)
                ! Now, convert pCO2 to fCO2, based on SST in K. This follows the standard methodology of:
@@ -1670 +1668 @@
                zsurfvar(:,:) = f2_pco2w(:,:)
 #elif defined key_fabm
-               fabm_3d(:,:,:) = fabm_get_interior_diagnostic_data(model, jp_fabm_o3pc)
+               fabm_3d(:,:,:) = model%get_interior_diagnostic_data(jp_fabm_o3pc)
                zsurfvar(:,:) = fabm_3d(:,:,1)
 #else