New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 13487 for branches/UKMO/dev_r5518_obs_oper_update_utils366_fabmv1_v2/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 – NEMO

Ignore:
Timestamp:
2020-09-17T19:09:49+02:00 (4 years ago)
Author:
dford
Message:

Merge in previous branch.

File:
1 edited

Legend:

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

    r13393 r13487  
    11291129#elif defined key_fabm 
    11301130      USE par_fabm                 ! FABM parameters 
    1131       USE fabm, ONLY: & 
    1132          & fabm_get_interior_diagnostic_data 
    11331131#endif 
    11341132#if defined key_spm 
     
    13411339#elif defined key_fabm 
    13421340               ! Alkalinity from ERSEM 
    1343                zprofvar(:,:,:,1) = fabm_get_interior_diagnostic_data(model, jp_fabm_o3ta) 
     1341               zprofvar(:,:,:,1) = model%get_interior_diagnostic_data(jp_fabm_o3ta) 
    13441342#else 
    13451343               CALL ctl_stop( ' Trying to run palk observation operator', & 
     
    13561354#elif defined key_fabm 
    13571355               ! pH from ERSEM 
    1358                zprofvar(:,:,:,1) = trn(:,:,:,jp_fabm_m1+jp_fabm_o3ph) 
     1356               zprofvar(:,:,:,1) = model%get_interior_diagnostic_data(jp_fabm_o3ph) 
    13591357#else 
    13601358               CALL ctl_stop( ' Trying to run pph observation operator', & 
     
    16851683#elif defined key_fabm 
    16861684               ! light_xEPS diagnostic variable 
    1687                fabm_3d(:,:,:) = fabm_get_interior_diagnostic_data(model, jp_fabm_xeps) 
     1685               fabm_3d(:,:,:) = model%get_interior_diagnostic_data(jp_fabm_xeps) 
    16881686               zsurfvar(:,:,1) = fabm_3d(:,:,1) 
    16891687#else 
     
    17061704#elif defined key_fabm 
    17071705               ! First, get pCO2 from FABM 
    1708                fabm_3d(:,:,:) = fabm_get_interior_diagnostic_data(model, jp_fabm_o3pc) 
     1706               fabm_3d(:,:,:) = model%get_interior_diagnostic_data(jp_fabm_o3pc) 
    17091707               zsurfvar(:,:,1) = fabm_3d(:,:,1) 
    17101708               ! Now, convert pCO2 to fCO2, based on SST in K. This follows the standard methodology of: 
     
    17451743               zsurfvar(:,:,1) = f2_pco2w(:,:) 
    17461744#elif defined key_fabm 
    1747                fabm_3d(:,:,:) = fabm_get_interior_diagnostic_data(model, jp_fabm_o3pc) 
     1745               fabm_3d(:,:,:) = model%get_interior_diagnostic_data(jp_fabm_o3pc) 
    17481746               zsurfvar(:,:,1) = fabm_3d(:,:,1) 
    17491747#else 
Note: See TracChangeset for help on using the changeset viewer.