Changeset 13255 for NEMO/releases/r4.0/r4.0-HEAD/src/OCE
- Timestamp:
- 2020-07-06T17:41:29+02:00 (4 years ago)
- Location:
- NEMO/releases/r4.0/r4.0-HEAD/src/OCE
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/releases/r4.0/r4.0-HEAD/src/OCE/BDY/bdydta.F90
r12910 r13255 396 396 TYPE(FLD ), DIMENSION(:), POINTER :: bf_alias 397 397 ! 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_hip400 NAMELIST/nambdy_dta/ rn_ice_tem, rn_ice_sal, rn_ice_age, rn_ice_apnd, rn_ice_hpnd401 NAMELIST/nambdy_dta/ln_full_vel, ln_zinterp398 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 402 402 !!--------------------------------------------------------------------------- 403 403 ! -
NEMO/releases/r4.0/r4.0-HEAD/src/OCE/ICB/icb_oce.F90
r10702 r13255 122 122 LOGICAL , PUBLIC :: ln_operator_splitting !: Use first order operator splitting for thermodynamics 123 123 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 !125 124 REAL(wp), PUBLIC :: rn_speed_limit !: CFL speed limit for a berg 126 125 ! -
NEMO/releases/r4.0/r4.0-HEAD/src/OCE/ICB/icbini.F90
r11536 r13255 382 382 & rn_rho_bergs , rn_LoW_ratio , nn_verbose_level , ln_operator_splitting, & 383 383 & 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_icb384 & nn_test_icebergs , rn_test_box , ln_use_calving , & 385 & rn_speed_limit , cn_dir, sn_icb 386 386 !!---------------------------------------------------------------------- 387 387 … … 468 468 WRITE(numout,*) ' Do not add freshwater flux from icebergs to ocean ', & 469 469 & ' passive_mode = ', ln_passive_mode 470 WRITE(numout,*) ' Time average the weight on the ocean time_average_weight = ', ln_time_average_weight471 470 WRITE(numout,*) ' Create icebergs in absence of a restart file nn_test_icebergs = ', nn_test_icebergs 472 471 WRITE(numout,*) ' in lon/lat box = ', rn_test_box -
NEMO/releases/r4.0/r4.0-HEAD/src/OCE/SBC/sbcrnf.F90
r12277 r13255 47 47 TYPE(FLD_N) , PUBLIC :: sn_rnf !: information about the runoff file to be read 48 48 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 read49 TYPE(FLD_N) :: sn_i_rnf !: information about the iceberg flux file to be read 50 50 TYPE(FLD_N) :: sn_s_rnf !: information about the salinities of runoff file to be read 51 51 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 392 392 ! 393 393 NAMELIST/namsbc_wave/ sn_cdg, cn_dir, sn_usd, sn_vsd, sn_hsw, sn_wmp, sn_wfr, & 394 394 & sn_wnum, sn_tauwoc, sn_tauwx, sn_tauwy 395 395 !!--------------------------------------------------------------------- 396 396 ! -
NEMO/releases/r4.0/r4.0-HEAD/src/OCE/STO/stopar.F90
r11536 r13255 245 245 !! ** Purpose : define the stochastic parameterization 246 246 !!---------------------------------------------------------------------- 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, & 255 250 & 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 256 257 !!---------------------------------------------------------------------- 257 258 INTEGER :: jsto, jmem, jarea, jdof, jord, jordm1, jk, jflt … … 261 262 262 263 ! Read namsto namelist : stochastic parameterization 263 REWIND( numnam_ref ) ! Namelist nam dyn_adv in reference namelist : Momentum advection scheme264 REWIND( numnam_ref ) ! Namelist namsto in reference namelist : stochastic parameterization 264 265 READ ( numnam_ref, namsto, IOSTAT = ios, ERR = 901) 265 266 901 IF( ios /= 0 ) CALL ctl_nam ( ios , 'namsto in reference namelist' ) 266 267 267 REWIND( numnam_cfg ) ! Namelist nam dyn_adv in configuration namelist : Momentum advection scheme268 REWIND( numnam_cfg ) ! Namelist namsto in configuration namelist : stochastic parameterization 268 269 READ ( numnam_cfg, namsto, IOSTAT = ios, ERR = 902 ) 269 270 902 IF( ios > 0 ) CALL ctl_nam ( ios , 'namsto in configuration namelist' )
Note: See TracChangeset
for help on using the changeset viewer.