Changeset 10547

Timestamp:

2019-01-18T15:42:27+01:00 (6 years ago)

Author:

dford

Message:

Allocate pCO2 array, and switch to preferred FABM interface.

File:

• branches/UKMO/dev_r5518_obs_oper_update_fabm_fix/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 (modified) (5 diffs)

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

@@ -908 +908 @@
       USE par_fabm                 ! FABM parameters
       USE fabm, ONLY: &
-         & fabm_get_bulk_diagnostic_data
+         & fabm_get_interior_diagnostic_data
 #endif
 #if defined key_spm
@@ -1176 +1176 @@
          CALL wrk_alloc( jpi, jpj, zsurfvar )
          CALL wrk_alloc( jpi, jpj, zsurfmask )
+#if defined key_fabm
+         CALL wrk_alloc( jpi, jpj, jpk, pco2_3d )
+#endif
 
          DO jtype = 1, nsurftypes
@@ -1418 +1421 @@
 #elif defined key_fabm
                ! First, get pCO2 from FABM
-               pco2_3d(:,:,:) = fabm_get_bulk_diagnostic_data(model, jp_fabm_o3pc)
+               pco2_3d(:,:,:) = fabm_get_interior_diagnostic_data(model, jp_fabm_o3pc)
                zsurfvar(:,:) = pco2_3d(:,:,1)
                ! Now, convert pCO2 to fCO2, based on SST in K. This follows the standard methodology of:
@@ -1457 +1460 @@
                zsurfvar(:,:) = f2_pco2w(:,:)
 #elif defined key_fabm
-               pco2_3d(:,:,:) = fabm_get_bulk_diagnostic_data(model, jp_fabm_o3pc)
+               pco2_3d(:,:,:) = fabm_get_interior_diagnostic_data(model, jp_fabm_o3pc)
                zsurfvar(:,:) = pco2_3d(:,:,1)
 #else
@@ -1491 +1494 @@
          CALL wrk_dealloc( jpi, jpj, zsurfvar )
          CALL wrk_dealloc( jpi, jpj, zsurfmask )
+#if defined key_fabm
+         CALL wrk_dealloc( jpi, jpj, jpk, pco2_3d )
+#endif
 
       ENDIF