Changeset 3092


Ignore:
Timestamp:
2011-11-14T15:46:00+01:00 (10 years ago)
Author:
cetlod
Message:

dev_LOCEAN_CMCC_2011:follow coding rules for ndivdmp namelist parameter

Location:
branches/2011/dev_LOCEAN_CMCC_2011
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • branches/2011/dev_LOCEAN_CMCC_2011/DOC/TexFiles/Chapters/Chap_ASM.tex

    r3084 r3092  
    115115integration \citep{Talagrand_JAS72, Dobricic_al_OS07}. Diffusion coefficients are defined as  
    116116$A_D = \alpha e_{1t} e_{2t}$, where $\alpha = 0.2$. The divergence damping is activated by 
    117 assigning to \textit{ndivdmp} in the \textit{nam\_asminc} namelist a value greater than zero.  
     117assigning to \np{nn\_divdmp} in the \textit{nam\_asminc} namelist a value greater than zero.  
    118118By choosing this value to be of the order of 100 the increments in the vertical velocity will  
    119119be significantly reduced. 
  • branches/2011/dev_LOCEAN_CMCC_2011/NEMOGCM/CONFIG/GYRE/EXP00/namelist

    r3084 r3092  
    1 !!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
     1!.!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    22!! NEMO/OPA  :  1 - run manager      (namrun) 
    33!! namelists    2 - Domain           (namzgr, namzgr_sco, namdom, namtsd) 
     
    856856    ln_salfix = .false.    !  Logical switch for ensuring that the sa > salfixmin 
    857857    salfixmin = -9999      !  Minimum salinity after applying the increments 
    858     ndivdmp  = 0          !  Number of iterations of divergence damping operator 
    859 / 
     858    nn_divdmp = 0          !  Number of iterations of divergence damping operator 
     859/ 
  • branches/2011/dev_LOCEAN_CMCC_2011/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist

    r3084 r3092  
    856856    ln_salfix = .false.    !  Logical switch for ensuring that the sa > salfixmin 
    857857    salfixmin = -9999      !  Minimum salinity after applying the increments 
    858     ndivdmp  = 0          !  Number of iterations of divergence damping operator 
    859 / 
     858    nn_divdmp = 0          !  Number of iterations of divergence damping operator 
     859/ 
  • branches/2011/dev_LOCEAN_CMCC_2011/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist

    r3084 r3092  
    880880    ln_salfix = .false.    !  Logical switch for ensuring that the sa > salfixmin 
    881881    salfixmin = -9999      !  Minimum salinity after applying the increments 
    882     ndivdmp  = 0          !  Number of iterations of divergence damping operator 
    883 / 
     882    nn_divdmp = 0          !  Number of iterations of divergence damping operator 
     883/ 
  • branches/2011/dev_LOCEAN_CMCC_2011/NEMOGCM/CONFIG/POMME/EXP00/namelist

    r3084 r3092  
    861861    ln_salfix = .false.    !  Logical switch for ensuring that the sa > salfixmin 
    862862    salfixmin = -9999      !  Minimum salinity after applying the increments 
    863     ndivdmp  = 0          !  Number of iterations of divergence damping operator 
    864 / 
     863    nn_divdmp = 0          !  Number of iterations of divergence damping operator 
     864/ 
  • branches/2011/dev_LOCEAN_CMCC_2011/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90

    r3084 r3092  
    5656   LOGICAL, PUBLIC :: ln_sshinc = .FALSE. !: No sea surface height assimilation increment 
    5757   LOGICAL, PUBLIC :: ln_salfix = .FALSE. !: Apply minimum salinity check 
    58    INTEGER, PUBLIC ::   ndivdmp = 0       !: Apply divergence damping filter ndivdmp times 
     58   INTEGER, PUBLIC :: nn_divdmp = 0       !: Apply divergence damping filter nn_divdmp times 
    5959 
    6060   REAL(wp), PUBLIC, DIMENSION(:,:,:), ALLOCATABLE ::   t_bkg   , s_bkg      !: Background temperature and salinity 
     
    129129         &                 nitbkg, nitdin, nitiaustr, nitiaufin, niaufn,   & 
    130130         &                 nittrjfrq, ln_salfix, salfixmin,                & 
    131          &                 ndivdmp 
     131         &                 nn_divdmp 
    132132      !!---------------------------------------------------------------------- 
    133133 
     
    437437 
    438438 
    439       IF ( ln_dyninc .AND. ndivdmp.gt.0 ) THEN 
     439      IF ( ln_dyninc .AND. nn_divdmp > 0 ) THEN 
    440440 
    441441       IF( wrk_in_use( 2, 1) ) THEN 
     
    444444 
    445445 
    446        DO  jt = 1, ndivdmp 
     446       DO  jt = 1, nn_divdmp 
    447447 
    448448           DO jk = 1, jpkm1 
  • branches/2011/dev_LOCEAN_CMCC_2011/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90

    r3084 r3092  
    394394      ! If energy, enstrophy or mixed advection of momentum in vector form change the value for masks 
    395395      ! at angles with three ocean points and one land point 
    396        IF( ln_dynvor_con .OR. ln_dynvor_ene .OR. ln_dynvor_ens .OR. ln_dynvor_mix) THEN 
     396       IF( ln_dynvor_con .AND. (ln_dynvor_ene .OR. ln_dynvor_ens .OR. ln_dynvor_mix) ) THEN 
    397397        DO jj = 2, jpjm1 
    398398          DO ji = 2, jpim1 
Note: See TracChangeset for help on using the changeset viewer.