New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 11045 for branches – NEMO

Changeset 11045 for branches


Ignore:
Timestamp:
2019-05-23T17:58:33+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/NEMOGCM/NEMO/OPA_SRC/SBC
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/dev_r5518_GO6_fix_zemp_ice/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

    r11000 r11045  
    184184   LOGICAL     ::   ln_usecplmask          !  use a coupling mask file to merge data received from several models 
    185185                                           !   -> file cplmask.nc with the float variable called cplmask (jpi,jpj,nn_cplmodel) 
    186    LOGICAL, PUBLIC ::   ln_fix_sea_ice_fluxes     ! Apply sea ice flux bug fixes (GMED#449) 
    187186 
    188187   TYPE ::   DYNARR      
     
    261260         &                  ln_usecplmask, nn_coupled_iceshelf_fluxes, ln_iceshelf_init_atmos,        & 
    262261         &                  rn_greenland_total_fw_flux, rn_greenland_calving_fraction, & 
    263          &                  rn_antarctica_total_fw_flux, rn_antarctica_calving_fraction, rn_iceshelf_fluxes_tolerance, & 
    264          &                  ln_fix_sea_ice_fluxes 
     262         &                  rn_antarctica_total_fw_flux, rn_antarctica_calving_fraction, rn_iceshelf_fluxes_tolerance 
    265263      !!--------------------------------------------------------------------- 
    266264 
     
    332330         WRITE(numout,*)'  nn_cplmodel                         = ', nn_cplmodel 
    333331         WRITE(numout,*)'  ln_usecplmask                       = ', ln_usecplmask 
    334          WRITE(numout,*)'  ln_fix_sea_ice_fluxes               = ', ln_fix_sea_ice_fluxes 
    335332         WRITE(numout,*)'  nn_coupled_iceshelf_fluxes          = ', nn_coupled_iceshelf_fluxes 
    336333         WRITE(numout,*)'  ln_iceshelf_init_atmos              = ', ln_iceshelf_init_atmos 
     
    17741771         IF ( TRIM(sn_rcv_emp%clcat) == 'yes' ) THEN 
    17751772            ! zemp_ice is the sum of frcv(jpr_ievp)%z3(:,:,1) over all layers - snow 
    1776             IF ( ln_fix_sea_ice_fluxes ) THEN 
    1777                zemp_ice(:,:) = - frcv(jpr_snow)%z3(:,:,1) * zicefr(:,:) 
    1778             ELSE 
    1779                zemp_ice(:,:) = - frcv(jpr_snow)%z3(:,:,1) 
    1780             ENDIF 
     1773            zemp_ice(:,:) = - frcv(jpr_snow)%z3(:,:,1) * zicefr(:,:) 
    17811774            DO jl=1,jpl 
    1782                IF ( ln_fix_sea_ice_fluxes ) THEN 
    1783                   zemp_ice(:,:   ) = zemp_ice(:,:) + frcv(jpr_ievp)%z3(:,:,jl) * a_i_last_couple(:,:,jl) 
    1784                ELSE 
    1785                   zemp_ice(:,:   ) = zemp_ice(:,:) + frcv(jpr_ievp)%z3(:,:,jl) 
    1786                ENDIF 
     1775               zemp_ice(:,:   ) = zemp_ice(:,:) + frcv(jpr_ievp)%z3(:,:,jl) * a_i_last_couple(:,:,jl) 
    17871776            ENDDO 
    17881777            ! latent heat coupled for each category in CICE 
  • branches/UKMO/dev_r5518_GO6_fix_zemp_ice/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90

    r11000 r11045  
    395395         ELSE IF (ksbc == jp_purecpl) THEN 
    396396            DO jl=1,ncat 
    397                IF ( ln_fix_sea_ice_fluxes ) THEN 
    398                   ztmpn(:,:,jl)=qla_ice(:,:,jl)*a_i_last_couple(:,:,jl) 
    399                ELSE 
    400                   ztmpn(:,:,jl)=qla_ice(:,:,jl)*a_i(:,:,jl) 
    401                ENDIF 
     397               ztmpn(:,:,jl)=qla_ice(:,:,jl)*a_i_last_couple(:,:,jl) 
    402398            ENDDO 
    403399    ELSE 
     
    412408!  Convert to GBM 
    413409            IF (ksbc == jp_flx .OR. ksbc == jp_purecpl) THEN 
    414                IF ( ln_fix_sea_ice_fluxes ) THEN 
    415                   ztmp(:,:) = botmelt(:,:,jl)*a_i_last_couple(:,:,jl) 
    416                ELSE 
    417                   ztmp(:,:) = botmelt(:,:,jl)*a_i(:,:,jl) 
    418                ENDIF 
     410               ztmp(:,:) = botmelt(:,:,jl)*a_i_last_couple(:,:,jl) 
    419411            ELSE 
    420412               ztmp(:,:) = botmelt(:,:,jl) 
     
    425417!  Convert to GBM 
    426418            IF (ksbc == jp_flx .OR. ksbc == jp_purecpl) THEN 
    427                IF ( ln_fix_sea_ice_fluxes ) THEN 
    428                   ztmp(:,:) = (topmelt(:,:,jl)+botmelt(:,:,jl))*a_i_last_couple(:,:,jl)  
    429                ELSE 
    430                   ztmp(:,:) = (topmelt(:,:,jl)+botmelt(:,:,jl))*a_i(:,:,jl) 
    431                ENDIF 
     419               ztmp(:,:) = (topmelt(:,:,jl)+botmelt(:,:,jl))*a_i_last_couple(:,:,jl)  
    432420            ELSE 
    433421               ztmp(:,:) = (topmelt(:,:,jl)+botmelt(:,:,jl)) 
Note: See TracChangeset for help on using the changeset viewer.