Changeset 9803 for branches

Timestamp:

2018-06-15T12:06:21+02:00 (6 years ago)

Author:

dancopsey

Message:

Stop copying of solar fluxes overwriting halo_info in CICE (needed for MPI tasks).

File:

• branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) (3 diffs)

branches/UKMO/dev_merge_2017_CICE_interface/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

@@ -255 +255 @@
          &                  sn_rcv_iceflx, sn_rcv_co2   , nn_cplmodel , ln_usecplmask, sn_rcv_mslp ,   &
          &                  sn_rcv_icb   , sn_rcv_isf   , sn_rcv_wfreq , sn_rcv_tauw, nn_cats_cpl  ,   &
-         &                  sn_rcv_ts_ice, sn_snd_cond  , sn_snd_mpnd , sn_snd_sstfrz, sn_snd_thick1  
+         &                  sn_rcv_ts_ice, sn_snd_cond  , sn_snd_mpnd , sn_snd_sstfrz, sn_snd_thick1,  &
+         &                  sn_snd_ttilyr 
 
       !!---------------------------------------------------------------------
@@ -2042 +2043 @@
       ELSE
          qsr_tot(:,:  ) = zqsr_tot(:,:  )
-         qsr_ice(:,:,:) = zqsr_ice(:,:,:)
+         IF ( TRIM( sn_rcv_qsr%cldes ) /= 'oce only' ) THEN
+            qsr_ice(:,:,:) = zqsr_ice(:,:,:)
+         ENDIF
       ENDIF
 
@@ -2312 +2315 @@
       ENDIF
 
-#if defined key_lim3
+#if defined key_lim3 || defined key_cice
       !                                                      ! ------------------------- !
       !                                                      !      Ice melt ponds       !