Changeset 10666 for branches/UKMO

Timestamp:

2019-02-13T11:45:33+01:00 (5 years ago)

Author:

dford

Message:

Reference FABM indices to jp_fabm_m1.

File:

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

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

@@ -996 +996 @@
 #elif defined key_fabm
                ! Add all chlorophyll groups from ERSEM
-               zprofvar(:,:,:,1) = trn(:,:,:,jp_fabm_chl1) + trn(:,:,:,jp_fabm_chl2) + &
-                  &                trn(:,:,:,jp_fabm_chl3) + trn(:,:,:,jp_fabm_chl4)
+               zprofvar(:,:,:,1) = trn(:,:,:,jp_fabm_m1+jp_fabm_chl1) + trn(:,:,:,jp_fabm_m1+jp_fabm_chl2) + &
+                  &                trn(:,:,:,jp_fabm_m1+jp_fabm_chl3) + trn(:,:,:,jp_fabm_m1+jp_fabm_chl4)
 #else
                CALL ctl_stop( ' Trying to run plchltot observation operator', &
@@ -1034 +1034 @@
 #elif defined key_fabm
                ! Add all chlorophyll groups from ERSEM
-               zprofvar(:,:,:,1) = trn(:,:,:,jp_fabm_chl1) + trn(:,:,:,jp_fabm_chl2) + &
-                  &                trn(:,:,:,jp_fabm_chl3) + trn(:,:,:,jp_fabm_chl4)
+               zprofvar(:,:,:,1) = trn(:,:,:,jp_fabm_m1+jp_fabm_chl1) + trn(:,:,:,jp_fabm_m1+jp_fabm_chl2) + &
+                  &                trn(:,:,:,jp_fabm_m1+jp_fabm_chl3) + trn(:,:,:,jp_fabm_m1+jp_fabm_chl4)
 #else
                CALL ctl_stop( ' Trying to run pchltot observation operator', &
@@ -1050 +1050 @@
 #elif defined key_fabm
                ! Nitrate from ERSEM
-               zprofvar(:,:,:,1) = trn(:,:,:,jp_fabm_n3n)
+               zprofvar(:,:,:,1) = trn(:,:,:,jp_fabm_m1+jp_fabm_n3n)
 #else
                CALL ctl_stop( ' Trying to run pno3 observation operator', &
@@ -1065 +1065 @@
 #elif defined key_fabm
                ! Silicate from ERSEM
-               zprofvar(:,:,:,1) = trn(:,:,:,jp_fabm_n5s)
+               zprofvar(:,:,:,1) = trn(:,:,:,jp_fabm_m1+jp_fabm_n5s)
 #else
                CALL ctl_stop( ' Trying to run psi4 observation operator', &
@@ -1080 +1080 @@
 #elif defined key_fabm
                ! Phosphate from ERSEM
-               zprofvar(:,:,:,1) = trn(:,:,:,jp_fabm_n1p)
+               zprofvar(:,:,:,1) = trn(:,:,:,jp_fabm_m1+jp_fabm_n1p)
 #else
                CALL ctl_stop( ' Trying to run ppo4 observation operator', &
@@ -1095 +1095 @@
 #elif defined key_fabm
                ! Dissolved inorganic carbon from ERSEM
-               zprofvar(:,:,:,1) = trn(:,:,:,jp_fabm_o3c)
+               zprofvar(:,:,:,1) = trn(:,:,:,jp_fabm_m1+jp_fabm_o3c)
 #else
                CALL ctl_stop( ' Trying to run pdic observation operator', &
@@ -1125 +1125 @@
 #elif defined key_fabm
                ! pH from ERSEM
-               zprofvar(:,:,:,1) = trn(:,:,:,jp_fabm_o3ph)
+               zprofvar(:,:,:,1) = trn(:,:,:,jp_fabm_m1+jp_fabm_o3ph)
 #else
                CALL ctl_stop( ' Trying to run pph observation operator', &
@@ -1140 +1140 @@
 #elif defined key_fabm
                ! Oxygen from ERSEM
-               zprofvar(:,:,:,1) = trn(:,:,:,jp_fabm_o2o)
+               zprofvar(:,:,:,1) = trn(:,:,:,jp_fabm_m1+jp_fabm_o2o)
 #else
                CALL ctl_stop( ' Trying to run po2 observation operator', &
@@ -1224 +1224 @@
 #elif defined key_fabm
                ! Add all surface chlorophyll groups from ERSEM
-               zsurfvar(:,:) = trn(:,:,1,jp_fabm_chl1) + trn(:,:,1,jp_fabm_chl2) + &
-                  &            trn(:,:,1,jp_fabm_chl3) + trn(:,:,1,jp_fabm_chl4)
+               zsurfvar(:,:) = trn(:,:,1,jp_fabm_m1+jp_fabm_chl1) + trn(:,:,1,jp_fabm_m1+jp_fabm_chl2) + &
+                  &            trn(:,:,1,jp_fabm_m1+jp_fabm_chl3) + trn(:,:,1,jp_fabm_m1+jp_fabm_chl4)
 #else
                CALL ctl_stop( ' Trying to run slchltot observation operator', &
@@ -1241 +1241 @@
 #elif defined key_fabm
                ! Diatom surface chlorophyll from ERSEM
-               zsurfvar(:,:) = trn(:,:,1,jp_fabm_chl1)
+               zsurfvar(:,:) = trn(:,:,1,jp_fabm_m1+jp_fabm_chl1)
 #else
                CALL ctl_stop( ' Trying to run slchldia observation operator', &
@@ -1257 +1257 @@
 #elif defined key_fabm
                ! Add all non-diatom surface chlorophyll groups from ERSEM
-               zsurfvar(:,:) = trn(:,:,1,jp_fabm_chl2) + &
-                  &            trn(:,:,1,jp_fabm_chl3) + trn(:,:,1,jp_fabm_chl4)
+               zsurfvar(:,:) = trn(:,:,1,jp_fabm_m1+jp_fabm_chl2) + &
+                  &            trn(:,:,1,jp_fabm_m1+jp_fabm_chl3) + trn(:,:,1,jp_fabm_m1+jp_fabm_chl4)
 #else
                CALL ctl_stop( ' Trying to run slchlnon observation operator', &
@@ -1274 +1274 @@
 #elif defined key_fabm
                ! Dinoflagellate surface chlorophyll from ERSEM
-               zsurfvar(:,:) = trn(:,:,1,jp_fabm_chl4)
+               zsurfvar(:,:) = trn(:,:,1,jp_fabm_m1+jp_fabm_chl4)
 #else
                CALL ctl_stop( ' Trying to run slchldin observation operator', &
@@ -1290 +1290 @@
 #elif defined key_fabm
                ! Add diatom and dinoflagellate surface chlorophyll from ERSEM
-               zsurfvar(:,:) = trn(:,:,1,jp_fabm_chl1) + trn(:,:,1,jp_fabm_chl4)
+               zsurfvar(:,:) = trn(:,:,1,jp_fabm_m1+jp_fabm_chl1) + trn(:,:,1,jp_fabm_m1+jp_fabm_chl4)
 #else
                CALL ctl_stop( ' Trying to run slchlmic observation operator', &
@@ -1306 +1306 @@
 #elif defined key_fabm
                ! Nanophytoplankton surface chlorophyll from ERSEM
-               zsurfvar(:,:) = trn(:,:,1,jp_fabm_chl2)
+               zsurfvar(:,:) = trn(:,:,1,jp_fabm_m1+jp_fabm_chl2)
 #else
                CALL ctl_stop( ' Trying to run slchlnan observation operator', &
@@ -1322 +1322 @@
 #elif defined key_fabm
                ! Picophytoplankton surface chlorophyll from ERSEM
-               zsurfvar(:,:) = trn(:,:,1,jp_fabm_chl3)
+               zsurfvar(:,:) = trn(:,:,1,jp_fabm_m1+jp_fabm_chl3)
 #else
                CALL ctl_stop( ' Trying to run slchlpic observation operator', &
@@ -1338 +1338 @@
 #elif defined key_fabm
                ! Add all surface chlorophyll groups from ERSEM
-               zsurfvar(:,:) = trn(:,:,1,jp_fabm_chl1) + trn(:,:,1,jp_fabm_chl2) + &
-                  &            trn(:,:,1,jp_fabm_chl3) + trn(:,:,1,jp_fabm_chl4)
+               zsurfvar(:,:) = trn(:,:,1,jp_fabm_m1+jp_fabm_chl1) + trn(:,:,1,jp_fabm_m1+jp_fabm_chl2) + &
+                  &            trn(:,:,1,jp_fabm_m1+jp_fabm_chl3) + trn(:,:,1,jp_fabm_m1+jp_fabm_chl4)
 #else
                CALL ctl_stop( ' Trying to run schltot observation operator', &
@@ -1355 +1355 @@
 #elif defined key_fabm
                ! Add all surface phytoplankton carbon groups from ERSEM
-               zsurfvar(:,:) = trn(:,:,1,jp_fabm_p1c) + trn(:,:,1,jp_fabm_p2c) + &
-                  &            trn(:,:,1,jp_fabm_p3c) + trn(:,:,1,jp_fabm_p4c)
+               zsurfvar(:,:) = trn(:,:,1,jp_fabm_m1+jp_fabm_p1c) + trn(:,:,1,jp_fabm_m1+jp_fabm_p2c) + &
+                  &            trn(:,:,1,jp_fabm_m1+jp_fabm_p3c) + trn(:,:,1,jp_fabm_m1+jp_fabm_p4c)
 #else
                CALL ctl_stop( ' Trying to run slphytot observation operator', &
@@ -1372 +1372 @@
 #elif defined key_fabm
                ! Diatom surface phytoplankton carbon from ERSEM
-               zsurfvar(:,:) = trn(:,:,1,jp_fabm_p1c)
+               zsurfvar(:,:) = trn(:,:,1,jp_fabm_m1+jp_fabm_p1c)
 #else
                CALL ctl_stop( ' Trying to run slphydia observation operator', &
@@ -1388 +1388 @@
 #elif defined key_fabm
                ! Add all non-diatom surface phytoplankton carbon groups from ERSEM
-               zsurfvar(:,:) = trn(:,:,1,jp_fabm_p2c) + &
-                  &            trn(:,:,1,jp_fabm_p3c) + trn(:,:,1,jp_fabm_p4c)
+               zsurfvar(:,:) = trn(:,:,1,jp_fabm_m1+jp_fabm_p2c) + &
+                  &            trn(:,:,1,jp_fabm_m1+jp_fabm_p3c) + trn(:,:,1,jp_fabm_m1+jp_fabm_p4c)
 #else
                CALL ctl_stop( ' Trying to run slphynon observation operator', &