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

Changeset 12656 for NEMO/branches/2020


Ignore:
Timestamp:
2020-04-03T11:51:59+02:00 (4 years ago)
Author:
techene
Message:

change key_QCO into key_qco, stepLF & traatf: add substitute, dynatfQCO: remove pe3 arguments

Location:
NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3/src/OCE
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3/src/OCE/ASM/asminc.F90

    r12624 r12656  
    760760            ! 
    761761            ssh(:,:,Kbb) = ssh(:,:,Kmm)                        ! Update before fields 
    762 #if ! defined key_QCO 
     762#if ! defined key_qco 
    763763            e3t(:,:,:,Kbb) = e3t(:,:,:,Kmm) 
    764764#endif 

  • NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3/src/OCE/DOM/domzgr_substitute.h90

    r12624 r12656  
    1111!! Software governed by the CeCILL license (see ./LICENSE) 
    1212!!---------------------------------------------------------------------- 
    13 #if defined key_QCO 
     13#if defined key_qco 
    1414#   define  e3t(i,j,k,t)   (e3t_0(i,j,k)*(1.+r3t(i,j,t)*tmask(i,j,k))) 
    1515#   define  e3u(i,j,k,t)   (e3u_0(i,j,k)*(1.+r3u(i,j,t)*umask(i,j,k))) 

  • NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3/src/OCE/DYN/dynatfQCO.F90

    r12624 r12656  
    6969CONTAINS 
    7070 
    71    SUBROUTINE dyn_atf_qco ( kt, Kbb, Kmm, Kaa, puu, pvv, pe3t, pe3u, pe3v ) 
     71   SUBROUTINE dyn_atf_qco ( kt, Kbb, Kmm, Kaa, puu, pvv ) 
    7272      !!---------------------------------------------------------------------- 
    7373      !!                  ***  ROUTINE dyn_atf_qco  *** 
    … …  
    9898      INTEGER                             , INTENT(in   ) :: Kbb, Kmm, Kaa    ! before and after time level indices 
    9999      REAL(wp), DIMENSION(jpi,jpj,jpk,jpt), INTENT(inout) :: puu, pvv         ! velocities to be time filtered 
    100       REAL(wp), DIMENSION(jpi,jpj,jpk,jpt), INTENT(inout) :: pe3t, pe3u, pe3v ! scale factors to be time filtered 
    101100      ! 
    102101      INTEGER  ::   ji, jj, jk   ! dummy loop indices 

  • NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3/src/OCE/ISF/isfcpl.F90

    r12624 r12656  
    1515   USE isfutils, ONLY : debug 
    1616   USE lib_mpp , ONLY: mpp_sum, mpp_max ! mpp routine 
    17 #if ! defined key_QCO 
     17#if ! defined key_qco 
    1818   USE domvvl  , ONLY: dom_vvl_zgr      ! vertical scale factor interpolation 
    1919#else 
    … …  
    117117      vv   (:,:,:,Kbb)   = vv   (:,:,:,Kmm) 
    118118      ssh (:,:,Kbb)     = ssh (:,:,Kmm) 
    119 #if ! defined key_QCO 
     119#if ! defined key_qco 
    120120      e3t(:,:,:,Kbb)   = e3t(:,:,:,Kmm) 
    121121#endif  
    … …  
    224224      IF(lwp) write(numout,*) 'isfcpl_ssh : recompute scale factor from ssh (new wet cell,Kmm)' 
    225225      IF(lwp) write(numout,*) '~~~~~~~~~~~' 
    226 #if ! defined key_QCO 
     226#if ! defined key_qco 
    227227      DO jk = 1, jpk 
    228228         e3t(:,:,jk,Kmm) =  e3t_0(:,:,jk) * ( ht_0(:,:) + ssh(:,:,Kmm) ) & 

  • NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3/src/OCE/SBC/sbcice_cice.F90

    r12624 r12656  
    233233!!gm This should be put elsewhere....   (same remark for limsbc) 
    234234!!gm especially here it is assumed zstar coordinate, but it can be ztilde.... 
    235 #if defined key_QCO 
     235#if defined key_qco 
    236236            IF( .NOT.ln_linssh )   CALL dom_qe_zgr( Kbb, Kmm, Kaa )   ! interpolation scale factor, depth and water column 
    237237#else 

  • NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3/src/OCE/TRA/traatf.F90

    r12581 r12656  
    5858   !! * Substitutions 
    5959#  include "do_loop_substitute.h90" 
     60#  include "domzgr_substitute.h90" 
    6061   !!---------------------------------------------------------------------- 
    6162   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    … …  
    131132         ! G Nurser 23 Mar 2017. Recalculate trend as Delta(e3t*T)/e3tn; e3tn cancel from pts(Kmm) terms 
    132133         DO jk = 1, jpkm1 
    133             ztrdt(:,:,jk) = ( pts(:,:,jk,jp_tem,Kaa)*e3t(:,:,jk,Kaa) / e3t(:,:,jk,Kmm) - pts(:,:,jk,jp_tem,Kmm)) * zfact 
    134             ztrds(:,:,jk) = ( pts(:,:,jk,jp_sal,Kaa)*e3t(:,:,jk,Kaa) / e3t(:,:,jk,Kmm) - pts(:,:,jk,jp_sal,Kmm)) * zfact 
     134            ztrdt(:,:,jk) = ( pts(:,:,jk,jp_tem,Kaa)*e3t(:,:,jk,Kaa)   & 
     135               &                                   / e3t(:,:,jk,Kmm)   & 
     136               &            - pts(:,:,jk,jp_tem,Kmm)) * zfact 
     137            ztrds(:,:,jk) = ( pts(:,:,jk,jp_sal,Kaa)*e3t(:,:,jk,Kaa)   & 
     138               &                                   / e3t(:,:,jk,Kmm)   & 
     139               &            - pts(:,:,jk,jp_sal,Kmm)) * zfact 
    135140         END DO 
    136141         CALL trd_tra( kt, Kmm, Kaa, 'TRA', jp_tem, jptra_tot, ztrdt ) 
    … …  
    234239      !! 
    235240      !! ** Method  : - Apply a thickness weighted Asselin time filter on now fields. 
    236       !!             pt(Kmm)  = ( e3t(Kmm)*pt(Kmm) + atfp*[ e3t(Kbb)*pt(Kbb) - 2 e3t(Kmm)*pt(Kmm) + e3t_a*pt(Kaa) ] ) 
    237       !!                       /( e3t(Kmm)         + atfp*[ e3t(Kbb)         - 2 e3t(Kmm)         + e3t(Kaa)    ] ) 
     241      !!             pt(Kmm)  = ( e3t_Kmm*pt(Kmm) + atfp*[ e3t_Kbb*pt(Kbb) - 2 e3t_Kmm*pt(Kmm) + e3t_Kaa*pt(Kaa) ] ) 
     242      !!                       /( e3t_Kmm         + atfp*[ e3t_Kbb         - 2 e3t_Kmm         + e3t_Kaa    ] ) 
    238243      !! 
    239244      !! ** Action  : - pt(Kmm) ready for the next time step 
    … …  
    331336                  IF ( jk == misfkb_cav(ji,jj) ) THEN 
    332337                     ztc_f  = ztc_f  - zfact1 * ( risf_cav_tsc(ji,jj,jn) - risf_cav_tsc_b(ji,jj,jn) )  & 
    333                             &                 * e3t(ji,jj,jk,Kmm) / rhisf_tbl_cav(ji,jj) * rfrac_tbl_cav(ji,jj) 
     338                            &                 * e3t(ji,jj,jk,Kmm) / rhisf_tbl_cav(ji,jj)   & 
     339                            &                 * rfrac_tbl_cav(ji,jj) 
    334340                  END IF 
    335341               END IF 
    … …  
    345351                  IF ( jk == misfkb_par(ji,jj) ) THEN 
    346352                     ztc_f  = ztc_f  - zfact1 * ( risf_par_tsc(ji,jj,jn) - risf_par_tsc_b(ji,jj,jn) )  & 
    347                             &                 * e3t(ji,jj,jk,Kmm) / rhisf_tbl_par(ji,jj) * rfrac_tbl_par(ji,jj) 
     353                            &                 * e3t(ji,jj,jk,Kmm) / rhisf_tbl_par(ji,jj)   & 
     354                            &                 * rfrac_tbl_par(ji,jj) 
    348355                  END IF 
    349356               END IF 

  • NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3/src/OCE/stepLF.F90

    r12644 r12656  
    5656   INTEGER, PUBLIC :: Nbb, Nnn, Naa, Nrhs          !! used by nemo_init 
    5757#  include "domzgr_substitute.h90" 
     58#  include "domzgr_substitute.h90" 
    5859   !!---------------------------------------------------------------------- 
    5960   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    … …  
    299300                         CALL dom_qe_r3c    ( ssh(:,:,Nnn), r3t_f, r3u_f, r3v_f )            ! "now" ssh/h_0 ratio from filtrered ssh 
    300301                         CALL tra_atf_qco   ( kstp, Nbb, Nnn, Naa, ts )                      ! time filtering of "now" tracer arrays 
    301                          CALL dyn_atf_qco   ( kstp, Nbb, Nnn, Naa, uu, vv, e3t, e3u, e3v )  ! time filtering of "now" velocities and scale factors 
     302                         CALL dyn_atf_qco   ( kstp, Nbb, Nnn, Naa, uu, vv )  ! time filtering of "now" velocities and scale factors 
    302303                         r3t(:,:,Nnn) = r3t_f(:,:) 
    303304                         r3u(:,:,Nnn) = r3u_f(:,:) 
Note: See TracChangeset for help on using the changeset viewer.