Ignore:
Timestamp:
2020-07-09T12:39:43+02:00 (3 months ago)
Author:
clem
Message:

merge with r4.0-HEAD at r13278

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2020/r4.0-HEAD_r12713_clem_dan_fixcpl/src/OCE/STO/stopar.F90

    r11536 r13279  
    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.