diff --git a/config/namelist.cvmix b/config/namelist.cvmix index cd63e92f7..00754cca1 100755 --- a/config/namelist.cvmix +++ b/config/namelist.cvmix @@ -23,7 +23,9 @@ idemix_gamma = 1.570 ! constant of order one derived from the shape o idemix_jstar = 10.0 ! spectral bandwidth in modes (dimensionless) idemix_mu0 = 1.33333333 ! dissipation parameter (dimensionless) idemix_sforcusage = 0.2 -idemix_n_hor_iwe_prop_iter = 5 ! iterations for contribution from horiz. wave propagation +idemix_n_hor_iwe_prop_iter = 5 ! iterations for contribution from horiz. wave propagation +idemix_surforc_file = '/work/ollie/clidyn/forcing/IDEMIX/fourier_smooth_2005_cfsr_inert_rgrid.nc' +idemix_botforc_file = '/work/ollie/clidyn/forcing/IDEMIX/tidal_energy_gx1v6_20090205_rgrid.nc' / ! namelist for PP diff --git a/src/gen_modules_cvmix_idemix.F90 b/src/gen_modules_cvmix_idemix.F90 index 98929506d..d16ab53b3 100644 --- a/src/gen_modules_cvmix_idemix.F90 +++ b/src/gen_modules_cvmix_idemix.F90 @@ -58,10 +58,10 @@ module g_cvmix_idemix integer :: idemix_n_hor_iwe_prop_iter = 1 ! filelocation for idemix surface forcing - character(200):: idemix_surforc_file = '/work/ollie/pscholz/FORCING/IDEMIX/fourier_smooth_2005_cfsr_inert_rgrid.nc' + character(1000):: idemix_surforc_file = './fourier_smooth_2005_cfsr_inert_rgrid.nc' ! filelocation for idemix bottom forcing - character(200):: idemix_botforc_file = '/work/ollie/pscholz/FORCING/IDEMIX/tidal_energy_gx1v6_20090205_rgrid.nc' + character(1000):: idemix_botforc_file = './tidal_energy_gx1v6_20090205_rgrid.nc' namelist /param_idemix/ idemix_tau_v, idemix_tau_h, idemix_gamma, idemix_jstar, idemix_mu0, idemix_n_hor_iwe_prop_iter, & idemix_sforcusage, idemix_surforc_file, idemix_botforc_file