Changeset 11046

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.

Location:

branches/UKMO/dev_r5518_GO6_fix_zemp_ice_10681/NEMOGCM/NEMO/OPA_SRC/SBC

Files:

• sbccpl.F90 (modified) (4 diffs)
• sbcice_cice.F90 (modified) (3 diffs)

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

@@ -186 +186 @@
    LOGICAL     ::   ln_usecplmask          !  use a coupling mask file to merge data received from several models
                                            !   -> file cplmask.nc with the float variable called cplmask (jpi,jpj,nn_cplmodel)
-   LOGICAL, PUBLIC ::   ln_fix_sea_ice_fluxes     ! Apply sea ice flux bug fixes (GMED#449)
 
    TYPE ::   DYNARR     
@@ -263 +262 @@
          &                  ln_usecplmask, nn_coupled_iceshelf_fluxes, ln_iceshelf_init_atmos,        &
          &                  rn_greenland_total_fw_flux, rn_greenland_calving_fraction, &
-         &                  rn_antarctica_total_fw_flux, rn_antarctica_calving_fraction, rn_iceshelf_fluxes_tolerance, &
-         &                  ln_fix_sea_ice_fluxes
+         &                  rn_antarctica_total_fw_flux, rn_antarctica_calving_fraction, rn_iceshelf_fluxes_tolerance
       !!---------------------------------------------------------------------
 
@@ -335 +333 @@
          WRITE(numout,*)'  nn_cplmodel                         = ', nn_cplmodel
          WRITE(numout,*)'  ln_usecplmask                       = ', ln_usecplmask
-         WRITE(numout,*)'  ln_fix_sea_ice_fluxes               = ', ln_fix_sea_ice_fluxes
          WRITE(numout,*)'  nn_coupled_iceshelf_fluxes          = ', nn_coupled_iceshelf_fluxes
          WRITE(numout,*)'  ln_iceshelf_init_atmos              = ', ln_iceshelf_init_atmos
@@ -1845 +1842 @@
          IF ( TRIM(sn_rcv_emp%clcat) == 'yes' ) THEN
             ! zemp_ice is the sum of frcv(jpr_ievp)%z3(:,:,1) over all layers - snow
-            IF ( ln_fix_sea_ice_fluxes ) THEN
-               zemp_ice(:,:) = - frcv(jpr_snow)%z3(:,:,1) * zicefr(:,:)
-            ELSE
-               zemp_ice(:,:) = - frcv(jpr_snow)%z3(:,:,1)
-            ENDIF
+            zemp_ice(:,:) = - frcv(jpr_snow)%z3(:,:,1) * zicefr(:,:)
             DO jl=1,jpl
-               IF ( ln_fix_sea_ice_fluxes ) THEN
-                  zemp_ice(:,:   ) = zemp_ice(:,:) + frcv(jpr_ievp)%z3(:,:,jl) * a_i_last_couple(:,:,jl)
-               ELSE
-                  zemp_ice(:,:   ) = zemp_ice(:,:) + frcv(jpr_ievp)%z3(:,:,jl)
-               ENDIF
+               zemp_ice(:,:   ) = zemp_ice(:,:) + frcv(jpr_ievp)%z3(:,:,jl) * a_i_last_couple(:,:,jl)
             ENDDO
             ! latent heat coupled for each category in CICE

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))