Index: ../trunk-jpl/test/NightlyRun/test2084.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test2084.m (revision 26234) +++ ../trunk-jpl/test/NightlyRun/test2084.m (revision 26235) @@ -23,20 +23,49 @@ md.materials.density= [1.0750e4 1.0750e+04 4.9780e+03 3.8710e+03 3.4380e+03 3.0370e+03]'; md.materials.lame_mu= [1e-5 0 2.2834e+00 1.0549e+00 7.0363e-01 5.0605e-01]'*1e11; md.materials.viscosity=[0 0 2.0000e+00 1.0000e+00 1.0000e+00 1.0000e+25]'*1e21; -md.materials.lame_lambda=md.materials.lame_mu*0+5e14; +md.materials.lame_lambda=md.materials.lame_mu*0+5e17; md.materials.issolid=[1 0 1 1 1 1]'; -md.materials.isburgers=zeros(md.materials.numlayers,1); +md.materials.rheologymodel=2*ones(md.materials.numlayers,1); +md.materials.burgers_mu=md.materials.lame_mu/3; +md.materials.burgers_viscosity=md.materials.viscosity/10; +md.materials.ebm_alpha= ones(md.materials.numlayers,1)*.9; +md.materials.ebm_delta= ones(md.materials.numlayers,1)*0.2; +md.materials.ebm_taul= ones(md.materials.numlayers,1)*54*60; %54min +md.materials.ebm_tauh= ones(md.materials.numlayers,1)*18.6*cst/1e3; %18.6yr +%setlitho2prem(md.materials) md.love.allow_layer_deletion=1; md.love.frequencies=([0]*2*pi)'/cst; md.love.nfreq=length(md.love.frequencies); +md.love.sh_nmin=1; md.love.sh_nmax=256; +md.love.underflow_tol=1e-20; +md.love.Gravitational_Constant=6.6732e-11; +md.love.integration_steps_per_layer=200; -md.materials.burgers_mu=md.materials.lame_mu; -md.materials.burgers_viscosity=md.materials.viscosity; +md.love.istemporal=1; +md.love.n_temporal_iterations=8; +%md.love.time=(logspace(-4,5, 2))'*cst; +md.love.time=(logspace(-1,2, 50))'*cst; +md.love.love_kernels=1; +if md.love.istemporal +md.love=md.love.build_frequencies_from_time; +end + md=solve(md,'lv'); +ht2=md.results.LoveSolution.LoveHr; +lt2=md.results.LoveSolution.LoveLr; +kt2=md.results.LoveSolution.LoveKr; +t=md.love.time/cst*1e3; + +%hs=reshape(md.results.LoveSolution.LoveHi(:,:), [ md.love.sh_nmax+1, 2*md.love.n_temporal_iterations, length(t)]); +%hs=permute(hs,[3 2 1]); +%[ht,h,hsig,hconv]=postwidder_love(md,md.love.n_temporal_iterations,t,hs,1e-5); + + + %Fields and tolerances to track changes %loading love numbers field_names ={'LoveH_loading_elastic','LoveK_loading_elastic','LoveL_loading_elastic'}; @@ -47,6 +76,7 @@ (md.results.LoveSolution.LoveLr(:,1)),... }; + % validate elastic loading solutions against the Spada benchmark. {{{ if validation spada_solutions = load('spada_elastic_loading_deg_h_l_k'); @@ -168,7 +198,7 @@ %md.materials.viscosity=md.materials.viscosity.*md.materials.issolid; %md.materials.burgers_mu=md.materials.lame_mu; %md.materials.burgers_viscosity=md.materials.viscosity; -%md.materials.isburgers=md.materials.issolid*0; +%md.materials.rheologymodel=md.materials.issolid*0; %md.love.forcing_type=11; %md.materials.numlayers=length(md.materials.viscosity); %md=solve(md,'lv'); @@ -197,7 +227,7 @@ md.materials.numlayers=length(md.materials.lame_mu); md.materials.burgers_mu=md.materials.lame_mu; md.materials.burgers_viscosity=md.materials.viscosity; -md.materials.isburgers=md.materials.issolid*0; +md.materials.rheologymodel=md.materials.issolid*0; md.love.forcing_type=11; md.love.sh_nmin=1; md.love.sh_nmax=100;