Changeset 4323


Ignore:
Timestamp:
06/29/10 15:35:01 (15 years ago)
Author:
seroussi
Message:

SolutionEnum in results

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r4293 r4323  
    2525                field_names={'Vel','J','parameter'};
    2626                vel=zeros(md.numberofgrids,1);
    27                 vel(md.results.DiagnosticAnalysis.Vel.index)=md.results.DiagnosticAnalysis.Vel.value;
     27                vel(md.results.DiagnosticSolution.Vel.index)=md.results.DiagnosticSolution.Vel.value;
    2828                j=zeros(md.numberofgrids,1);
    29                 j(md.results.DiagnosticAnalysis.J.index)=md.results.DiagnosticAnalysis.J.value;
     29                j(md.results.DiagnosticSolution.J.index)=md.results.DiagnosticSolution.J.value;
    3030                parameter=zeros(md.numberofgrids,1);
    31                 parameter(md.results.DiagnosticAnalysis.parameter.index)=md.results.DiagnosticAnalysis.parameter.value;
     31                parameter(md.results.DiagnosticSolution.parameter.index)=md.results.DiagnosticSolution.parameter.value;
    3232                field_values={vel,j,parameter};
    3333        elseif qmu,
    … …  
    3737                        field_names={'Vy','Vz'};
    3838                        vy=zeros(md.numberofgrids,1);
    39                         vy(md.results.DiagnosticAnalysis.Vy.index)=md.results.DiagnosticAnalysis.Vy.value;
     39                        vy(md.results.DiagnosticSolution.Vy.index)=md.results.DiagnosticSolution.Vy.value;
    4040                        vz=zeros(md.numberofgrids,1);
    41                         vz(md.results.DiagnosticAnalysis.Vz.index)=md.results.DiagnosticAnalysis.Vz.value;
     41                        vz(md.results.DiagnosticSolution.Vz.index)=md.results.DiagnosticSolution.Vz.value;
    4242                        field_values={vy,vz};
    4343                else
    4444                        field_names={'Vel'};
    4545                        vel=zeros(md.numberofgrids,1);
    46                         vel(md.results.DiagnosticAnalysis.Vel.index)=md.results.DiagnosticAnalysis.Vel.value;
     46                        vel(md.results.DiagnosticSolution.Vel.index)=md.results.DiagnosticSolution.Vel.value;
    4747                        field_values={vel};
    4848                end
    … …  
    5252        field_names={'Temperature','Melting'};
    5353        temperature=zeros(md.numberofgrids,1);
    54         temperature(md.results.ThermalAnalysis(end).Temperature.index)=md.results.ThermalAnalysis(end).Temperature.value;
     54        temperature(md.results.ThermalSolution(end).Temperature.index)=md.results.ThermalSolution(end).Temperature.value;
    5555        melting=zeros(md.numberofgrids,1);
    56         melting(md.results.ThermalAnalysis(end).Melting.index)=md.results.ThermalAnalysis(end).Melting.value;
     56        melting(md.results.ThermalSolution(end).Melting.index)=md.results.ThermalSolution(end).Melting.value;
    5757        field_values={temperature,melting};
    5858
    … …  
    6060        field_names={'Thickness'};
    6161        thickness=zeros(md.numberofgrids,1);
    62         thickness(md.results.PrognosticAnalysis.Thickness.index)=md.results.PrognosticAnalysis.Thickness.value;
     62        thickness(md.results.PrognosticSolution.Thickness.index)=md.results.PrognosticSolution.Thickness.value;
    6363        field_values={thickness};
    6464
    … …  
    6666        field_names={'Thickness'};
    6767        thickness=zeros(md.numberofgrids,1);
    68         thickness(md.results.Prognostic2Analysis.Thickness.index)=md.results.Prognostic2Analysis.Thickness.value;
     68        thickness(md.results.Prognostic2Solution.Thickness.index)=md.results.Prognostic2Solution.Thickness.value;
    6969        field_values={thickness};
    7070
    … …  
    7272        field_names={'Vel','Thickness','Surface','Bed'};
    7373        vel=zeros(md.numberofgrids,1);
    74         vel(md.results.Transient2DAnalysis(end).Vel.index)=md.results.Transient2DAnalysis(end).Vel.value;
     74        vel(md.results.Transient2DSolution(end).Vel.index)=md.results.Transient2DSolution(end).Vel.value;
    7575        thickness=zeros(md.numberofgrids,1);
    76         thickness(md.results.Transient2DAnalysis(end).Thickness.index)=md.results.Transient2DAnalysis(end).Thickness.value;
     76        thickness(md.results.Transient2DSolution(end).Thickness.index)=md.results.Transient2DSolution(end).Thickness.value;
    7777        surface=zeros(md.numberofgrids,1);
    78         surface(md.results.Transient2DAnalysis(end).Surface.index)=md.results.Transient2DAnalysis(end).Surface.value;
     78        surface(md.results.Transient2DSolution(end).Surface.index)=md.results.Transient2DSolution(end).Surface.value;
    7979        bed=zeros(md.numberofgrids,1);
    80         bed(md.results.Transient2DAnalysis(end).Bed.index)=md.results.Transient2DAnalysis(end).Bed.value;
     80        bed(md.results.Transient2DSolution(end).Bed.index)=md.results.Transient2DSolution(end).Bed.value;
    8181        field_values={vel,thickness,surface,bed};
    8282
    … …  
    8484        field_names={'Vel','Pressure','Temperature','Melting','Thickness','Surface','Bed'};
    8585        vel=zeros(md.numberofgrids,1);
    86         vel(md.results.Transient3DAnalysis(end).Vel.index)=md.results.Transient3DAnalysis(end).Vel.value;
     86        vel(md.results.Transient3DSolution(end).Vel.index)=md.results.Transient3DSolution(end).Vel.value;
    8787        pressure=zeros(md.numberofgrids,1);
    88         pressure(md.results.Transient3DAnalysis(end).Pressure.index)=md.results.Transient3DAnalysis(end).Pressure.value;
     88        pressure(md.results.Transient3DSolution(end).Pressure.index)=md.results.Transient3DSolution(end).Pressure.value;
    8989        temperature=zeros(md.numberofgrids,1);
    90         temperature(md.results.Transient3DAnalysis(end).Temperature.index)=md.results.Transient3DAnalysis(end).Temperature.value;
     90        temperature(md.results.Transient3DSolution(end).Temperature.index)=md.results.Transient3DSolution(end).Temperature.value;
    9191        melting=zeros(md.numberofgrids,1);
    92         melting(md.results.Transient3DAnalysis(end).Melting.index)=md.results.Transient3DAnalysis(end).Melting.value;
     92        melting(md.results.Transient3DSolution(end).Melting.index)=md.results.Transient3DSolution(end).Melting.value;
    9393        thickness=zeros(md.numberofgrids,1);
    94         thickness(md.results.Transient3DAnalysis(end).Thickness.index)=md.results.Transient3DAnalysis(end).Thickness.value;
     94        thickness(md.results.Transient3DSolution(end).Thickness.index)=md.results.Transient3DSolution(end).Thickness.value;
    9595        surface=zeros(md.numberofgrids,1);
    96         surface(md.results.Transient3DAnalysis(end).Surface.index)=md.results.Transient3DAnalysis(end).Surface.value;
     96        surface(md.results.Transient3DSolution(end).Surface.index)=md.results.Transient3DSolution(end).Surface.value;
    9797        bed=zeros(md.numberofgrids,1);
    98         bed(md.results.Transient3DAnalysis(end).Bed.index)=md.results.Transient3DAnalysis(end).Bed.value;
     98        bed(md.results.Transient3DSolution(end).Bed.index)=md.results.Transient3DSolution(end).Bed.value;
    9999        field_values={vel,pressure,temperature,melting,thickness,surface,bed};
    100100
    … …  
    103103                field_names={'Vel','J','parameter'};
    104104                vel=zeros(md.numberofgrids,1);
    105                 vel(md.results.SteadystateAnalysis.Vel.index)=md.results.SteadystateAnalysis.Vel.value;
     105                vel(md.results.SteadystateSolution.Vel.index)=md.results.SteadystateSolution.Vel.value;
    106106                j=zeros(md.numberofgrids,1);
    107                 j(md.results.SteadystateAnalysis.J.index)=md.results.SteadystateAnalysis.J.value;
     107                j(md.results.SteadystateSolution.J.index)=md.results.SteadystateSolution.J.value;
    108108                parameter=zeros(md.numberofgrids,1);
    109                 parameter(md.results.SteadystateAnalysis.parameter.index)=md.results.SteadystateAnalysis.parameter.value;
     109                parameter(md.results.SteadystateSolution.parameter.index)=md.results.SteadystateSolution.parameter.value;
    110110                field_values={vel,j,parameter};
    111111        else
    112112                field_names={'Vel','Pressure','Temperature'};
    113113                vel=zeros(md.numberofgrids,1);
    114                 vel(md.results.SteadystateAnalysis.Vel.index)=md.results.SteadystateAnalysis.Vel.value;
     114                vel(md.results.SteadystateSolution.Vel.index)=md.results.SteadystateSolution.Vel.value;
    115115                presure=zeros(md.numberofgrids,1);
    116                 presure(md.results.SteadystateAnalysis.Pressure.index)=md.results.SteadystateAnalysis.Pressure.value;
     116                presure(md.results.SteadystateSolution.Pressure.index)=md.results.SteadystateSolution.Pressure.value;
    117117                temperature=zeros(md.numberofgrids,1);
    118                 temperature(md.results.SteadystateAnalysis.Temperature.index)=md.results.SteadystateAnalysis.Temperature.value;
     118                temperature(md.results.SteadystateSolution.Temperature.index)=md.results.SteadystateSolution.Temperature.value;
    119119                field_values={vel,pressure,temperature};
    120120        end
    … …  
    123123        field_names={'Thickness'};
    124124        thickness=zeros(md.numberofgrids,1);
    125         thickness(md.results.BalancedthicknessAnalysis.Thickness.index)=md.results.BalancedthicknessAnalysis.Thickness.value;
     125        thickness(md.results.BalancedthicknessSolution.Thickness.index)=md.results.BalancedthicknessSolution.Thickness.value;
    126126        field_values={thickness};
    127127
    … …  
    129129        field_names={'Slopex','Slopey'};
    130130        slopex=zeros(md.numberofgrids,1);
    131         slopex(md.results.DiagnosticAnalysis.Slopex.index)=md.results.DiagnosticAnalysis.Slopex.value;
     131        slopex(md.results.DiagnosticSolution.Slopex.index)=md.results.DiagnosticSolution.Slopex.value;
    132132        slopey=zeros(md.numberofgrids,1);
    133         slopey(md.results.DiagnosticAnalysis.Slopey.index)=md.results.DiagnosticAnalysis.Slopey.value;
     133        slopey(md.results.DiagnosticSolution.Slopey.index)=md.results.DiagnosticSolution.Slopey.value;
    134134        field_values={slopex,slopey};
    135135
    … …  
    137137        field_names={'Slopex','Slopey'};
    138138        slopex=zeros(md.numberofgrids,1);
    139         slopex(md.results.DiagnosticAnalysis.Slopex.index)=md.results.DiagnosticAnalysis.Slopex.value;
     139        slopex(md.results.DiagnosticSolution.Slopex.index)=md.results.DiagnosticSolution.Slopex.value;
    140140        slopey=zeros(md.numberofgrids,1);
    141         slopey(md.results.DiagnosticAnalysis.Slopey.index)=md.results.DiagnosticAnalysis.Slopey.value;
     141        slopey(md.results.DiagnosticSolution.Slopey.index)=md.results.DiagnosticSolution.Slopey.value;
    142142        field_values={slopex,slopey};
    143143
Note: See TracChangeset for help on using the changeset viewer.