Changeset 11500 for NEMO

Timestamp:

2019-09-04T15:49:41+02:00 (5 years ago)

Author:

timgraham

Message:

In sbc_cpl_ice_flx add IF blocks so that code is only called on timesteps when coupling occurs.

File:

• NEMO/branches/UKMO/NEMO_4.0_GC_couple_pkg_cons_checks/src/OCE/SBC/sbccpl.F90 (modified) (7 diffs)

NEMO/branches/UKMO/NEMO_4.0_GC_couple_pkg_cons_checks/src/OCE/SBC/sbccpl.F90

@@ -1666 +1666 @@
       !
       INTEGER  ::   ji, jj, jl   ! dummy loop index
+      INTEGER  ::   itx      ! index of flux over ice
       REAL(wp) ::   ztri         ! local scalar
       REAL(wp), DIMENSION(jpi,jpj)     ::   zcptn, zcptrain, zcptsnw, ziceld, zmsk, zsnw
@@ -1673 +1674 @@
       !!----------------------------------------------------------------------
       !
+      IF( TRIM( sn_rcv_emp%cldes ) == 'conservative' ) THEN ; itx=jpr_snow ;
+      ELSE ; itx=jpr_semp ; ENDIF
+
+      IF(  nrcvinfo(itx) == OASIS_Rcv ) THEN
+
       IF( ln_mixcpl )   zmsk(:,:) = 1. - xcplmask(:,:,0)
       ziceld(:,:) = 1._wp - picefr(:,:)
@@ -1790 +1796 @@
       !
 #endif
+      ENDIF
 
       ! outputs
@@ -1806 +1813 @@
       ! note: runoff output is done in sbcrnf (which includes icebergs too) and iceshelf output is done in sbcisf
       !
+      !TG comment - the variable used here should depend on the type of coupling
+      !used for qns
+      IF( TRIM( sn_rcv_qns%cldes ) == 'oce only' ) THEN ; itx=jpr_qsnoce ;
+      ELSE ; itx=jpr_qnsice ; ENDIF
+
+      IF(  nrcvinfo(itx) == OASIS_Rcv ) THEN 
       !                                                      ! ========================= !
       SELECT CASE( TRIM( sn_rcv_qns%cldes ) )                !   non solar heat fluxes   !   (qns)
@@ -1923 +1936 @@
 
 #endif
-      ! outputs
+      ENDIF !End of code only run when qns received
+
+      ! outputs - these must be called every time step even if coupling hasn't
+      ! happened.
       IF ( srcv(jpr_cal)%laction       ) CALL iom_put('hflx_cal_cea'    , - frcv(jpr_cal)%z3(:,:,1) * rLfus )                      ! latent heat from calving
       IF ( srcv(jpr_icb)%laction       ) CALL iom_put('hflx_icb_cea'    , - frcv(jpr_icb)%z3(:,:,1) * rLfus )                      ! latent heat from icebergs melting
@@ -1936 +1952 @@
       ! note: hflx for runoff and iceshelf are done in sbcrnf and sbcisf resp.
       !
+
+      IF( TRIM( sn_rcv_qsr%cldes ) == 'oce only') THEN ; itx=jpr_qsroce 
+      ELSE ; itx = jpr_qsrice ; ENDIF
+      IF(  nrcvinfo(itx) == OASIS_Rcv ) THEN 
       !                                                      ! ========================= !
       SELECT CASE( TRIM( sn_rcv_qsr%cldes ) )                !      solar heat fluxes    !   (qsr)
@@ -2059 +2079 @@
       !
 #endif
+      ENDIF !End of test for coupled solar flux
       !
    END SUBROUTINE sbc_cpl_ice_flx