Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions config/namelist.oce
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,5 @@ visc_sh_limit=5.0e-3 ! for KPP, max visc due to shear instability
mix_scheme='KPP' ! vertical mixing scheme: KPP, PP
Ricr = 0.3 ! critical bulk Richardson Number
concv = 1.6 ! constant for pure convection (eqn. 23) (Large 1.5-1.6; MOM default 1.8)
use_global_tides=.false. ! add global tidal potential
/
9 changes: 5 additions & 4 deletions src/fesom_module.F90
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,11 @@ subroutine fesom_init(fesom_total_nsteps)
call fesom_profiler_end("ocean_setup")
#endif

! global tides
if (use_global_tides) then
call foreph_ini(yearnew, month, f%partit)
end if

! recom setup
#if defined (__recom)
if (flag_debug .and. f%mype==0) print *, achar(27)//'[34m'//' --> call recom_init'//achar(27)//'[0m'
Expand Down Expand Up @@ -555,10 +560,6 @@ subroutine fesom_runloop(current_nsteps)
call fesom_profiler_start("fesom_runloop_total")
#endif
!___MODEL TIME STEPPING LOOP________________________________________________
if (use_global_tides) then
call foreph_ini(yearnew, month, f%partit)
end if

nstart=f%from_nstep
ntotal=f%from_nstep-1+current_nsteps

Expand Down
2 changes: 1 addition & 1 deletion src/oce_ale_vel_rhs.F90
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ subroutine compute_vel_rhs(ice, dynamics, partit, mesh)
! to velocity rhs
pre = -(p_eta+p_ice+p_air)
if (use_global_tides) then
pre=pre-ssh_gp(elnodes)
pre=pre-ssh_gp(elnodes)+0.1*p_eta
end if
Fx = sum(gradient_sca(1:3, elem)*pre)
Fy = sum(gradient_sca(4:6, elem)*pre)
Expand Down
2 changes: 1 addition & 1 deletion src/oce_modules.F90
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ MODULE o_PARAM


NAMELIST /oce_dyn/ state_equation, C_d, A_ver, &
scale_area, SPP,&
scale_area, use_global_tides, SPP,&
Fer_GM, K_GM_max, K_GM_min, K_GM_bvref, K_GM_resscalorder, K_GM_rampmax, K_GM_rampmin, &
scaling_Ferreira, scaling_Rossby, scaling_resolution, scaling_FESOM14, &
Redi, visc_sh_limit, mix_scheme, Ricr, concv, which_pgf, alpha, theta, use_density_ref
Expand Down