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 11274 for branches/UKMO/dev_r5518_GO6_package_STARTHOUR/NEMOGCM – NEMO

Ignore:
Timestamp:
2019-07-16T18:02:12+02:00 (5 years ago)
Author:
dancopsey
Message:

Merge in sublimation bug fixes (GMED#449).

Location:
branches/UKMO/dev_r5518_GO6_package_STARTHOUR/NEMOGCM
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/dev_r5518_GO6_package_STARTHOUR/NEMOGCM/CONFIG/SHARED/namelist_ref

    r10005 r11274  
    406406   rn_antarctica_calving_fraction = 0.5 ! Set fraction of total freshwater flux for iceberg calving - remainder goes to iceshelf melting. 
    407407   rn_iceshelf_fluxes_tolerance = 1e-6  ! Fractional threshold for detecting differences in icesheet masses (must be positive definite). 
     408   ln_fix_sea_ice_fluxes = .false. ! Fix sea ice heat flux coupling issues 
    408409/ 
    409410!----------------------------------------------------------------------- 
  • branches/UKMO/dev_r5518_GO6_package_STARTHOUR/NEMOGCM/NEMO/OPA_SRC/SBC/sbc_ice.F90

    r9975 r11274  
    124124#if defined key_lim2 || defined key_cice 
    125125   ! already defined in ice.F90 for LIM3 
    126    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::  a_i 
     126   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::  a_i                ! Sea ice fraction on categories 
     127   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::  a_i_last_couple    ! Sea ice fraction on categories at the last coupling point 
    127128   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::  ht_i, ht_s 
    128129#endif 
  • branches/UKMO/dev_r5518_GO6_package_STARTHOUR/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

    r9321 r11274  
    5454   USE lib_fortran, ONLY: glob_sum 
    5555 
     56#if defined key_oasis3 
     57   USE mod_oasis, ONLY : OASIS_Sent, OASIS_ToRest, OASIS_SentOut, OASIS_ToRestOut 
     58#endif 
     59 
    5660   IMPLICIT NONE 
    5761   PRIVATE 
     
    154158                                                 ! i.e. specifically nmol/L (= umol/m3) 
    155159 
     160#if ! defined key_oasis3 
     161   ! Dummy variables to enable compilation when oasis3 is not being used 
     162   INTEGER                    ::   OASIS_Sent        = -1 
     163   INTEGER                    ::   OASIS_SentOut     = -1 
     164   INTEGER                    ::   OASIS_ToRest      = -1 
     165   INTEGER                    ::   OASIS_ToRestOut   = -1 
     166#endif 
     167 
    156168   !                                                         !!** namelist namsbc_cpl ** 
    157169   TYPE ::   FLD_C 
     
    175187   LOGICAL     ::   ln_usecplmask          !  use a coupling mask file to merge data received from several models 
    176188                                           !   -> file cplmask.nc with the float variable called cplmask (jpi,jpj,nn_cplmodel) 
     189   LOGICAL, PUBLIC ::   ln_fix_sea_ice_fluxes     ! Apply sea ice flux bug fixes (GMED#449) 
     190 
    177191   TYPE ::   DYNARR      
    178192      REAL(wp), POINTER, DIMENSION(:,:,:)    ::   z3    
     
    200214      !!             ***  FUNCTION sbc_cpl_alloc  *** 
    201215      !!---------------------------------------------------------------------- 
    202       INTEGER :: ierr(3) 
     216      INTEGER :: ierr(4) 
    203217      !!---------------------------------------------------------------------- 
    204218      ierr(:) = 0 
     
    212226      ! Hardwire only two models as nn_cplmodel has not been read in 
    213227      ! from the namelist yet. 
    214       ALLOCATE( xcplmask(jpi,jpj,0:2) , STAT=ierr(3) )    
     228      ALLOCATE( xcplmask(jpi,jpj,0:2) , STAT=ierr(3) )  
     229#if defined key_cice 
     230      ALLOCATE( a_i_last_couple(jpi,jpj,jpl) , STAT=ierr(4) )  
     231#endif 
    215232      ! 
    216233      sbc_cpl_alloc = MAXVAL( ierr ) 
     
    247264         &                  ln_usecplmask, nn_coupled_iceshelf_fluxes, ln_iceshelf_init_atmos,        & 
    248265         &                  rn_greenland_total_fw_flux, rn_greenland_calving_fraction, & 
    249          &                  rn_antarctica_total_fw_flux, rn_antarctica_calving_fraction, rn_iceshelf_fluxes_tolerance 
     266         &                  rn_antarctica_total_fw_flux, rn_antarctica_calving_fraction, rn_iceshelf_fluxes_tolerance, & 
     267         &                  ln_fix_sea_ice_fluxes 
    250268      !!--------------------------------------------------------------------- 
    251269 
     
    317335         WRITE(numout,*)'  nn_cplmodel                         = ', nn_cplmodel 
    318336         WRITE(numout,*)'  ln_usecplmask                       = ', ln_usecplmask 
     337         WRITE(numout,*)'  ln_fix_sea_ice_fluxes               = ', ln_fix_sea_ice_fluxes 
    319338         WRITE(numout,*)'  nn_coupled_iceshelf_fluxes          = ', nn_coupled_iceshelf_fluxes 
    320339         WRITE(numout,*)'  ln_iceshelf_init_atmos              = ', ln_iceshelf_init_atmos 
     
    17581777         IF ( TRIM(sn_rcv_emp%clcat) == 'yes' ) THEN 
    17591778            ! zemp_ice is the sum of frcv(jpr_ievp)%z3(:,:,1) over all layers - snow 
    1760             zemp_ice(:,:) = - frcv(jpr_snow)%z3(:,:,1) 
     1779            IF ( ln_fix_sea_ice_fluxes ) THEN 
     1780               zemp_ice(:,:) = - frcv(jpr_snow)%z3(:,:,1) * zicefr(:,:) 
     1781            ELSE 
     1782               zemp_ice(:,:) = - frcv(jpr_snow)%z3(:,:,1) 
     1783            ENDIF 
    17611784            DO jl=1,jpl 
    1762                zemp_ice(:,:   ) = zemp_ice(:,:) + frcv(jpr_ievp)%z3(:,:,jl) 
     1785               IF ( ln_fix_sea_ice_fluxes ) THEN 
     1786                  zemp_ice(:,:   ) = zemp_ice(:,:) + frcv(jpr_ievp)%z3(:,:,jl) * a_i_last_couple(:,:,jl) 
     1787               ELSE 
     1788                  zemp_ice(:,:   ) = zemp_ice(:,:) + frcv(jpr_ievp)%z3(:,:,jl) 
     1789               ENDIF 
    17631790            ENDDO 
    17641791            ! latent heat coupled for each category in CICE 
     
    22692296         END SELECT 
    22702297         IF( ssnd(jps_fice)%laction )   CALL cpl_snd( jps_fice, isec, ztmp3, info ) 
     2298 
     2299#if defined key_lim2 || defined key_cice 
     2300         ! If this coupling was successful then save ice fraction for use between coupling points. 
     2301         ! This is needed for some calculations where the ice fraction at the last coupling point 
     2302         ! is needed. 
     2303         IF( info == OASIS_Sent     .OR. info == OASIS_ToRest .OR.   & 
     2304                     & info == OASIS_SentOut  .OR. info == OASIS_ToRestOut ) THEN 
     2305           IF ( sn_snd_thick%clcat == 'yes' ) THEN 
     2306             a_i_last_couple(:,:,:) = a_i(:,:,:) 
     2307           ENDIF 
     2308         ENDIF 
     2309#endif 
     2310          
    22712311      ENDIF 
    22722312       
  • branches/UKMO/dev_r5518_GO6_package_STARTHOUR/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90

    r9975 r11274  
    395395         ELSE IF (ksbc == jp_purecpl) THEN 
    396396            DO jl=1,ncat 
    397                ztmpn(:,:,jl)=qla_ice(:,:,jl)*a_i(:,:,jl) 
     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 
    398402            ENDDO 
    399403    ELSE 
     
    408412!  Convert to GBM 
    409413            IF (ksbc == jp_flx .OR. ksbc == jp_purecpl) THEN 
    410                ztmp(:,:) = botmelt(:,:,jl)*a_i(:,:,jl) 
     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 
    411419            ELSE 
    412420               ztmp(:,:) = botmelt(:,:,jl) 
     
    417425!  Convert to GBM 
    418426            IF (ksbc == jp_flx .OR. ksbc == jp_purecpl) THEN 
    419                ztmp(:,:) = (topmelt(:,:,jl)+botmelt(:,:,jl))*a_i(:,:,jl)  
     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 
    420432            ELSE 
    421433               ztmp(:,:) = (topmelt(:,:,jl)+botmelt(:,:,jl)) 
Note: See TracChangeset for help on using the changeset viewer.