Changeset 15927


Ignore:
Timestamp:
08/25/13 09:01:24 (12 years ago)
Author:
Mathieu Morlighem
Message:

CHG: merged all HO higher order tests into one

Location:
issm/trunk-jpl/test
Files:
6 deleted
6 edited

Legend:

Unmodified
Added
Removed

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

    r15926 r15927  
    6969        case 274, name='SquareShelfStressSSA2dDamageRift';
    7070        case 280, name='SquareShelfStressSSA2dHigherOrder';
    71         case 285, name='SquareShelfStressHOP1xP2';
    72         case 286, name='SquareShelfStressHOP2xP1';
    73         case 287, name='SquareShelfStressHOP2xP2';
     71        case 285, name='SquareShelfStressHOHigherOrder';
    7472        case 290, name='SquareShelfStressFSP2P1';
    7573        case 301, name='SquareSheetConstrainedStressSSA2d';

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

    r15926 r15927  
    7373        274  : 'SquareShelfStressSSA2dDamageRift',
    7474        280  : 'SquareShelfStressSSA2dHigherOrder',
    75         285  : 'SquareShelfStressHOP1xP2',
    76         286  : 'SquareShelfStressHOP2xP1',
    77         287  : 'SquareShelfStressHOP2xP2',
     75        285  : 'SquareShelfStressHOHigherOrder',
    7876        290  : 'SquareShelfStressFSP2P1',
    7977        301  : 'SquareSheetConstrainedStressSSA2d',

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

    r15922 r15927  
    66md.flowequation.fe_HO='P1xP2';
    77md.cluster=generic('name',oshostname(),'np',3);
    8 md=solve(md,StressbalanceSolutionEnum());
    98
    10 %Fields and tolerances to track changes
    11 field_names     ={'Vx','Vy','Vz','Vel','Pressure'};
    12 field_tolerances={1e-08,1e-08,1e-08,1e-08,1e-13};
    13 field_values={...
     9field_names={};
     10field_tolerances={};
     11field_values={};
     12for i={'P1bubble','P1bubblecondensed','P1xP2','P2xP1','P2'}
     13        md.flowequation.fe_HO=i{1};
     14        md=solve(md,StressbalanceSolutionEnum());
     15        field_names     ={field_names{:},['Vx' i{1}],['Vy' i{1}],['Vz' i{1}],['Vel' i{1}],['Pressure' i{1}]};
     16        field_tolerances={field_tolerances{:},1e-08,1e-08,1e-08,1e-08,1e-13};
     17        field_values={field_values{:},...
    1418        (md.results.StressbalanceSolution.Vx),...
    1519        (md.results.StressbalanceSolution.Vy),...
    … …  
    1822        (md.results.StressbalanceSolution.Pressure),...
    1923        };
     24end

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

    r15922 r15927  
    1414md.extrude(3,2.)
    1515md=setflowequation(md,'HO','all');
    16 md.flowequation.fe_HO='P1xP2';
    1716md.cluster=generic('name',oshostname(),'np',3);
    18 md=solve(md,StressbalanceSolutionEnum());
    1917
    20 #Fields and tolerances to track changes
    21 field_names     =['Vx', 'Vy', 'Vz', 'Vel','Pressure'];
    22 field_tolerances=[1e-08,1e-08,1e-08,1e-08,1e-13];
    23 field_values=[\
    24         md.results.StressbalanceSolution.Vx,\
    25         md.results.StressbalanceSolution.Vy,\
    26         md.results.StressbalanceSolution.Vz,\
    27         md.results.StressbalanceSolution.Vel,\
    28         md.results.StressbalanceSolution.Pressure,\
    29         ];
     18field_names=[]
     19field_tolerances=[]
     20field_values=[]
     21for i in ['P1bubble','P1bubblecondensed','P1xP2','P2xP1','P2']:
     22        md.flowequation.fe_HO=i
     23        md=solve(md,StressbalanceSolutionEnum())
     24        field_names     =field_names+['Vx'+i,'Vy'+i,'Vz'+i,'Vel'+i,'Pressure'+i]
     25        field_tolerances=field_tolerances+[1e-08,1e-08,1e-08,1e-08,1e-13]
     26        field_values=field_values+[\
     27                md.results.StressbalanceSolution.Vx,\
     28                md.results.StressbalanceSolution.Vy,\
     29                md.results.StressbalanceSolution.Vz,\
     30                md.results.StressbalanceSolution.Vel,\
     31                md.results.StressbalanceSolution.Pressure,\
     32                ]
Note: See TracChangeset for help on using the changeset viewer.