Changeset 23235


Ignore:
Timestamp:
09/10/18 13:21:48 (7 years ago)
Author:
kruegern
Message:

CHG: fixed 2084 so that python and matlab versions test names and tolerances match

Location:
issm/trunk-jpl/test/NightlyRun
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/test/NightlyRun/test2084.m

    r23224 r23235  
    1 
    2 %Test Name: GiaCaron.
     1%Test Name: GiaCaron
    32%Forward Love number solution for a viscoelastic earth, model M3-L70-V01 from
    43%Spada, G., Barletta, V. R., Klemann, V., Riva, R. E. M., Martinec, Z.,
    … …  
    3938%loading love numbers
    4039field_names     ={'LoveH_loading_elastic','LoveK_loading_elastic','LoveL_loading_elastic'};
    41 field_tolerances={7.0e-10,7.0e-10,7.0e-10};
     40field_tolerances={4.3e-9,4.3e-9,4.3e-9};
    4241field_values={...
    4342        (md.results.LoveSolution.LoveHr(:,1)),...
    … …  
    5756%Fields and tolerances to track changes
    5857field_names     ={field_names{:},'LoveH_loading_realpart','LoveK_loading_realpart','LoveL_loading_realpart','LoveH_loading_imagpart','LoveK_loading_imagpart','LoveL_loading_imagpart'};
    59 field_tolerances={field_tolerances{:},5e-7,5e-7,5e-7,5e-7,5e-7,5e-7};
     58field_tolerances={field_tolerances{:},4.3e-9,4.3e-9,4.3e-9,4.3e-9,4.3e-9,4.3e-9};
    6059field_values={field_values{:},...
    6160        (md.results.LoveSolution.LoveHr(:,:)),...
    … …  
    7574%tidal love numbers
    7675field_names     ={field_names{:},'LoveH_tidal_elastic','LoveK_tidal_elastic','LoveL_tidal_elastic','LoveH_tidal_realpart','LoveK_tidal_realpart','LoveL_tidal_realpart','LoveH_tidal_imagpart','LoveK_tidal_imagpart','LoveL_tidal_imagpart'};
    77 field_tolerances={field_tolerances{:},3e-6,3e-6,3e-6,3e-6,3e-6,3e-6,3e-6,3e-6,3e-6};
     76field_tolerances={field_tolerances{:},4.3e-9,4.3e-9,4.3e-9,4.3e-9,4.3e-9,4.3e-9,4.3e-9,4.3e-9,4.3e-9};
    7877field_values={field_values{:},...
    7978        (md.results.LoveSolution.LoveHr(:,1)),...
    … …  
    115114%
    116115%field_names     ={field_names{:},'LoveH_loadingVSS96_elastic','LoveK_loadingVSS96_elastic','LoveL_loadingVSS96_elastic','LoveH_loadingVSS96_realpart','LoveK_loadingVSS96_realpart','LoveL_loadingVSS96_realpart','LoveH_loadingVSS96_imagpart','LoveK_loadingVSS96_imagpart','LoveL_loadingVSS96_imagpart'};
    117 %field_tolerances={field_tolerances{:},2e-7,2e-7,2e-7,2e-7,2e-7,2e-7,2e-7,2e-7,2e-7};
     116%field_tolerances={field_tolerances{:},4.3e-9,4.3e-9,4.3e-9,4.3e-9,4.3e-9,4.3e-9,4.3e-9,4.3e-9,4.3e-9};
    118117%field_values={field_values{:},...
    119118%       (md.results.LoveSolution.LoveHr(:,1)),...
    … …  
    147146
    148147field_names     ={field_names{:},'LoveH_loadingVSS96_elastic','LoveK_loadingVSS96_elastic','LoveL_loadingVSS96_elastic','LoveH_loadingVSS96_realpart','LoveK_loadingVSS96_realpart','LoveL_loadingVSS96_realpart','LoveH_loadingVSS96_imagpart','LoveK_loadingVSS96_imagpart','LoveL_loadingVSS96_imagpart'};
    149 field_tolerances={field_tolerances{:},6e-7,6e-7,6e-7,6e-7,6e-7,6e-7,6e-7,6e-7,6e-7};
     148field_tolerances={field_tolerances{:},4.3e-9,4.3e-9,4.3e-9,4.3e-9,4.3e-9,4.3e-9,4.3e-9,4.3e-9,4.3e-9};
    150149field_values={field_values{:},...
    151150        (md.results.LoveSolution.LoveHr(:,1)),...

  • issm/trunk-jpl/test/NightlyRun/test2084.py

    r23017 r23235  
    1 #Test Name: GiaCaron. Forward Love number solution for a viscoelastic earth,
    2 #       model M3-L70-V01 from Spada, G., Barletta, V. R., Klemann, V., Riva, R. E. M.,
    3 #       Martinec, Z., Gasperini, P., Lund, B., Wolf, D., Vermeersen, L. L. A.
    4 #       and King, M. A. (2011), A benchmark study for glacial isostatic
    5 #       adjustment codes. Geophysical Journal International,
    6 #       185: 106-132. doi:10.1111/j.1365-246X.2011.04952.x
     1#Test Name: GiaCaron
     2#Forward Love number solution for a viscoelastic earth,
     3#model M3-L70-V01 from Spada, G., Barletta, V. R., Klemann, V., Riva, R. E. M.,
     4#Martinec, Z., Gasperini, P., Lund, B., Wolf, D., Vermeersen, L. L. A.
     5#and King, M. A. (2011), A benchmark study for glacial isostatic
     6#adjustment codes. Geophysical Journal International,
     7#185: 106-132. doi:10.1111/j.1365-246X.2011.04952.x
    78
    89from model import *
    … …  
    4849#Fields and tolerances to track changes
    4950#loading love numbers
    50 field_names=['LoveHe','LoveKe','LoveLe']
    51 field_tolerances=[3.7e-9,3.7e-9,3.7e-9]
     51field_names=['LoveH_loading_elastic','LoveK_loading_elastic','LoveL_loading_elastic']
     52field_tolerances=[4.3e-9,4.3e-9,4.3e-9]
    5253field_values=[
    5354np.array(md.results.LoveSolution.LoveHr)[:,0],
    … …  
    6768#Fields and tolerances to track changes
    6869#loading love numbers
    69 field_names+=['LoveHlr','LoveKlr','LoveLlr','LoveHli','LoveKli','LoveLli']
    70 field_tolerances+=[3.7e-9,3.7e-9,3.7e-9,3.7e-9,3.7e-9,3.7e-9]
     70field_names+=['LoveH_loading_realpart','LoveK_loading_realpart','LoveL_loading_realpart','LoveH_loading_imagpart','LoveK_loading_imagpart','LoveL_loading_imagpart']
     71field_tolerances+=[4.3e-9,4.3e-9,4.3e-9,4.3e-9,4.3e-9,4.3e-9]
    7172field_values+=[
    7273np.array(md.results.LoveSolution.LoveHr),
    … …  
    8788
    8889#tidal love numbers, check
    89 field_names+=['LoveHtr','LoveKtr','LoveLtr','LoveHti','LoveKti','LoveLti']
    90 field_tolerances+=[3.7e-9,3.7e-9,3.7e-9,3.7e-9,3.7e-9,3.7e-9,3.7e-9,3.7e-9,3.7e-9]
     90field_names+=['LoveH_tidal_elastic','LoveK_tidal_elastic','LoveL_tidal_elastic','LoveH_tidal_realpart','LoveK_tidal_realpart','LoveL_tidal_realpart','LoveH_tidal_imagpart','LoveK_tidal_imagpart','LoveL_tidal_imagpart']
     91field_tolerances+=[4.3e-9,4.3e-9,4.3e-9,4.3e-9,4.3e-9,4.3e-9,4.3e-9,4.3e-9,4.3e-9]
    9192field_values+=[
    9293np.array(md.results.LoveSolution.LoveHr)[:,0],
    … …  
    127128#md=solve(md,'lv')
    128129#
    129 #field_names=[field_names,'LoveHmr','LoveKmr','LoveLmr','LoveHmi','LoveKmi','LoveLmi']
    130 #field_tolerances=[field_tolerances,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13]
     130#field_names=[field_names,'LoveH_loadingVSS96_elastic','LoveK_loadingVSS96_elastic','LoveL_loadingVSS96_elastic','LoveH_loadingVSS96_realpart','LoveK_loadingVSS96_realpart','LoveL_loadingVSS96_realpart','LoveH_loadingVSS96_imagpart','LoveK_loadingVSS96_imagpart','LoveL_loadingVSS96_imagpart']
     131#field_tolerances=[field_tolerances,4.3e-9,4.3e-9,4.3e-9,4.3e-9,4.3e-9,4.3e-9,4.3e-9,4.3e-9,4.3e-9]
    131132#field_values=[field_values,\
    132133#       (md.results.LoveSolution.LoveHr[:][0]),\
    … …  
    186187md.love.nfreq=len(md.love.frequencies)
    187188
    188 field_names+=['LoveHmr','LoveKmr','LoveLmr','LoveHmi','LoveKmi','LoveLmi']
    189 field_tolerances+=[3.7e-9,3.7e-9,3.7e-9,3.7e-9,3.7e-9,3.7e-9,3.7e-9,3.7e-9,3.7e-9]
     189field_names+=['LoveH_loadingVSS96_elastic','LoveK_loadingVSS96_elastic','LoveL_loadingVSS96_elastic','LoveH_loadingVSS96_realpart','LoveK_loadingVSS96_realpart','LoveL_loadingVSS96_realpart','LoveH_loadingVSS96_imagpart','LoveK_loadingVSS96_imagpart','LoveL_loadingVSS96_imagpart']
     190field_tolerances+=[4.3e-9,4.3e-9,4.3e-9,4.3e-9,4.3e-9,4.3e-9,4.3e-9,4.3e-9,4.3e-9]
    190191field_values+=[
    191192np.array(md.results.LoveSolution.LoveHr)[:,0],
Note: See TracChangeset for help on using the changeset viewer.