Changeset 4281


Ignore:
Timestamp:
06/28/10 16:19:30 (15 years ago)
Author:
seroussi
Message:

updated testsgetfields for all the solutions

File:
1 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/src/m/utils/Nightly/testsgetfields.m

    r4279 r4281  
    2323if (analysis_type==DiagnosticSolutionEnum),
    2424        if control,
    25                 fields={,'DiagnosticAnalysis.Vel.value','DiagnosticAnalysis.J.value','DiagnosticAnalysis.parameter.value'};
     25                field_names={'Vel','J','parameter'};
     26                vel=zeros(md.numberofgrids,1);
     27                vel(md.results.DiagnosticAnalysis.Vel.index)=md.results.DiagnosticAnalysis.Vel.value;
     28                j=zeros(md.numberofgrids,1);
     29                j(md.results.DiagnosticAnalysis.J.index)=md.results.DiagnosticAnalysis.J.value;
     30                parameter=zeros(md.numberofgrids,1);
     31                parameter(md.results.DiagnosticAnalysis.parameter.index)=md.results.DiagnosticAnalysis.parameter.value;
     32                field_values={vel,j,parameter};
    2633        elseif qmu,
    2734                fields={'dakota.importancefactors'};
    2835        else
    2936                if md.dim==3
    30                         fields={'DiagnosticAnalysis.Vy.value','DiagnosticAnalysis.Vz.value'};
     37                        field_names={'Vy','Vz'};
     38                        vy=zeros(md.numberofgrids,1);
     39                        vy(md.results.DiagnosticAnalysis.Vy.index)=md.results.DiagnosticAnalysis.Vy.value;
     40                        vz=zeros(md.numberofgrids,1);
     41                        vz(md.results.DiagnosticAnalysis.Vz.index)=md.results.DiagnosticAnalysis.Vz.value;
     42                        field_values={vy,vz};
    3143                else
    3244                        field_names={'Vel'};
    … …  
    3850
    3951elseif (analysis_type==ThermalSolutionEnum),
    40         fields={'ThermalSolution(end).temperature','ThermalSolution(end).melting'};
     52        field_names={'Temperature','Melting'};
     53        temperature=zeros(md.numberofgrids,1);
     54        temperature(md.results.ThermalAnalysis(end).Temperature.index)=md.results.ThermalAnalysis(end).Temperature.value;
     55        melting=zeros(md.numberofgrids,1);
     56        melting(md.results.ThermalAnalysis(end).Melting.index)=md.results.ThermalAnalysis(end).Melting.value;
     57        field_values={temperature,melting};
    4158
    4259elseif (analysis_type==PrognosticSolutionEnum),
    … …  
    4764
    4865elseif (analysis_type==Prognostic2SolutionEnum),
    49         fields={'Prognostic2Solution.thickness'};
     66        field_names={'Thickness'};
     67        thickness=zeros(md.numberofgrids,1);
     68        thickness(md.results.Prognostic2Analysis.Thickness.index)=md.results.Prognostic2Analysis.Thickness.value;
     69        field_values={thickness};
    5070
    5171elseif (analysis_type==Transient2DSolutionEnum),
    52         fields={'TransientSolution(end).vel','TransientSolution(end).thickness','TransientSolution(end).surface','TransientSolution(end).bed'};
    5372        field_names={'Vel','Thickness','Surface','Bed'};
    5473        vel=zeros(md.numberofgrids,1);
    … …  
    6382
    6483elseif (analysis_type==Transient3DSolutionEnum),
    65         fields={'TransientSolution(end).vel','TransientSolution(end).pressure','TransientSolution(end).temperature','TransientSolution(end).melting','TransientSolution(end).thickness','TransientSolution(end).surface','TransientSolution(end).bed'};
     84        field_names={'Vel','Pressure','Temperature','Melting','Thickness','Surface','Bed'};
     85        vel=zeros(md.numberofgrids,1);
     86        vel(md.results.Transient3DAnalysis(end).Vel.index)=md.results.Transient3DAnalysis(end).Vel.value;
     87        pressure=zeros(md.numberofgrids,1);
     88        pressure(md.results.Transient3DAnalysis(end).Pressure.index)=md.results.Transient3DAnalysis(end).Pressure.value;
     89        temperature=zeros(md.numberofgrids,1);
     90        temperature(md.results.Transient3DAnalysis(end).Temperature.index)=md.results.Transient3DAnalysis(end).Temperature.value;
     91        melting=zeros(md.numberofgrids,1);
     92        melting(md.results.Transient3DAnalysis(end).Melting.index)=md.results.Transient3DAnalysis(end).Melting.value;
     93        thickness=zeros(md.numberofgrids,1);
     94        thickness(md.results.Transient3DAnalysis(end).Thickness.index)=md.results.Transient3DAnalysis(end).Thickness.value;
     95        surface=zeros(md.numberofgrids,1);
     96        surface(md.results.Transient3DAnalysis(end).Surface.index)=md.results.Transient3DAnalysis(end).Surface.value;
     97        bed=zeros(md.numberofgrids,1);
     98        bed(md.results.Transient3DAnalysis(end).Bed.index)=md.results.Transient3DAnalysis(end).Bed.value;
     99        field_values={vel,pressure,temperature,melting,thickness,surface,bed};
    66100
    67101elseif (analysis_type==SteadystateSolutionEnum),
    68102        if control,
    69                 fields={'SteadystateSolution.vel','SteadystateSolution.J','SteadystateSolution.parameter'};
     103                field_names={'Vel','J','parameter'};
     104                vel=zeros(md.numberofgrids,1);
     105                vel(md.results.SteadystateAnalysis.Vel.index)=md.results.SteadystateAnalysis.Vel.value;
     106                j=zeros(md.numberofgrids,1);
     107                j(md.results.SteadystateAnalysis.J.index)=md.results.SteadystateAnalysis.J.value;
     108                parameter=zeros(md.numberofgrids,1);
     109                parameter(md.results.SteadystateAnalysis.parameter.index)=md.results.SteadystateAnalysis.parameter.value;
     110                field_values={vel,j,parameter};
    70111        else
    71                 fields={'SteadystateSolution.vel','SteadystateSolution.pressure','SteadystateSolution.temperature'};
     112                field_names={'Vel','Pressure','Temperature'};
     113                vel=zeros(md.numberofgrids,1);
     114                vel(md.results.SteadystateAnalysis.Vel.index)=md.results.SteadystateAnalysis.Vel.value;
     115                presure=zeros(md.numberofgrids,1);
     116                presure(md.results.SteadystateAnalysis.Pressure.index)=md.results.SteadystateAnalysis.Pressure.value;
     117                temperature=zeros(md.numberofgrids,1);
     118                temperature(md.results.SteadystateAnalysis.Temperature.index)=md.results.SteadystateAnalysis.Temperature.value;
     119                field_values={vel,pressure,temperature};
    72120        end
    73121
    … …  
    79127
    80128elseif (analysis_type==SlopeSolutionEnum),
    81         fields={'SlopeSolution.slopex','SlopeSolution.slopey'};
     129        field_names={'Slopex','Slopey'};
     130        slopex=zeros(md.numberofgrids,1);
     131        slopex(md.results.DiagnosticAnalysis.Slopex.index)=md.results.DiagnosticAnalysis.Slopex.value;
     132        slopey=zeros(md.numberofgrids,1);
     133        slopey(md.results.DiagnosticAnalysis.Slopey.index)=md.results.DiagnosticAnalysis.Slopey.value;
     134        field_values={slopex,slopey};
    82135
    83136else
Note: See TracChangeset for help on using the changeset viewer.