Changeset 11046 for branches/UKMO/dev_r5518_GO6_fix_zemp_ice_10681/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90

Timestamp:

2019-05-23T18:02:59+02:00 (5 years ago)

Author:

dancopsey

Message:

Take the switch back out again. It was decided not that this is a bug so should be automatically picked up.

File:

• branches/UKMO/dev_r5518_GO6_fix_zemp_ice_10681/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90 (modified) (3 diffs)

branches/UKMO/dev_r5518_GO6_fix_zemp_ice_10681/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90

@@ -395 +395 @@
          ELSE IF (ksbc == jp_purecpl) THEN
             DO jl=1,ncat
-               IF ( ln_fix_sea_ice_fluxes ) THEN
-                  ztmpn(:,:,jl)=qla_ice(:,:,jl)*a_i_last_couple(:,:,jl)
-               ELSE
-                  ztmpn(:,:,jl)=qla_ice(:,:,jl)*a_i(:,:,jl)
-               ENDIF
+               ztmpn(:,:,jl)=qla_ice(:,:,jl)*a_i_last_couple(:,:,jl)
             ENDDO
     ELSE
@@ -412 +408 @@
 !  Convert to GBM
             IF (ksbc == jp_flx .OR. ksbc == jp_purecpl) THEN
-               IF ( ln_fix_sea_ice_fluxes ) THEN
-                  ztmp(:,:) = botmelt(:,:,jl)*a_i_last_couple(:,:,jl)
-               ELSE
-                  ztmp(:,:) = botmelt(:,:,jl)*a_i(:,:,jl)
-               ENDIF
+               ztmp(:,:) = botmelt(:,:,jl)*a_i_last_couple(:,:,jl)
             ELSE
                ztmp(:,:) = botmelt(:,:,jl)
@@ -425 +417 @@
 !  Convert to GBM
             IF (ksbc == jp_flx .OR. ksbc == jp_purecpl) THEN
-               IF ( ln_fix_sea_ice_fluxes ) THEN
-                  ztmp(:,:) = (topmelt(:,:,jl)+botmelt(:,:,jl))*a_i_last_couple(:,:,jl) 
-               ELSE
-                  ztmp(:,:) = (topmelt(:,:,jl)+botmelt(:,:,jl))*a_i(:,:,jl)
-               ENDIF
+               ztmp(:,:) = (topmelt(:,:,jl)+botmelt(:,:,jl))*a_i_last_couple(:,:,jl)
             ELSE
                ztmp(:,:) = (topmelt(:,:,jl)+botmelt(:,:,jl))