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 13736 for NEMO/branches/2020 – NEMO

Changeset 13736 for NEMO/branches/2020


Ignore:
Timestamp:
2020-11-06T12:23:04+01:00 (3 years ago)
Author:
techene
Message:

#2385 qco e3f bug correction : use a dedicated fe3mask instead of fmask which values are not 0 or 1

Location:
NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/src/OCE/DOM
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/src/OCE/DOM/dom_oce.F90

    r13607 r13736  
    193193   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:), TARGET ::   tmask, umask, vmask, wmask, fmask   !: land/ocean mask at T-, U-, V-, W- and F-pts 
    194194   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:), TARGET ::   wumask, wvmask                      !: land/ocean mask at WU- and WV-pts 
    195  
     195#if defined key_qco    
     196   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:), TARGET ::   fe3mask                             !: land/ocean mask at F-pts for qco 
     197#endif 
    196198   !!---------------------------------------------------------------------- 
    197199   !! calendar variables 
    … …  
    327329      ii = ii+1 
    328330      ALLOCATE( wmask(jpi,jpj,jpk) , wumask(jpi,jpj,jpk), wvmask(jpi,jpj,jpk) , STAT=ierr(ii) ) 
     331#if defined key_qco 
     332         ! 
     333      ii = ii+1 
     334      ALLOCATE( fe3mask(jpi,jpj,jpk) , STAT=ierr(ii) ) 
     335#endif 
    329336      ! 
    330337      dom_oce_alloc = MAXVAL(ierr) 

  • NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/src/OCE/DOM/dommsk.F90

    r13606 r13736  
    189189         CALL lbc_lnk( 'dommsk', ssfmask, 'F', 1.0_wp ) 
    190190      ENDIF 
     191#if defined key_qco 
     192      fe3mask(:,:,:) = fmask(:,:,:) 
     193#endif 
    191194 
    192195      ! Interior domain mask  (used for global sum) 

  • NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/src/OCE/DOM/domzgr_substitute.h90

    r13696 r13736  
    1515#   define  e3u(i,j,k,t)   (e3u_0(i,j,k)*(1._wp+r3u(i,j,t)*umask(i,j,k))) 
    1616#   define  e3v(i,j,k,t)   (e3v_0(i,j,k)*(1._wp+r3v(i,j,t)*vmask(i,j,k))) 
    17 #   define  e3f(i,j,k)     (e3f_0(i,j,k)*(1._wp+r3f(i,j)*fmask(i,j,k))) 
    18 #   define  e3f_vor(i,j,k) (e3f_0vor(i,j,k)*(1._wp+r3f(i,j)*fmask(i,j,k))) 
     17#   define  e3f(i,j,k)     (e3f_0(i,j,k)*(1._wp+r3f(i,j)*fe3mask(i,j,k))) 
     18#   define  e3f_vor(i,j,k) (e3f_0vor(i,j,k)*(1._wp+r3f(i,j)*fe3mask(i,j,k))) 
    1919#   define  e3w(i,j,k,t)   (e3w_0(i,j,k)*(1._wp+r3t(i,j,t))) 
    2020#   define  e3uw(i,j,k,t)  (e3uw_0(i,j,k)*(1._wp+r3u(i,j,t))) 
Note: See TracChangeset for help on using the changeset viewer.