diff --git a/config/namelist.oce b/config/namelist.oce index 7af6867f7..34b6aff51 100644 --- a/config/namelist.oce +++ b/config/namelist.oce @@ -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 / diff --git a/src/fesom_module.F90 b/src/fesom_module.F90 index 734560cd5..2ed97d36e 100755 --- a/src/fesom_module.F90 +++ b/src/fesom_module.F90 @@ -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' @@ -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 diff --git a/src/oce_ale_vel_rhs.F90 b/src/oce_ale_vel_rhs.F90 index 3b0d96de7..2cf0ab2b0 100644 --- a/src/oce_ale_vel_rhs.F90 +++ b/src/oce_ale_vel_rhs.F90 @@ -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) diff --git a/src/oce_modules.F90 b/src/oce_modules.F90 index 9eb95f665..4b5b51c56 100755 --- a/src/oce_modules.F90 +++ b/src/oce_modules.F90 @@ -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