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 3097 for branches/2011/dev_LOCEAN_CMCC_2011 – NEMO

Ignore:
Timestamp:
2011-11-14T16:58:22+01:00 (12 years ago)
Author:
cetlod
Message:

dev_LOCEAN_CMCC_2011:Move one namelist parameter from dynvor to dommsk

Location:
branches/2011/dev_LOCEAN_CMCC_2011/NEMOGCM
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/2011/dev_LOCEAN_CMCC_2011/NEMOGCM/CONFIG/GYRE/EXP00/namelist

    r3092 r3097  
    323323   rn_shlat    =    0.     !  shlat = 0  !  0 < shlat < 2  !  shlat = 2  !  2 < shlat 
    324324                           !  free slip  !   partial slip  !   no slip   ! strong slip 
     325   ln_vorlat   = .false.   !  consistency of vorticity boundary condition with analytical eqs. 
    325326/ 
    326327!----------------------------------------------------------------------- 
     
    514515   ln_dynvor_mix = .false. !  mixed scheme                
    515516   ln_dynvor_een = .false. !  energy & enstrophy scheme   
    516    ln_dynvor_con = .false. !  consistency of BC with analytical eqs. 
    517517/ 
    518518!----------------------------------------------------------------------- 
  • branches/2011/dev_LOCEAN_CMCC_2011/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist

    r3092 r3097  
    323323   rn_shlat    =    2.     !  shlat = 0  !  0 < shlat < 2  !  shlat = 2  !  2 < shlat 
    324324                           !  free slip  !   partial slip  !   no slip   ! strong slip 
     325   ln_vorlat   = .false.   !  consistency of vorticity boundary condition with analytical eqs. 
    325326/ 
    326327!----------------------------------------------------------------------- 
     
    514515   ln_dynvor_mix = .false. !  mixed scheme                
    515516   ln_dynvor_een = .true.  !  energy & enstrophy scheme   
    516    ln_dynvor_con = .false. !  consistency of BC with analytical eqs. 
    517517/ 
    518518!----------------------------------------------------------------------- 
  • branches/2011/dev_LOCEAN_CMCC_2011/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist

    r3092 r3097  
    323323   rn_shlat    =    2.     !  shlat = 0  !  0 < shlat < 2  !  shlat = 2  !  2 < shlat 
    324324                           !  free slip  !   partial slip  !   no slip   ! strong slip 
     325   ln_vorlat   = .false.   !  consistency of vorticity boundary condition with analytical eqs. 
    325326/ 
    326327!----------------------------------------------------------------------- 
     
    514515   ln_dynvor_mix = .false. !  mixed scheme                
    515516   ln_dynvor_een = .true.  !  energy & enstrophy scheme   
    516    ln_dynvor_con = .false. !  consistency of BC with analytical eqs. 
    517517/ 
    518518!----------------------------------------------------------------------- 
  • branches/2011/dev_LOCEAN_CMCC_2011/NEMOGCM/CONFIG/POMME/EXP00/namelist

    r3092 r3097  
    323323   rn_shlat    =    2.     !  shlat = 0  !  0 < shlat < 2  !  shlat = 2  !  2 < shlat 
    324324                           !  free slip  !   partial slip  !   no slip   ! strong slip 
     325   ln_vorlat   = .false.   !  consistency of vorticity boundary condition with analytical eqs. 
    325326/ 
    326327!----------------------------------------------------------------------- 
     
    514515   ln_dynvor_mix = .false. !  mixed scheme                
    515516   ln_dynvor_een = .true.  !  energy & enstrophy scheme   
    516    ln_dynvor_con = .false. !  consistency of BC with analytical eqs. 
    517517/ 
    518518!----------------------------------------------------------------------- 
  • branches/2011/dev_LOCEAN_CMCC_2011/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90

    r3095 r3097  
    3838 
    3939   !                            !!* Namelist namlbc : lateral boundary condition * 
    40    REAL(wp) ::   rn_shlat = 2.   ! type of lateral boundary condition on velocity 
     40   REAL(wp)        :: rn_shlat   = 2.   ! type of lateral boundary condition on velocity 
     41   LOGICAL, PUBLIC :: ln_vorlat  = .false.   !  consistency of vorticity boundary condition  
     42   !                                            with analytical eqs. 
     43 
    4144 
    4245   INTEGER, ALLOCATABLE, SAVE, DIMENSION(:,:) ::  icoord ! Workspace for dom_msk_nsa() 
     
    133136      INTEGER  ::   ijf, ijl, ij0, ij1       !   -       - 
    134137      !! 
    135       NAMELIST/namlbc/ rn_shlat 
     138      NAMELIST/namlbc/ rn_shlat, ln_vorlat 
    136139      !!--------------------------------------------------------------------- 
    137140       
     
    148151         WRITE(numout,*) '~~~~~~' 
    149152         WRITE(numout,*) '   Namelist namlbc' 
    150          WRITE(numout,*) '      lateral momentum boundary cond.    rn_shlat = ',rn_shlat 
     153         WRITE(numout,*) '      lateral momentum boundary cond.    rn_shlat  = ',rn_shlat 
     154         WRITE(numout,*) '      consistency with analytical form   ln_vorlat = ',ln_vorlat  
    151155      ENDIF 
    152156 
  • branches/2011/dev_LOCEAN_CMCC_2011/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90

    r3095 r3097  
    2323   !!       vor_mix  : mixed enstrophy/energy conserving (ln_dynvor_mix=T) 
    2424   !!       vor_een  : energy and enstrophy conserving   (ln_dynvor_een=T) 
    25    !!       vor_con  : BC consistent with analytical eqs.(ln_dynvor_con=T) 
    2625   !!   dyn_vor_init : set and control of the different vorticity option 
    2726   !!---------------------------------------------------------------------- 
    2827   USE oce            ! ocean dynamics and tracers 
    2928   USE dom_oce        ! ocean space and time domain 
     29   USE dommsk         ! ocean mask 
    3030   USE dynadv         ! momentum advection (use ln_dynadv_vec value) 
    3131   USE trdmod         ! ocean dynamics trends  
     
    4747   LOGICAL, PUBLIC ::   ln_dynvor_mix = .FALSE.   !: mixed scheme 
    4848   LOGICAL, PUBLIC ::   ln_dynvor_een = .FALSE.   !: energy and enstrophy conserving scheme 
    49    LOGICAL, PUBLIC ::   ln_dynvor_con = .FALSE.   !: consistency with flux form 
    5049 
    5150   INTEGER ::   nvor = 0   ! type of vorticity trend used 
     
    694693      INTEGER ::   ioptio          ! local integer 
    695694      !! 
    696       NAMELIST/namdyn_vor/ ln_dynvor_ens, ln_dynvor_ene, ln_dynvor_mix, ln_dynvor_een, ln_dynvor_con 
     695      NAMELIST/namdyn_vor/ ln_dynvor_ens, ln_dynvor_ene, ln_dynvor_mix, ln_dynvor_een 
    697696      !!---------------------------------------------------------------------- 
    698697 
     
    709708         WRITE(numout,*) '           mixed enstrophy/energy conserving scheme   ln_dynvor_mix = ', ln_dynvor_mix 
    710709         WRITE(numout,*) '           enstrophy and energy conserving scheme     ln_dynvor_een = ', ln_dynvor_een 
    711          WRITE(numout,*) '           consistency with flux form                 ln_dynvor_con = ', ln_dynvor_con 
    712710      ENDIF 
    713711 
    714712      ! If energy, enstrophy or mixed advection of momentum in vector form change the value for masks 
    715713      ! at angles with three ocean points and one land point 
    716       IF( ln_dynvor_con .AND. (ln_dynvor_ene .OR. ln_dynvor_ens .OR. ln_dynvor_mix) ) THEN 
     714      IF( ln_vorlat .AND. (ln_dynvor_ene .OR. ln_dynvor_ens .OR. ln_dynvor_mix) ) THEN 
    717715          DO jj = 2, jpjm1 
    718716            DO ji = 2, jpim1 
Note: See TracChangeset for help on using the changeset viewer.