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

Changeset 13255


Ignore:
Timestamp:
2020-07-06T17:41:29+02:00 (4 years ago)
Author:
acc
Message:

r4.0-HEAD minor changes to satisfy namelist integrity checks. See #2486 and wiki:Developers/NamelistChecker for details. Fully SETTE tested

Location:
NEMO/releases/r4.0/r4.0-HEAD
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • NEMO/releases/r4.0/r4.0-HEAD/cfgs/SHARED/namelist_pisces_ref

    r11536 r13255  
    197197   mpratn     =  0.01     ! nanophytoplankton mortality rate 
    198198   mpratp     =  0.01     ! picophytoplankton mortality rate 
    199    mprat2     =  0.01     ! Diatoms mortality rate 
     199   mpratd     =  0.01     ! Diatoms mortality rate 
    200200/ 
    201201!----------------------------------------------------------------------- 
    … …  
    230230   resrat2    =  0.005    ! exsudation rate of mesozooplankton 
    231231   mzrat2     =  0.02     ! mesozooplankton mortality rate 
    232    xpref2d    =  1.       ! zoo preference for phyto 
    233    xpref2p    =  1.       ! zoo preference for POC 
     232   xpref2d    =  1.       ! zoo preference for Diatoms 
     233   xpref2n    =  1.       ! zoo preference for nanophyto 
    234234   xpref2z    =  1.       ! zoo preference for zoo 
    235    xpref2m    =  0.2      ! meso preference for zoo 
    236    xpref2c    =  0.3      ! zoo preference for poc 
     235   xpref2m    =  0.2      ! zoo preference for mesozoo 
     236   xpref2c    =  0.3      ! zoo preference for POC 
    237237   xthresh2zoo = 1E-8     ! zoo feeding threshold for mesozooplankton 
    238238   xthresh2dia = 1E-8     ! diatoms feeding threshold for mesozooplankton 

  • NEMO/releases/r4.0/r4.0-HEAD/cfgs/SHARED/namelist_ref

    r12288 r13255  
    417417      rn_dep_max  = 150.      !  depth over which runoffs is spread ( ln_rnf_depth_ini = .true ) 
    418418      nn_rnf_depth_file = 0   !  create (=1) a runoff depth file or not (=0) 
     419   ln_rnf_icb  = .false.   !  read in iceberg flux from a file (fill sn_i_rnf if .true.) 
    419420 
    420421   cn_dir      = './'      !  root directory for the runoff data location 
    … …  
    427428   sn_t_rnf    = 'runoffs'               ,        24.        , 'rotemper',   .true.    , .true. , 'yearly'  , ''               , ''       , '' 
    428429   sn_dep_rnf  = 'runoffs'               ,         0.        , 'rodepth' ,   .false.   , .true. , 'yearly'  , ''               , ''       , '' 
     430   sn_i_rnf    = 'NOT_USED'              ,        -1.        , 'sorunoff',   .true.    , .true. , 'yearly'  , ''               , ''       , '' 
    429431/ 
    430432!----------------------------------------------------------------------- 

  • NEMO/releases/r4.0/r4.0-HEAD/cfgs/SHARED/namelist_top_ref

    r11536 r13255  
    122122   nn_ctls_trc   =   0       !  control surface type in mixed-layer trends (0,1 or n<jpk) 
    123123   rn_ucf_trc    =   1       !  unit conversion factor (=1 -> /seconds ; =86400. -> /day) 
    124    ln_trdmld_trc_restart = .false. !  restart for ML diagnostics 
    125    ln_trdmld_trc_instant = .true.  !  flag to diagnose trends of instantantaneous or mean ML T/S 
     124   ln_trdmxl_trc_restart = .false.   !  restart for ML diagnostics 
     125   ln_trdmxl_trc_instant = .true.    !  flag to diagnose trends of instantantaneous or mean ML T/S 
     126   cn_trdrst_trc_in  = 'restart_trd' !  suffix of pass. tracer trends restart name (input) 
     127   cn_trdrst_trc_out = 'restart_trd' !  suffix of pass. tracer trends restart name (output) 
    126128   ln_trdtrc( 1) = .true. 
    127129   ln_trdtrc( 2) = .true. 

  • NEMO/releases/r4.0/r4.0-HEAD/src/OCE/BDY/bdydta.F90

    r12910 r13255  
    396396      TYPE(FLD  ), DIMENSION(:), POINTER ::   bf_alias 
    397397      ! 
    398       NAMELIST/nambdy_dta/ cn_dir, bn_tem, bn_sal, bn_u3d, bn_v3d, bn_ssh, bn_u2d, bn_v2d  
    399       NAMELIST/nambdy_dta/ bn_a_i, bn_h_i, bn_h_s, bn_t_i, bn_t_s, bn_tsu, bn_s_i, bn_aip, bn_hip 
    400       NAMELIST/nambdy_dta/ rn_ice_tem, rn_ice_sal, rn_ice_age, rn_ice_apnd, rn_ice_hpnd 
    401       NAMELIST/nambdy_dta/ ln_full_vel, ln_zinterp 
     398      NAMELIST/nambdy_dta/ cn_dir, bn_tem, bn_sal, bn_u3d, bn_v3d, bn_ssh, bn_u2d, bn_v2d,         & 
     399                         & bn_a_i, bn_h_i, bn_h_s, bn_t_i, bn_t_s, bn_tsu, bn_s_i, bn_aip, bn_hip, & 
     400                         & rn_ice_tem, rn_ice_sal, rn_ice_age, rn_ice_apnd, rn_ice_hpnd,           & 
     401                         & ln_full_vel, ln_zinterp 
    402402      !!--------------------------------------------------------------------------- 
    403403      ! 

  • NEMO/releases/r4.0/r4.0-HEAD/src/OCE/ICB/icb_oce.F90

    r10702 r13255  
    122122   LOGICAL , PUBLIC ::   ln_operator_splitting           !: Use first order operator splitting for thermodynamics 
    123123   LOGICAL , PUBLIC ::   ln_passive_mode                 !: iceberg - ocean decoupling 
    124    LOGICAL , PUBLIC ::   ln_time_average_weight          !: Time average the weight on the ocean    !!gm I don't understand that ! 
    125124   REAL(wp), PUBLIC ::   rn_speed_limit                  !: CFL speed limit for a berg 
    126125   ! 

  • NEMO/releases/r4.0/r4.0-HEAD/src/OCE/ICB/icbini.F90

    r11536 r13255  
    382382         &              rn_rho_bergs   , rn_LoW_ratio   , nn_verbose_level    , ln_operator_splitting,   & 
    383383         &              rn_bits_erosion_fraction        , rn_sicn_shift       , ln_passive_mode      ,   & 
    384          &              ln_time_average_weight          , nn_test_icebergs    , rn_test_box          ,   & 
    385          &              ln_use_calving , rn_speed_limit , cn_dir, sn_icb 
     384         &              nn_test_icebergs                , rn_test_box         , ln_use_calving       ,   & 
     385         &              rn_speed_limit , cn_dir, sn_icb 
    386386      !!---------------------------------------------------------------------- 
    387387 
    … …  
    468468         WRITE(numout,*) '   Do not add freshwater flux from icebergs to ocean                ',   & 
    469469            &                    '                  passive_mode            = ', ln_passive_mode 
    470          WRITE(numout,*) '   Time average the weight on the ocean   time_average_weight       = ', ln_time_average_weight 
    471470         WRITE(numout,*) '   Create icebergs in absence of a restart file   nn_test_icebergs  = ', nn_test_icebergs 
    472471         WRITE(numout,*) '                   in lon/lat box                                   = ', rn_test_box 

  • NEMO/releases/r4.0/r4.0-HEAD/src/OCE/SBC/sbcrnf.F90

    r12277 r13255  
    4747   TYPE(FLD_N)       , PUBLIC ::   sn_rnf            !: information about the runoff file to be read 
    4848   TYPE(FLD_N)                ::   sn_cnf            !: information about the runoff mouth file to be read 
    49    TYPE(FLD_N)                ::   sn_i_rnf        !: information about the iceberg flux file to be read 
     49   TYPE(FLD_N)                ::   sn_i_rnf          !: information about the iceberg flux file to be read 
    5050   TYPE(FLD_N)                ::   sn_s_rnf          !: information about the salinities of runoff file to be read 
    5151   TYPE(FLD_N)                ::   sn_t_rnf          !: information about the temperatures of runoff file to be read 

  • NEMO/releases/r4.0/r4.0-HEAD/src/OCE/SBC/sbcwave.F90

    r12737 r13255  
    392392      ! 
    393393      NAMELIST/namsbc_wave/  sn_cdg, cn_dir, sn_usd, sn_vsd, sn_hsw, sn_wmp, sn_wfr, & 
    394                              sn_wnum, sn_tauwoc, sn_tauwx, sn_tauwy 
     394                          &  sn_wnum, sn_tauwoc, sn_tauwx, sn_tauwy 
    395395      !!--------------------------------------------------------------------- 
    396396      ! 

  • NEMO/releases/r4.0/r4.0-HEAD/src/OCE/STO/stopar.F90

    r11536 r13255  
    245245      !! ** Purpose :   define the stochastic parameterization 
    246246      !!---------------------------------------------------------------------- 
    247       NAMELIST/namsto/ ln_sto_ldf, rn_ldf_std, rn_ldf_tcor, & 
    248         &              ln_sto_hpg, rn_hpg_std, rn_hpg_tcor, & 
    249         &              ln_sto_pstar, rn_pstar_std, rn_pstar_tcor, nn_pstar_flt, nn_pstar_ord, & 
    250         &              ln_sto_trd, rn_trd_std, rn_trd_tcor, & 
    251         &              ln_sto_eos, nn_sto_eos, rn_eos_stdxy, rn_eos_stdz, & 
    252         &              rn_eos_tcor, nn_eos_ord, nn_eos_flt, rn_eos_lim, & 
    253         &              ln_sto_trc, nn_sto_trc, rn_trc_stdxy, rn_trc_stdz, & 
    254         &              rn_trc_tcor, nn_trc_ord, nn_trc_flt, rn_trc_lim, & 
     247      ! stochastic equation of state only (for now) 
     248      NAMELIST/namsto/ ln_sto_eos, nn_sto_eos, rn_eos_stdxy, rn_eos_stdz, & 
     249        &              rn_eos_tcor, nn_eos_ord, nn_eos_flt, rn_eos_lim,   & 
    255250        &              ln_rststo, ln_rstseed, cn_storst_in, cn_storst_out 
     251      !NAMELIST/namsto/ ln_sto_ldf, rn_ldf_std, rn_ldf_tcor, & 
     252      !  &              ln_sto_hpg, rn_hpg_std, rn_hpg_tcor, & 
     253      !  &              ln_sto_pstar, rn_pstar_std, rn_pstar_tcor, nn_pstar_flt, nn_pstar_ord, & 
     254      !  &              ln_sto_trd, rn_trd_std, rn_trd_tcor, & 
     255      !  &              ln_sto_trc, nn_sto_trc, rn_trc_stdxy, rn_trc_stdz, & 
     256      !  &              rn_trc_tcor, nn_trc_ord, nn_trc_flt, rn_trc_lim 
    256257      !!---------------------------------------------------------------------- 
    257258      INTEGER :: jsto, jmem, jarea, jdof, jord, jordm1, jk, jflt 
    … …  
    261262 
    262263      ! Read namsto namelist : stochastic parameterization 
    263       REWIND( numnam_ref )              ! Namelist namdyn_adv in reference namelist : Momentum advection scheme 
     264      REWIND( numnam_ref )              ! Namelist namsto in reference namelist : stochastic parameterization 
    264265      READ  ( numnam_ref, namsto, IOSTAT = ios, ERR = 901) 
    265266901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namsto in reference namelist' ) 
    266267 
    267       REWIND( numnam_cfg )              ! Namelist namdyn_adv in configuration namelist : Momentum advection scheme 
     268      REWIND( numnam_cfg )              ! Namelist namsto in configuration namelist : stochastic parameterization 
    268269      READ  ( numnam_cfg, namsto, IOSTAT = ios, ERR = 902 ) 
    269270902   IF( ios >  0 ) CALL ctl_nam ( ios , 'namsto in configuration namelist' ) 
Note: See TracChangeset for help on using the changeset viewer.