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 541 – NEMO

Changeset 541


Ignore:
Timestamp:
2006-10-20T14:21:28+02:00 (18 years ago)
Author:
opalod
Message:

nemo_v1_bugfix_065:RB: move namelist declaration for compatibility with Agrif

Location:
trunk/NEMO/OPA_SRC
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/NEMO/OPA_SRC/DYN/dynhpg.F90

    r503 r541  
    6666   LOGICAL  ::   ln_hpg_rot = .FALSE.   ! s-coordinate (ROTated axes scheme) 
    6767   REAL(wp) ::   gamm       = 0.e0      ! weighting coefficient 
    68    NAMELIST/nam_dynhpg/ ln_hpg_zco, ln_hpg_zps, ln_hpg_sco, ln_hpg_hel,   & 
    69       &                 ln_hpg_wdj, ln_hpg_djc, ln_hpg_rot, gamm 
    7068 
    7169   INTEGER  ::   nhpg  =  0             ! = 0 to 6, type of pressure gradient scheme used 
    … …  
    141139      !!---------------------------------------------------------------------- 
    142140      INTEGER ::   ioptio = 0      ! temporary integer 
     141 
     142      NAMELIST/nam_dynhpg/ ln_hpg_zco, ln_hpg_zps, ln_hpg_sco, ln_hpg_hel,   & 
     143         &                 ln_hpg_wdj, ln_hpg_djc, ln_hpg_rot, gamm 
    143144      !!---------------------------------------------------------------------- 
    144145 

  • trunk/NEMO/OPA_SRC/DYN/dynvor.F90

    r503 r541  
    4040   LOGICAL, PUBLIC ::   ln_dynvor_mix = .FALSE.   !: mixed scheme 
    4141   LOGICAL, PUBLIC ::   ln_dynvor_een = .FALSE.   !: energy and enstrophy conserving scheme 
    42    NAMELIST/nam_dynvor/ ln_dynvor_ens, ln_dynvor_ene, ln_dynvor_mix, ln_dynvor_een 
    4342 
    4443   INTEGER ::   nvor = 0   ! type of vorticity trend used 
    … …  
    565564      !!---------------------------------------------------------------------- 
    566565      INTEGER ::   ioptio          ! temporary integer 
     566      NAMELIST/nam_dynvor/ ln_dynvor_ens, ln_dynvor_ene, ln_dynvor_mix, ln_dynvor_een 
    567567      !!---------------------------------------------------------------------- 
    568568 

  • trunk/NEMO/OPA_SRC/TRA/traadv.F90

    r519 r541  
    3636   LOGICAL, PUBLIC ::   ln_traadv_muscl2 = .FALSE.      ! MUSCL2 scheme flag 
    3737   LOGICAL, PUBLIC ::   ln_traadv_ubs    = .FALSE.      ! UBS scheme flag 
    38    NAMELIST/nam_traadv/ ln_traadv_cen2 , ln_traadv_tvd,   & 
    39       &                 ln_traadv_muscl, ln_traadv_muscl2, ln_traadv_ubs 
    4038 
    4139   INTEGER ::   nadv   ! choice of the type of advection scheme 
    … …  
    130128      !!---------------------------------------------------------------------- 
    131129      INTEGER ::   ioptio 
     130 
     131      NAMELIST/nam_traadv/ ln_traadv_cen2 , ln_traadv_tvd,   & 
     132         &                 ln_traadv_muscl, ln_traadv_muscl2, ln_traadv_ubs 
    132133      !!---------------------------------------------------------------------- 
    133134 

  • trunk/NEMO/OPA_SRC/TRA/trabbc.F90

    r503 r541  
    3535   INTEGER  ::   ngeo_flux       = 1            ! Geothermal flux (0:no flux, 1:constant flux, 2:read in file ) 
    3636   REAL(wp) ::   ngeo_flux_const = 86.4e-3      ! Constant value of geothermal heat flux 
    37    NAMELIST/nambbc/ngeo_flux, ngeo_flux_const  
    3837 
    3938   INTEGER , DIMENSION(jpi,jpj) ::   nbotlevt   ! ocean bottom level index at T-pt 
    … …  
    139138      INTEGER  ::   ji, jj              ! dummy loop indices 
    140139      INTEGER  ::   inum                ! temporary logical unit 
     140 
     141      NAMELIST/nambbc/ngeo_flux, ngeo_flux_const  
    141142      !!---------------------------------------------------------------------- 
    142143 

  • trunk/NEMO/OPA_SRC/TRA/trabbl.F90

    r503 r541  
    3636   !!* Namelist nambbl: bottom boundary layer 
    3737   REAL(wp), PUBLIC ::   atrbbl = 1.e+3   !: lateral coeff. for bottom boundary layer scheme (m2/s) 
    38    NAMELIST/nambbl/ atrbbl 
    3938 
    4039# if defined key_trabbl_dif 
    … …  
    460459      INTEGER ::   ji, jj      ! dummy loop indices 
    461460      REAL(wp),  DIMENSION(jpi,jpj) :: zmbk   
     461 
     462      NAMELIST/nambbl/ atrbbl 
    462463      !!---------------------------------------------------------------------- 
    463464 

  • trunk/NEMO/OPA_SRC/TRA/tradmp.F90

    r503 r541  
    5757   REAL(wp) ::   bdmp   =  360.   ! bottom time scale for internal damping (days) 
    5858   REAL(wp) ::   hdmp   =  800.   ! depth of transition between sdmp and bdmp (meters) 
    59    NAMELIST/namtdp/ ndmp, ndmpf, nmldmp, sdmp, bdmp, hdmp 
    6059 
    6160   !! * Substitutions 
    … …  
    190189      !! ** Method  :   read the nammbf namelist and check the parameters 
    191190      !!      called by tra_dmp at the first timestep (nit000) 
     191      !!---------------------------------------------------------------------- 
     192      NAMELIST/namtdp/ ndmp, ndmpf, nmldmp, sdmp, bdmp, hdmp 
    192193      !!---------------------------------------------------------------------- 
    193194 

  • trunk/NEMO/OPA_SRC/TRA/tranpc.F90

    r503 r541  
    3333   INTEGER ::   nnpc1 =   1   ! nnpc1   non penetrative convective scheme frequency 
    3434   INTEGER ::   nnpc2 =  15   ! nnpc2   non penetrative convective scheme print frequency 
    35    NAMELIST/namnpc/ nnpc1, nnpc2 
    3635 
    3736   !! * Substitutions 
    … …  
    230229      !! ** Purpose :   initializations of the non-penetrative adjustment scheme 
    231230      !!---------------------------------------------------------------------- 
     231      NAMELIST/namnpc/ nnpc1, nnpc2 
    232232      ! 
    233233      REWIND( numnam )           ! Namelist namzdf : vertical diffusion 

  • trunk/NEMO/OPA_SRC/TRA/traqsr.F90

    r503 r541  
    3737   REAL(wp), PUBLIC ::   xsi2 = 23.0_wp       ! second depth of extinction (default values: water type Ib) 
    3838   LOGICAL , PUBLIC ::   ln_qsr_sms = .false. ! flag to use or not the biological fluxes for light  
    39    NAMELIST/namqsr/ ln_traqsr, rabs, xsi1, xsi2, ln_qsr_sms 
    4039    
    4140   INTEGER ::   nksr   ! number of levels 
    … …  
    193192      REAL(wp) ::   zc0 , zc1 , zc2    ! temporary scalars 
    194193      REAL(wp) ::   zcst, zdp1, zdp2   !    "         " 
     194 
     195      NAMELIST/namqsr/ ln_traqsr, rabs, xsi1, xsi2, ln_qsr_sms 
    195196      !!---------------------------------------------------------------------- 
    196197 

  • trunk/NEMO/OPA_SRC/ZDF/zdftke.F90

    r516 r541  
    6969      &                  emin0 = 1.e-4_wp     ,  &  !: surface minimum value of tke (m2/s2) 
    7070      &                  ri_c  = 2._wp / 9._wp      !: critic Richardson number 
    71    NAMELIST/namtke/ ln_rstke, ediff, ediss, ebb, efave, emin, emin0,   & 
    72       &             ri_c, nitke, nmxl, npdl, nave, navb 
    7371 
    7472# if defined key_cfg_1d 
    … …  
    625623      INTEGER ::           jk   ! dummy loop indices 
    626624# endif 
     625 
     626      NAMELIST/namtke/ ln_rstke, ediff, ediss, ebb, efave, emin, emin0,   & 
     627         &             ri_c, nitke, nmxl, npdl, nave, navb 
    627628      !!---------------------------------------------------------------------- 
    628629 
Note: See TracChangeset for help on using the changeset viewer.