Changeset 17762


Ignore:
Timestamp:
04/17/14 16:20:55 (11 years ago)
Author:
cborstad
Message:

CHG: unnecessary to specify damage now for anything other than a damage analysis

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

Legend:

Unmodified
Added
Removed

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

    r17470 r17762  
    7272        case 274, name='SquareShelfStressSSA2dDamageRift';
    7373        case 275, name='SquareShelfDamageEvolutionSSA2d';
     74        case 276, name='SquareShelfDamageEvolutionSSA2dP2';
    7475        case 280, name='SquareShelfStressSSA2dHigherOrder';
    7576        case 285, name='SquareShelfStressHOHigherOrder';

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

    r17454 r17762  
    7373        274  : 'SquareShelfStressSSA2dDamageRift',
    7474        275  : 'SquareShelfDamageEvolutionSSA2d',
     75        276  : 'SquareShelfDamageEvolutionSSA2dP2',
    7576        280  : 'SquareShelfStressSSA2dHigherOrder',
    7677        285  : 'SquareShelfStressHOHigherOrder',

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

    r17746 r17762  
    1313md.damage.stabilization=1;
    1414
    15 md.damage.requested_outputs={'default','DamageF'}
     15md.damage.requested_outputs={'default','DamageF'};
    1616
    1717md=setflowequation(md,'SSA','all');
    … …  
    1919md=solve(md,DamageEvolutionSolutionEnum());
    2020
    21 field_names={'D','F'}
    22 field_tolerances={1e-13,1e-13}
     21field_names={'D','F'};
     22field_tolerances={1e-13,1e-13};
    2323field_values={...
    2424                (md.results.DamageEvolutionSolution.DamageDbar),...

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

    r17590 r17762  
    1919md.materials.rheology_B=paterson(md.initialization.temperature);
    2020md.materials.rheology_n=3*ones(md.mesh.numberofelements,1);
    21 md.damage.D=zeros(md.mesh.numberofvertices,1);
    22 md.damage.spcdamage=NaN(md.mesh.numberofvertices,1);
    2321
    2422%friction

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

    r17610 r17762  
    2020md.materials.rheology_B=paterson(md.initialization.temperature);
    2121md.materials.rheology_n=3*ones(md.mesh.numberofelements,1);
    22 md.damage.D=zeros(md.mesh.numberofvertices,1);
    23 md.damage.spcdamage=NaN(md.mesh.numberofvertices,1);
    2422md.friction.coefficient=zeros(md.mesh.numberofvertices,1);
    2523md.friction.coefficient(find(vertexflags(md.mesh,1)))=20;

  • issm/trunk-jpl/test/Par/79North.par

    r17590 r17762  
    2020md.materials.rheology_B=paterson(md.initialization.temperature);
    2121md.materials.rheology_n=3*ones(md.mesh.numberofelements,1);
    22 
    23 %Damage
    24 md.damage.D=zeros(md.mesh.numberofvertices,1);
    2522
    2623%Friction

  • issm/trunk-jpl/test/Par/79North.py

    r17590 r17762  
    3333md.initialization.temperature=md.initialization.temperature
    3434
    35 #Damage
    36 md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
    37 
    3835#Friction
    3936md.friction.coefficient=50.*numpy.ones((md.mesh.numberofvertices,1))

  • issm/trunk-jpl/test/Par/GiaBenchmarksAB.par

    r17590 r17762  
    4444md.materials.rheology_n=3.*ones(md.mesh.numberofelements,1);
    4545
    46 %Damage
    47 md.damage.D=zeros(md.mesh.numberofvertices,1);
    48 
    4946%Friction
    5047md.friction.coefficient=20.*ones(md.mesh.numberofvertices,1);

  • issm/trunk-jpl/test/Par/GiaBenchmarksCD.par

    r17590 r17762  
    4343md.materials.rheology_n=3.*ones(md.mesh.numberofelements,1);
    4444
    45 %Damage
    46 md.damage.D=zeros(md.mesh.numberofvertices,1);
    47 
    4845%Friction
    4946md.friction.coefficient=20.*ones(md.mesh.numberofvertices,1);

  • issm/trunk-jpl/test/Par/ISMIPA.par

    r17590 r17762  
    1616md.materials.rheology_n=3.*ones(md.mesh.numberofelements,1);
    1717
    18 %Damage
    19 md.damage.D=zeros(md.mesh.numberofvertices,1);
    20 
    2118disp('      boundary conditions for stressbalance model');
    2219%Create node on boundary first (because we cannot use mesh)

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

    r17590 r17762  
    1919md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements,1))
    2020
    21 #Damage
    22 md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
    23 
    2421print "      boundary conditions for stressbalance model"
    2522#Create node on boundary first (because we cannot use mesh)

  • issm/trunk-jpl/test/Par/ISMIPB.par

    r17590 r17762  
    1616md.materials.rheology_n=3.*ones(md.mesh.numberofelements,1);
    1717
    18 %Damage
    19 md.damage.D=zeros(md.mesh.numberofvertices,1);
    20 
    2118disp('      boundary conditions for stressbalance model');
    2219%Create node on boundary first (because we cannot use mesh)

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

    r17590 r17762  
    1919md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements,1))
    2020
    21 #Damage
    22 md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
    23 
    2421print "      boundary conditions for stressbalance model"
    2522#Create node on boundary first (because we cannot use mesh)

  • issm/trunk-jpl/test/Par/ISMIPC.par

    r17590 r17762  
    1717md.materials.rheology_n=3.*ones(md.mesh.numberofelements,1);
    1818
    19 %Damage
    20 md.damage.D=zeros(md.mesh.numberofvertices,1);
    21 
    2219disp('      boundary conditions for stressbalance model:');
    2320%Create node on boundary first (because we can not use mesh)

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

    r17590 r17762  
    2020md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements,1))
    2121
    22 #Damage
    23 md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
    24 
    2522print "      boundary conditions for stressbalance model:"
    2623#Create node on boundary first (because we can not use mesh)

  • issm/trunk-jpl/test/Par/ISMIPD.par

    r17590 r17762  
    1616md.materials.rheology_n=3.*ones(md.mesh.numberofelements,1);
    1717
    18 %Damage
    19 md.damage.D=zeros(md.mesh.numberofvertices,1);
    20 
    2118disp('      boundary conditions for stressbalance model:');
    2219%Create node on boundary first (because we can not use mesh)

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

    r17590 r17762  
    1919md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements,1))
    2020
    21 #Damage
    22 md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
    23 
    2421print "      boundary conditions for stressbalance model:"
    2522#Create node on boundary first (because we can not use mesh)

  • issm/trunk-jpl/test/Par/ISMIPE.par

    r17590 r17762  
    2626md.materials.rheology_n=3.*ones(md.mesh.numberofelements,1);
    2727
    28 %Damage
    29 md.damage.D=zeros(md.mesh.numberofvertices,1);
    30 
    3128disp('      boundary conditions for stressbalance model:');
    3229%Create node on boundary first (because we can not use mesh)

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

    r17590 r17762  
    3131md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements,1))
    3232
    33 #Damage
    34 md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
    35 
    3633print "      boundary conditions for stressbalance model:"
    3734#Create node on boundary first (because we can not use mesh)

  • issm/trunk-jpl/test/Par/ISMIPF.par

    r17590 r17762  
    1717md.materials.rheology_n=1.*ones(md.mesh.numberofelements,1);
    1818md.materials.rheology_law='None';
    19 
    20 %Damage
    21 md.damage.D=zeros(md.mesh.numberofvertices,1);
    2219
    2320disp('      boundary conditions for stressbalance model');

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

    r17590 r17762  
    2020md.materials.rheology_n=1.*numpy.ones((md.mesh.numberofelements,1))
    2121md.materials.rheology_law='None'
    22 
    23 #Damage
    24 md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
    2522
    2623print "      boundary conditions for stressbalance model"

  • issm/trunk-jpl/test/Par/Pig.par

    r17590 r17762  
    2626md.initialization.temperature=md.initialization.temperature;
    2727
    28 %Damage
    29 md.damage.D=zeros(md.mesh.numberofvertices,1);
    30 
    3128%Friction
    3229md.friction.coefficient=50*ones(md.mesh.numberofvertices,1);

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

    r17590 r17762  
    3737md.initialization.temperature=md.initialization.temperature
    3838
    39 #Damage
    40 md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
    41 
    4239#Friction
    4340md.friction.coefficient=50.*numpy.ones((md.mesh.numberofvertices,1))

  • issm/trunk-jpl/test/Par/RoundSheetEISMINT.par

    r17590 r17762  
    2020md.materials.rheology_B=6.81*10^7*ones(md.mesh.numberofvertices,1); %to have the same B as the analytical solution
    2121md.materials.rheology_n=3.*ones(md.mesh.numberofelements,1);
    22 
    23 %Damage
    24 md.damage.D=zeros(md.mesh.numberofvertices,1);
    2522
    2623disp('      creating surface mass balance');

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

    r17590 r17762  
    2323md.materials.rheology_B=6.81*10**7*numpy.ones((md.mesh.numberofvertices,1))    #to have the same B as the analytical solution
    2424md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements,1))
    25 
    26 #Damage
    27 md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
    2825
    2926print "      creating surface mass balance"

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

    r17590 r17762  
    6161md.materials.rheology_n=3.*ones(md.mesh.numberofelements,1);
    6262
    63 %Damage
    64 md.damage.D=zeros(md.mesh.numberofvertices,1);
    65 
    6663%Surface mass balance and basal melting
    6764md.surfaceforcings.mass_balance=-10.*ones(md.mesh.numberofvertices,1);
    … …  
    112109md.mask.ice_levelset(find(md.mesh.vertexonboundary))=0;
    113110md.balancethickness.spcthickness=NaN*ones(md.mesh.numberofvertices,1);
    114 md.damage.spcdamage=NaN*ones(md.mesh.numberofvertices,1);
    115111md.masstransport.spcthickness=NaN*ones(md.mesh.numberofvertices,1);
    116112md.stressbalance.referential=NaN*ones(md.mesh.numberofvertices,6);

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

    r17594 r17762  
    6868md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements,1))
    6969
    70 #Damage
    71 md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
    72 
    7370#Surface mass balance and basal melting
    7471md.surfaceforcings.mass_balance=-10.*numpy.ones((md.mesh.numberofvertices,1))
    … …  
    122119md.mask.ice_levelset[pos]=0
    123120md.balancethickness.spcthickness=float('nan')*numpy.ones((md.mesh.numberofvertices,1))
    124 md.damage.spcdamage=float('nan')*numpy.ones((md.mesh.numberofvertices,1))
    125121md.masstransport.spcthickness=float('nan')*numpy.ones((md.mesh.numberofvertices,1))
    126122md.stressbalance.referential=float('nan')*numpy.ones((md.mesh.numberofvertices,6))

  • issm/trunk-jpl/test/Par/RoundSheetStaticEISMINT.par

    r17590 r17762  
    2424md.materials.rheology_B=6.81*10^7*ones(md.mesh.numberofvertices,1); %to have the same B as the analytical solution
    2525md.materials.rheology_n=3.*ones(md.mesh.numberofelements,1);
    26 
    27 %Damage
    28 md.damage.D=zeros(md.mesh.numberofvertices,1);
    2926
    3027disp('      creating surface mass balance');

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

    r17590 r17762  
    2828md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements,1))
    2929
    30 #Damage
    31 md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
    32 
    3330print "      creating surface mass balance"
    3431smb_max=0.5    #m/yr

  • issm/trunk-jpl/test/Par/SquareEISMINT.par

    r17590 r17762  
    2626md.materials.rheology_n=3.*ones(md.mesh.numberofelements,1);
    2727
    28 %Damage
    29 md.damage.D=zeros(md.mesh.numberofvertices,1);
    30 
    3128disp('      creating surface mass balance');
    3229md.surfaceforcings.mass_balance=0.2*ones(md.mesh.numberofvertices,1); %0m/a

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

    r17590 r17762  
    2929md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements,1))
    3030
    31 #Damage
    32 md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
    33 
    3431print "      creating surface mass balance"
    3532md.surfaceforcings.mass_balance=0.2*numpy.ones((md.mesh.numberofvertices,1))    #0m/a

  • issm/trunk-jpl/test/Par/SquareSheetConstrained.par

    r17590 r17762  
    3030md.materials.rheology_n=3.*ones(md.mesh.numberofelements,1);
    3131
    32 %Damage
    33 md.damage.D=zeros(md.mesh.numberofvertices,1);
    3432md.masstransport.calvingrate=zeros(md.mesh.numberofvertices,1);
    3533

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

    r17590 r17762  
    4040md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements,1))
    4141
    42 #Damage
    43 md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
    44 
    4542#Masstransport
    4643md.masstransport.calvingrate=0.*numpy.ones((md.mesh.numberofvertices,1))

  • issm/trunk-jpl/test/Par/SquareSheetShelf.par

    r17590 r17762  
    3232md.materials.rheology_n=3.*ones(md.mesh.numberofelements,1);
    3333
    34 %Damage
    35 md.damage.D=zeros(md.mesh.numberofvertices,1);
    36 
    3734%Accumulation and melting
    3835md.surfaceforcings.mass_balance=10.*ones(md.mesh.numberofvertices,1);

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

    r17590 r17762  
    4343md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements,1))
    4444
    45 #Damage
    46 md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
    47 
    4845#Accumulation and melting
    4946md.surfaceforcings.mass_balance=10.*numpy.ones((md.mesh.numberofvertices,1))

  • issm/trunk-jpl/test/Par/SquareShelf.par

    r17590 r17762  
    2929md.materials.rheology_n=3*ones(md.mesh.numberofelements,1);
    3030
    31 %Damage
    32 md.damage.D=zeros(md.mesh.numberofvertices,1);
    33 
    3431%Friction
    3532md.friction.coefficient=20*ones(md.mesh.numberofvertices,1);

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

    r17590 r17762  
    5959md.materials.rheology_n = 3.*numpy.ones((md.mesh.numberofelements,1))
    6060
    61 #Damage
    62 md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
    63 
    6461#Friction
    6562md.friction.coefficient = 20.*numpy.ones((md.mesh.numberofvertices,1))

  • issm/trunk-jpl/test/Par/SquareShelf2.par

    r17590 r17762  
    2929md.materials.rheology_n=3*ones(md.mesh.numberofelements,1);
    3030
    31 %Damage
    32 md.damage.D=zeros(md.mesh.numberofvertices,1);
    33 
    3431%Friction
    3532md.friction.coefficient=20*ones(md.mesh.numberofvertices,1);

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

    r17590 r17762  
    5959md.materials.rheology_n = 3.*numpy.ones((md.mesh.numberofelements,1))
    6060
    61 #Damage
    62 md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
    63 
    6461#Friction
    6562md.friction.coefficient = 20.*numpy.ones((md.mesh.numberofvertices,1))

  • issm/trunk-jpl/test/Par/SquareShelfConstrained.par

    r17590 r17762  
    2929md.materials.rheology_n=3*ones(md.mesh.numberofelements,1);
    3030
    31 %Damage
    32 md.damage.D=zeros(md.mesh.numberofvertices,1);
    33 
    3431%Surface mass balance and basal melting
    3532md.surfaceforcings.mass_balance=10*ones(md.mesh.numberofvertices,1);

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

    r17590 r17762  
    4040md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements,1))
    4141
    42 #Damage
    43 md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
    44 
    4542#Surface mass balance and basal melting
    4643md.surfaceforcings.mass_balance=10.*numpy.ones((md.mesh.numberofvertices,1))

  • issm/trunk-jpl/test/Par/SquareThermal.par

    r17590 r17762  
    2727md.materials.rheology_n=3.*ones(md.mesh.numberofelements,1);
    2828
    29 %Damage
    30 md.damage.D=zeros(md.mesh.numberofvertices,1);
    31 
    3229disp('      creating surface mass balance');
    3330md.surfaceforcings.mass_balance=ones(md.mesh.numberofvertices,1)/md.constants.yts; %1m/a

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

    r17590 r17762  
    3131md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements,1))
    3232
    33 #Damage
    34 md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
    35 
    3633print "      creating surface mass balance"
    3734md.surfaceforcings.mass_balance=numpy.ones((md.mesh.numberofvertices,1))/md.constants.yts    #1m/a

  • issm/trunk-jpl/test/Par/ValleyGlacierShelf.par

    r17590 r17762  
    4848md.groundingline.migration = 'SubelementMigration';
    4949
    50 %Damage
    51 md.damage.D = zeros(md.mesh.numberofvertices,1);
    52 
    5350%Surface mass balance and basal melting
    5451md.surfaceforcings.mass_balance = 0.3*ones(md.mesh.numberofvertices,1);

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

    r17594 r17762  
    5555md.groundingline.migration='SubelementMigration'
    5656
    57 #Damage
    58 md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
    59 
    6057#Surface mass balance and basal melting
    6158md.surfaceforcings.mass_balance=0.3*numpy.ones((md.mesh.numberofvertices,1))
Note: See TracChangeset for help on using the changeset viewer.