Changeset 10666


Ignore:
Timestamp:
2019-02-13T11:45:33+01:00 (18 months ago)
Author:
dford
Message:

Reference FABM indices to jp_fabm_m1.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/dev_r5518_obs_oper_update_fabm_fix/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90

    r10623 r10666  
    996996#elif defined key_fabm 
    997997               ! Add all chlorophyll groups from ERSEM 
    998                zprofvar(:,:,:,1) = trn(:,:,:,jp_fabm_chl1) + trn(:,:,:,jp_fabm_chl2) + & 
    999                   &                trn(:,:,:,jp_fabm_chl3) + trn(:,:,:,jp_fabm_chl4) 
     998               zprofvar(:,:,:,1) = trn(:,:,:,jp_fabm_m1+jp_fabm_chl1) + trn(:,:,:,jp_fabm_m1+jp_fabm_chl2) + & 
     999                  &                trn(:,:,:,jp_fabm_m1+jp_fabm_chl3) + trn(:,:,:,jp_fabm_m1+jp_fabm_chl4) 
    10001000#else 
    10011001               CALL ctl_stop( ' Trying to run plchltot observation operator', & 
     
    10341034#elif defined key_fabm 
    10351035               ! Add all chlorophyll groups from ERSEM 
    1036                zprofvar(:,:,:,1) = trn(:,:,:,jp_fabm_chl1) + trn(:,:,:,jp_fabm_chl2) + & 
    1037                   &                trn(:,:,:,jp_fabm_chl3) + trn(:,:,:,jp_fabm_chl4) 
     1036               zprofvar(:,:,:,1) = trn(:,:,:,jp_fabm_m1+jp_fabm_chl1) + trn(:,:,:,jp_fabm_m1+jp_fabm_chl2) + & 
     1037                  &                trn(:,:,:,jp_fabm_m1+jp_fabm_chl3) + trn(:,:,:,jp_fabm_m1+jp_fabm_chl4) 
    10381038#else 
    10391039               CALL ctl_stop( ' Trying to run pchltot observation operator', & 
     
    10501050#elif defined key_fabm 
    10511051               ! Nitrate from ERSEM 
    1052                zprofvar(:,:,:,1) = trn(:,:,:,jp_fabm_n3n) 
     1052               zprofvar(:,:,:,1) = trn(:,:,:,jp_fabm_m1+jp_fabm_n3n) 
    10531053#else 
    10541054               CALL ctl_stop( ' Trying to run pno3 observation operator', & 
     
    10651065#elif defined key_fabm 
    10661066               ! Silicate from ERSEM 
    1067                zprofvar(:,:,:,1) = trn(:,:,:,jp_fabm_n5s) 
     1067               zprofvar(:,:,:,1) = trn(:,:,:,jp_fabm_m1+jp_fabm_n5s) 
    10681068#else 
    10691069               CALL ctl_stop( ' Trying to run psi4 observation operator', & 
     
    10801080#elif defined key_fabm 
    10811081               ! Phosphate from ERSEM 
    1082                zprofvar(:,:,:,1) = trn(:,:,:,jp_fabm_n1p) 
     1082               zprofvar(:,:,:,1) = trn(:,:,:,jp_fabm_m1+jp_fabm_n1p) 
    10831083#else 
    10841084               CALL ctl_stop( ' Trying to run ppo4 observation operator', & 
     
    10951095#elif defined key_fabm 
    10961096               ! Dissolved inorganic carbon from ERSEM 
    1097                zprofvar(:,:,:,1) = trn(:,:,:,jp_fabm_o3c) 
     1097               zprofvar(:,:,:,1) = trn(:,:,:,jp_fabm_m1+jp_fabm_o3c) 
    10981098#else 
    10991099               CALL ctl_stop( ' Trying to run pdic observation operator', & 
     
    11251125#elif defined key_fabm 
    11261126               ! pH from ERSEM 
    1127                zprofvar(:,:,:,1) = trn(:,:,:,jp_fabm_o3ph) 
     1127               zprofvar(:,:,:,1) = trn(:,:,:,jp_fabm_m1+jp_fabm_o3ph) 
    11281128#else 
    11291129               CALL ctl_stop( ' Trying to run pph observation operator', & 
     
    11401140#elif defined key_fabm 
    11411141               ! Oxygen from ERSEM 
    1142                zprofvar(:,:,:,1) = trn(:,:,:,jp_fabm_o2o) 
     1142               zprofvar(:,:,:,1) = trn(:,:,:,jp_fabm_m1+jp_fabm_o2o) 
    11431143#else 
    11441144               CALL ctl_stop( ' Trying to run po2 observation operator', & 
     
    12241224#elif defined key_fabm 
    12251225               ! Add all surface chlorophyll groups from ERSEM 
    1226                zsurfvar(:,:) = trn(:,:,1,jp_fabm_chl1) + trn(:,:,1,jp_fabm_chl2) + & 
    1227                   &            trn(:,:,1,jp_fabm_chl3) + trn(:,:,1,jp_fabm_chl4) 
     1226               zsurfvar(:,:) = trn(:,:,1,jp_fabm_m1+jp_fabm_chl1) + trn(:,:,1,jp_fabm_m1+jp_fabm_chl2) + & 
     1227                  &            trn(:,:,1,jp_fabm_m1+jp_fabm_chl3) + trn(:,:,1,jp_fabm_m1+jp_fabm_chl4) 
    12281228#else 
    12291229               CALL ctl_stop( ' Trying to run slchltot observation operator', & 
     
    12411241#elif defined key_fabm 
    12421242               ! Diatom surface chlorophyll from ERSEM 
    1243                zsurfvar(:,:) = trn(:,:,1,jp_fabm_chl1) 
     1243               zsurfvar(:,:) = trn(:,:,1,jp_fabm_m1+jp_fabm_chl1) 
    12441244#else 
    12451245               CALL ctl_stop( ' Trying to run slchldia observation operator', & 
     
    12571257#elif defined key_fabm 
    12581258               ! Add all non-diatom surface chlorophyll groups from ERSEM 
    1259                zsurfvar(:,:) = trn(:,:,1,jp_fabm_chl2) + & 
    1260                   &            trn(:,:,1,jp_fabm_chl3) + trn(:,:,1,jp_fabm_chl4) 
     1259               zsurfvar(:,:) = trn(:,:,1,jp_fabm_m1+jp_fabm_chl2) + & 
     1260                  &            trn(:,:,1,jp_fabm_m1+jp_fabm_chl3) + trn(:,:,1,jp_fabm_m1+jp_fabm_chl4) 
    12611261#else 
    12621262               CALL ctl_stop( ' Trying to run slchlnon observation operator', & 
     
    12741274#elif defined key_fabm 
    12751275               ! Dinoflagellate surface chlorophyll from ERSEM 
    1276                zsurfvar(:,:) = trn(:,:,1,jp_fabm_chl4) 
     1276               zsurfvar(:,:) = trn(:,:,1,jp_fabm_m1+jp_fabm_chl4) 
    12771277#else 
    12781278               CALL ctl_stop( ' Trying to run slchldin observation operator', & 
     
    12901290#elif defined key_fabm 
    12911291               ! Add diatom and dinoflagellate surface chlorophyll from ERSEM 
    1292                zsurfvar(:,:) = trn(:,:,1,jp_fabm_chl1) + trn(:,:,1,jp_fabm_chl4) 
     1292               zsurfvar(:,:) = trn(:,:,1,jp_fabm_m1+jp_fabm_chl1) + trn(:,:,1,jp_fabm_m1+jp_fabm_chl4) 
    12931293#else 
    12941294               CALL ctl_stop( ' Trying to run slchlmic observation operator', & 
     
    13061306#elif defined key_fabm 
    13071307               ! Nanophytoplankton surface chlorophyll from ERSEM 
    1308                zsurfvar(:,:) = trn(:,:,1,jp_fabm_chl2) 
     1308               zsurfvar(:,:) = trn(:,:,1,jp_fabm_m1+jp_fabm_chl2) 
    13091309#else 
    13101310               CALL ctl_stop( ' Trying to run slchlnan observation operator', & 
     
    13221322#elif defined key_fabm 
    13231323               ! Picophytoplankton surface chlorophyll from ERSEM 
    1324                zsurfvar(:,:) = trn(:,:,1,jp_fabm_chl3) 
     1324               zsurfvar(:,:) = trn(:,:,1,jp_fabm_m1+jp_fabm_chl3) 
    13251325#else 
    13261326               CALL ctl_stop( ' Trying to run slchlpic observation operator', & 
     
    13381338#elif defined key_fabm 
    13391339               ! Add all surface chlorophyll groups from ERSEM 
    1340                zsurfvar(:,:) = trn(:,:,1,jp_fabm_chl1) + trn(:,:,1,jp_fabm_chl2) + & 
    1341                   &            trn(:,:,1,jp_fabm_chl3) + trn(:,:,1,jp_fabm_chl4) 
     1340               zsurfvar(:,:) = trn(:,:,1,jp_fabm_m1+jp_fabm_chl1) + trn(:,:,1,jp_fabm_m1+jp_fabm_chl2) + & 
     1341                  &            trn(:,:,1,jp_fabm_m1+jp_fabm_chl3) + trn(:,:,1,jp_fabm_m1+jp_fabm_chl4) 
    13421342#else 
    13431343               CALL ctl_stop( ' Trying to run schltot observation operator', & 
     
    13551355#elif defined key_fabm 
    13561356               ! Add all surface phytoplankton carbon groups from ERSEM 
    1357                zsurfvar(:,:) = trn(:,:,1,jp_fabm_p1c) + trn(:,:,1,jp_fabm_p2c) + & 
    1358                   &            trn(:,:,1,jp_fabm_p3c) + trn(:,:,1,jp_fabm_p4c) 
     1357               zsurfvar(:,:) = trn(:,:,1,jp_fabm_m1+jp_fabm_p1c) + trn(:,:,1,jp_fabm_m1+jp_fabm_p2c) + & 
     1358                  &            trn(:,:,1,jp_fabm_m1+jp_fabm_p3c) + trn(:,:,1,jp_fabm_m1+jp_fabm_p4c) 
    13591359#else 
    13601360               CALL ctl_stop( ' Trying to run slphytot observation operator', & 
     
    13721372#elif defined key_fabm 
    13731373               ! Diatom surface phytoplankton carbon from ERSEM 
    1374                zsurfvar(:,:) = trn(:,:,1,jp_fabm_p1c) 
     1374               zsurfvar(:,:) = trn(:,:,1,jp_fabm_m1+jp_fabm_p1c) 
    13751375#else 
    13761376               CALL ctl_stop( ' Trying to run slphydia observation operator', & 
     
    13881388#elif defined key_fabm 
    13891389               ! Add all non-diatom surface phytoplankton carbon groups from ERSEM 
    1390                zsurfvar(:,:) = trn(:,:,1,jp_fabm_p2c) + & 
    1391                   &            trn(:,:,1,jp_fabm_p3c) + trn(:,:,1,jp_fabm_p4c) 
     1390               zsurfvar(:,:) = trn(:,:,1,jp_fabm_m1+jp_fabm_p2c) + & 
     1391                  &            trn(:,:,1,jp_fabm_m1+jp_fabm_p3c) + trn(:,:,1,jp_fabm_m1+jp_fabm_p4c) 
    13921392#else 
    13931393               CALL ctl_stop( ' Trying to run slphynon observation operator', & 
Note: See TracChangeset for help on using the changeset viewer.