Changeset 11055 for branches/UKMO/dev_r5518_GO6_fix_zemp_ice/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90

Timestamp:

2019-05-24T14:57:22+02:00 (5 years ago)

Author:

dancopsey

Message:

Put the switch back in again.

File:

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

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

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