Changeset 13459 for branches/UKMO

Timestamp:

2020-09-11T12:55:28+02:00 (4 years 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:

• par_fabm.F90 (modified) (1 diff)
• trcini_fabm.F90 (modified) (1 diff)
• trcsms_fabm.F90 (modified) (5 diffs)

branches/UKMO/AMM15_v3_6_STABLE_package_collate_utils366_fabmv1/NEMOGCM/NEMO/TOP_SRC/FABM/par_fabm.F90

@@ -39 +39 @@
                       jp_fabm_r8c,   jp_fabm_r8p,  &
                       jp_fabm_r8s,   jp_fabm_xeps, &
+                      jp_fabm_swr,                 &
                       jp_fabm_pgrow, jp_fabm_ploss
 

branches/UKMO/AMM15_v3_6_STABLE_package_collate_utils366_fabmv1/NEMOGCM/NEMO/TOP_SRC/FABM/trcini_fabm.F90

@@ -134 +134 @@
       jp_fabm_o3pc  = fabm_diag_index( 'O3_pCO2' )
       jp_fabm_xeps  = fabm_diag_index( 'light_xEPS' )
+      jp_fabm_swr   = fabm_diag_index( 'light_swr_abs' )
       jp_fabm_pgrow = fabm_diag_index( 'p_grow_sum_result' )
       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

@@ -39 +39 @@
    USE lbclnk
    USE fabm_types, ONLY: standard_variables
+   USE par_fabm, ONLY: jp_fabm_swr
 
    !USE fldread         !  time interpolation
@@ -62 +63 @@
    REAL(wp), PUBLIC, TARGET, ALLOCATABLE, DIMENSION(:,:) :: taubot
    REAL(wp), PUBLIC, TARGET :: daynumber_in_year
-   REAL(wp), PUBLIC, POINTER :: swrad(:,:,:)  ! pointer to ERSEM spectral heating term
 
    ! State repair counters
@@ -312 +312 @@
 
       ! Retrieve 3D shortwave and store in etot3
-      IF (ln_qsr_spec) etot3(:,:,:) = swrad(:,:,:)
+      IF (ln_qsr_spec) THEN
+         etot3(:,:,:) = model%get_interior_diagnostic_data(jp_fabm_swr)
+      ENDIF
 
       ! Zero rate array of interface-attached state variables
@@ -578 +580 @@
       model%interior_diagnostic_variables(jp_fabm_pgrow)%save = .TRUE.
       model%interior_diagnostic_variables(jp_fabm_ploss)%save = .TRUE.
+      IF( ln_qsr_spec ) THEN
+         model%interior_diagnostic_variables(jp_fabm_swr)%save = .TRUE.
+      ENDIF
       DO jn=1,size(model%horizontal_diagnostic_variables)
          model%horizontal_diagnostic_variables(jn)%save = iom_use(model%horizontal_diagnostic_variables(jn)%name) &
@@ -588 +593 @@
 
       started = .TRUE.
-
-      IF( ln_qsr_spec ) THEN
-         ! Pointer to spectral heating term
-         swrad => model%get_data(model%get_interior_variable_id(standard_variables%net_rate_of_absorption_of_shortwave_energy_in_layer))
-      ENDIF
 
    END SUBROUTINE