Changeset 13240


Ignore:
Timestamp:
2020-07-03T14:18:57+02:00 (5 weeks ago)
Author:
dford
Message:

Update FABM syntax for v1.0, and fix bug where ERSEM pH was being taken from the wrong place.

File:
1 edited

Legend:

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

    r12610 r13240  
    10701070#elif defined key_fabm 
    10711071      USE par_fabm                 ! FABM parameters 
    1072       USE fabm, ONLY: & 
    1073          & fabm_get_interior_diagnostic_data 
    10741072#endif 
    10751073#if defined key_spm 
     
    12821280#elif defined key_fabm 
    12831281               ! Alkalinity from ERSEM 
    1284                zprofvar(:,:,:,1) = fabm_get_interior_diagnostic_data(model, jp_fabm_o3ta) 
     1282               zprofvar(:,:,:,1) = model%get_interior_diagnostic_data(jp_fabm_o3ta) 
    12851283#else 
    12861284               CALL ctl_stop( ' Trying to run palk observation operator', & 
     
    12971295#elif defined key_fabm 
    12981296               ! pH from ERSEM 
    1299                zprofvar(:,:,:,1) = trn(:,:,:,jp_fabm_m1+jp_fabm_o3ph) 
     1297               zprofvar(:,:,:,1) = model%get_interior_diagnostic_data(jp_fabm_o3ph) 
    13001298#else 
    13011299               CALL ctl_stop( ' Trying to run pph observation operator', & 
     
    16101608#elif defined key_fabm 
    16111609               ! light_xEPS diagnostic variable 
    1612                fabm_3d(:,:,:) = fabm_get_interior_diagnostic_data(model, jp_fabm_xeps) 
     1610               fabm_3d(:,:,:) = model%get_interior_diagnostic_data(jp_fabm_xeps) 
    16131611               zsurfvar(:,:) = fabm_3d(:,:,1) 
    16141612#else 
     
    16311629#elif defined key_fabm 
    16321630               ! First, get pCO2 from FABM 
    1633                fabm_3d(:,:,:) = fabm_get_interior_diagnostic_data(model, jp_fabm_o3pc) 
     1631               fabm_3d(:,:,:) = model%get_interior_diagnostic_data(jp_fabm_o3pc) 
    16341632               zsurfvar(:,:) = fabm_3d(:,:,1) 
    16351633               ! Now, convert pCO2 to fCO2, based on SST in K. This follows the standard methodology of: 
     
    16701668               zsurfvar(:,:) = f2_pco2w(:,:) 
    16711669#elif defined key_fabm 
    1672                fabm_3d(:,:,:) = fabm_get_interior_diagnostic_data(model, jp_fabm_o3pc) 
     1670               fabm_3d(:,:,:) = model%get_interior_diagnostic_data(jp_fabm_o3pc) 
    16731671               zsurfvar(:,:) = fabm_3d(:,:,1) 
    16741672#else 
Note: See TracChangeset for help on using the changeset viewer.