Changeset 13459


Ignore:
Timestamp:
2020-09-11T12:55:28+02:00 (4 months ago)
Author:
dford
Message:

Fix for getting SWR.

Location:
branches/UKMO/AMM15_v3_6_STABLE_package_collate_utils366_fabmv1/NEMOGCM/NEMO/TOP_SRC/FABM
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/AMM15_v3_6_STABLE_package_collate_utils366_fabmv1/NEMOGCM/NEMO/TOP_SRC/FABM/par_fabm.F90

    r13241 r13459  
    3939                      jp_fabm_r8c,   jp_fabm_r8p,  & 
    4040                      jp_fabm_r8s,   jp_fabm_xeps, & 
     41                      jp_fabm_swr,                 & 
    4142                      jp_fabm_pgrow, jp_fabm_ploss 
    4243 
  • branches/UKMO/AMM15_v3_6_STABLE_package_collate_utils366_fabmv1/NEMOGCM/NEMO/TOP_SRC/FABM/trcini_fabm.F90

    r13451 r13459  
    134134      jp_fabm_o3pc  = fabm_diag_index( 'O3_pCO2' ) 
    135135      jp_fabm_xeps  = fabm_diag_index( 'light_xEPS' ) 
     136      jp_fabm_swr   = fabm_diag_index( 'light_swr_abs' ) 
    136137      jp_fabm_pgrow = fabm_diag_index( 'p_grow_sum_result' ) 
    137138      jp_fabm_ploss = fabm_diag_index( 'p_loss_sum_result' ) 
  • branches/UKMO/AMM15_v3_6_STABLE_package_collate_utils366_fabmv1/NEMOGCM/NEMO/TOP_SRC/FABM/trcsms_fabm.F90

    r13451 r13459  
    3939   USE lbclnk 
    4040   USE fabm_types, ONLY: standard_variables 
     41   USE par_fabm, ONLY: jp_fabm_swr 
    4142 
    4243   !USE fldread         !  time interpolation 
     
    6263   REAL(wp), PUBLIC, TARGET, ALLOCATABLE, DIMENSION(:,:) :: taubot 
    6364   REAL(wp), PUBLIC, TARGET :: daynumber_in_year 
    64    REAL(wp), PUBLIC, POINTER :: swrad(:,:,:)  ! pointer to ERSEM spectral heating term 
    6565 
    6666   ! State repair counters 
     
    312312 
    313313      ! Retrieve 3D shortwave and store in etot3 
    314       IF (ln_qsr_spec) etot3(:,:,:) = swrad(:,:,:) 
     314      IF (ln_qsr_spec) THEN 
     315         etot3(:,:,:) = model%get_interior_diagnostic_data(jp_fabm_swr) 
     316      ENDIF 
    315317 
    316318      ! Zero rate array of interface-attached state variables 
     
    578580      model%interior_diagnostic_variables(jp_fabm_pgrow)%save = .TRUE. 
    579581      model%interior_diagnostic_variables(jp_fabm_ploss)%save = .TRUE. 
     582      IF( ln_qsr_spec ) THEN 
     583         model%interior_diagnostic_variables(jp_fabm_swr)%save = .TRUE. 
     584      ENDIF 
    580585      DO jn=1,size(model%horizontal_diagnostic_variables) 
    581586         model%horizontal_diagnostic_variables(jn)%save = iom_use(model%horizontal_diagnostic_variables(jn)%name) & 
     
    588593 
    589594      started = .TRUE. 
    590  
    591       IF( ln_qsr_spec ) THEN 
    592          ! Pointer to spectral heating term 
    593          swrad => model%get_data(model%get_interior_variable_id(standard_variables%net_rate_of_absorption_of_shortwave_energy_in_layer)) 
    594       ENDIF 
    595595 
    596596   END SUBROUTINE 
Note: See TracChangeset for help on using the changeset viewer.