Changeset 13487 for branches/UKMO

Timestamp:

2020-09-17T19:09:49+02:00 (4 years ago)

Author:

dford

Message:

Merge in previous branch.

Location:

branches/UKMO/dev_r5518_obs_oper_update_utils366_fabmv1_v2/NEMOGCM/NEMO/OPA_SRC/OBS

Files:

• diaobs.F90 (modified) (6 diffs)
• obs_write.F90 (modified) (3 diffs)

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

@@ -1129 +1129 @@
 #elif defined key_fabm
       USE par_fabm                 ! FABM parameters
-      USE fabm, ONLY: &
-         & fabm_get_interior_diagnostic_data
 #endif
 #if defined key_spm
@@ -1341 +1339 @@
 #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', &
@@ -1356 +1354 @@
 #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', &
@@ -1685 +1683 @@
 #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(:,:,1) = fabm_3d(:,:,1)
 #else
@@ -1706 +1704 @@
 #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(:,:,1) = fabm_3d(:,:,1)
                ! Now, convert pCO2 to fCO2, based on SST in K. This follows the standard methodology of:
@@ -1745 +1743 @@
                zsurfvar(:,:,1) = 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(:,:,1) = fabm_3d(:,:,1)
 #else

branches/UKMO/dev_r5518_obs_oper_update_utils366_fabmv1_v2/NEMOGCM/NEMO/OPA_SRC/OBS/obs_write.F90

@@ -349 +349 @@
                   fbdata%ivlqc(ik,jo,jvar) = IBSET(profdata%var(jvar)%nvqc(jk),2)
                   fbdata%ivlqcf(1,ik,jo,jvar) = profdata%var(jvar)%nvqcf(1,jk)
-                  fbdata%ivlqcf(2,ik,jo,jvar) = IAND(profdata%var(jvar)%nvqc(jk),b'0000 0000 1111 1111')
+                  fbdata%ivlqcf(2,ik,jo,jvar) = IAND(profdata%var(jvar)%nvqc(jk),b'0000000011111111')
                ELSE
                   fbdata%ivlqc(ik,jo,jvar) = profdata%var(jvar)%nvqc(jk)
@@ -743 +743 @@
             fbdata%ioqc(jo)    = 4
             fbdata%ioqcf(1,jo) = 0
-            fbdata%ioqcf(2,jo) = IAND(surfdata%nqc(jo),b'0000 0000 1111 1111')
+            fbdata%ioqcf(2,jo) = IAND(surfdata%nqc(jo),b'0000000011111111')
          ELSE
             fbdata%ioqc(jo)    = surfdata%nqc(jo)
@@ -784 +784 @@
                fbdata%ivlqc(1,jo,jv)    = 4
                fbdata%ivlqcf(1,1,jo,jv) = 0
-               fbdata%ivlqcf(2,1,jo,jv) = IAND(surfdata%nqc(jo),b'0000 0000 1111 1111')
+               fbdata%ivlqcf(2,1,jo,jv) = IAND(surfdata%nqc(jo),b'0000000011111111')
             ELSE
                fbdata%ivqc(jo,jv)       = surfdata%nqc(jo)