Changeset 17942


Ignore:
Timestamp:
05/05/14 17:16:03 (11 years ago)
Author:
cborstad
Message:

CHG: updated spelling for NR

Location:
issm/trunk-jpl/test
Files:
11 edited

Legend:

Unmodified
Added
Removed

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

    r17762 r17942  
    132132        case 422, name='SquareSheetShelfStressSSAFS3dTiling';
    133133        case 423, name='RoundSheetShelfGLMigrationSSA2d';
    134         case 424, name='SquareSheetShelfGroundingLine2dAgressive';
     134        case 424, name='SquareSheetShelfGroundingLine2dAggressive';
    135135        case 425, name='SquareSheetShelfGroundingLine2dSoft';
    136         case 426, name='SquareSheetShelfGroundingLine3dAgressive';
     136        case 426, name='SquareSheetShelfGroundingLine3dAggressive';
    137137        case 427, name='SquareSheetShelfGroundingLine3dSoft';
    138138        case 428, name='SquareSheetShelfStressSSA2dNewton';

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

    r17762 r17942  
    131131        422  : 'SquareSheetShelfStressSSAFS3dTiling',
    132132        423  : 'RoundSheetShelfGLMigrationSSA2d',
    133         424  : 'SquareSheetShelfGroundingLine2dAgressive',
     133        424  : 'SquareSheetShelfGroundingLine2dAggressive',
    134134        425  : 'SquareSheetShelfGroundingLine2dSoft',
    135         426  : 'SquareSheetShelfGroundingLine3dAgressive',
     135        426  : 'SquareSheetShelfGroundingLine3dAggressive',
    136136        427  : 'SquareSheetShelfGroundingLine3dSoft',
    137137        428  : 'SquareSheetShelfStressSSA2dNewton',

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

    r17592 r17942  
    2424
    2525%test different grounding line dynamics.
    26 md.groundingline.migration='AgressiveMigration';
     26md.groundingline.migration='AggressiveMigration';
    2727md=solve(md,TransientSolutionEnum());
    2828element_on_iceshelf_agressive=(md.results.TransientSolution.MaskGroundediceLevelset);
    … …  
    4646
    4747%Fields and tolerances to track changes
    48 field_names     ={'ElementOnIceShelfAgressive','VelAgressive','ElementOnIceShelfSoft','VelSoft','ElementOnIceShelfSubelement','VelSubelement','ElementOnIceShelfSubelement2','VelSubelement2'};
     48field_names     ={'ElementOnIceShelfAggressive','VelAggressive','ElementOnIceShelfSoft','VelSoft','ElementOnIceShelfSubelement','VelSubelement','ElementOnIceShelfSubelement2','VelSubelement2'};
    4949field_tolerances={1e-13,2e-12,1e-13,2e-12,1e-13,3e-12,1e-13,2e-12};
    5050field_values={element_on_iceshelf_agressive,vel_agressive,element_on_iceshelf_soft,vel_soft,element_on_iceshelf_subelement,vel_subelement,element_on_iceshelf_subelement2,vel_subelement2};

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

    r17592 r17942  
    3535
    3636#test different grounding line dynamics.
    37 md.groundingline.migration='AgressiveMigration'
     37md.groundingline.migration='AggressiveMigration'
    3838md=solve(md,TransientSolutionEnum())
    3939element_on_iceshelf_agressive=md.results.TransientSolution[0].MaskGroundediceLevelset
    … …  
    5757
    5858#Fields and tolerances to track changes
    59 field_names     =['ElementOnIceShelfAgressive','VelAgressive','ElementOnIceShelfSoft','VelSoft','ElementOnIceShelfSubelement','VelSubelement','ElementOnIceShelfSubelement2','VelSubelement2']
     59field_names     =['ElementOnIceShelfAggressive','VelAggressive','ElementOnIceShelfSoft','VelSoft','ElementOnIceShelfSubelement','VelSubelement','ElementOnIceShelfSubelement2','VelSubelement2']
    6060field_tolerances=[1e-13,2e-13,1e-13,2e-13,1e-13,2e-13,1e-13,2e-13]
    6161field_values=[element_on_iceshelf_agressive,vel_agressive,element_on_iceshelf_soft,vel_soft,element_on_iceshelf_subelement,vel_subelement,element_on_iceshelf_subelement2,vel_subelement2]

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

    r17592 r17942  
    1212md.transient.isstressbalance=0;
    1313md.transient.isgroundingline=1;
    14 md.groundingline.migration='AgressiveMigration';
     14md.groundingline.migration='AggressiveMigration';
    1515md.transient.requested_outputs={'IceVolume','IceVolumeAboveFloatation'};
    1616

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

    r17592 r17942  
    2222md.transient.isstressbalance=False
    2323md.transient.isgroundingline=True
    24 md.groundingline.migration='AgressiveMigration'
     24md.groundingline.migration='AggressiveMigration'
    2525md.transient.requested_outputs=['IceVolume','IceVolumeAboveFloatation']
    2626

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

    r17599 r17942  
    1313md.transient.isstressbalance=0;
    1414md.transient.isgroundingline=1;
    15 md.groundingline.migration='AgressiveMigration';
     15md.groundingline.migration='AggressiveMigration';
    1616md.transient.requested_outputs={'IceVolume','IceVolumeAboveFloatation'};
    1717md.cluster=generic('name',oshostname(),'np',3);

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

    r17595 r17942  
    2323md.transient.isstressbalance=False
    2424md.transient.isgroundingline=True
    25 md.groundingline.migration='AgressiveMigration'
     25md.groundingline.migration='AggressiveMigration'
    2626md.transient.requested_outputs=['IceVolume','IceVolumeAboveFloatation']
    2727md.cluster=generic('name',oshostname(),'np',3)

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

    r16073 r17942  
    2525
    2626%test different grounding line dynamics.
    27 md.groundingline.migration='AgressiveMigration';
     27md.groundingline.migration='AggressiveMigration';
    2828md=solve(md,TransientSolutionEnum());
    2929element_on_iceshelf_agressive=(md.results.TransientSolution.MaskGroundediceLevelset);
    … …  
    4242
    4343%Fields and tolerances to track changes
    44 field_names     ={'ElementOnIceShelfAgressive','ElementOnIceShelfSoft','ElementOnIceShelfSubelement','ElementOnIceShelfSubelement'};
     44field_names     ={'ElementOnIceShelfAggressive','ElementOnIceShelfSoft','ElementOnIceShelfSubelement','ElementOnIceShelfSubelement'};
    4545field_tolerances={1e-13,1e-13,1e-13,1e-13};
    4646field_values={element_on_iceshelf_agressive,element_on_iceshelf_soft,element_on_iceshelf_subelement,element_on_iceshelf_subelement2};

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

    r15984 r17942  
    3636
    3737#test different grounding line dynamics.
    38 md.groundingline.migration='AgressiveMigration'
     38md.groundingline.migration='AggressiveMigration'
    3939md=solve(md,TransientSolutionEnum())
    4040element_on_iceshelf_agressive=md.results.TransientSolution[0].MaskGroundediceLevelset
    … …  
    4949
    5050#Fields and tolerances to track changes
    51 field_names     =['ElementOnIceShelfAgressive','ElementOnIceShelfSoft','ElementOnIceShelfSubelement']
     51field_names     =['ElementOnIceShelfAggressive','ElementOnIceShelfSoft','ElementOnIceShelfSubelement']
    5252field_tolerances=[1e-13,1e-13,1e-13]
    5353field_values=[element_on_iceshelf_agressive,element_on_iceshelf_soft,element_on_iceshelf_subelement]

  • issm/trunk-jpl/test/Par/RoundSheetShelf.py

    r17769 r17942  
    102102
    103103#bathymetry and grounding line migration:
    104 md.groundingline.migration='AgressiveMigration'
     104md.groundingline.migration='AggressiveMigration'
    105105md.geometry.bed=copy.deepcopy(md.geometry.base)
    106106pos=numpy.nonzero(md.mask.groundedice_levelset<0.)[0]
Note: See TracChangeset for help on using the changeset viewer.