Index: /issm/trunk-jpl/test/NightlyRun/IdToName.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/IdToName.m (revision 17761) +++ /issm/trunk-jpl/test/NightlyRun/IdToName.m (revision 17762) @@ -72,4 +72,5 @@ case 274, name='SquareShelfStressSSA2dDamageRift'; case 275, name='SquareShelfDamageEvolutionSSA2d'; + case 276, name='SquareShelfDamageEvolutionSSA2dP2'; case 280, name='SquareShelfStressSSA2dHigherOrder'; case 285, name='SquareShelfStressHOHigherOrder'; Index: /issm/trunk-jpl/test/NightlyRun/IdToName.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/IdToName.py (revision 17761) +++ /issm/trunk-jpl/test/NightlyRun/IdToName.py (revision 17762) @@ -73,4 +73,5 @@ 274 : 'SquareShelfStressSSA2dDamageRift', 275 : 'SquareShelfDamageEvolutionSSA2d', + 276 : 'SquareShelfDamageEvolutionSSA2dP2', 280 : 'SquareShelfStressSSA2dHigherOrder', 285 : 'SquareShelfStressHOHigherOrder', Index: /issm/trunk-jpl/test/NightlyRun/test275.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test275.m (revision 17761) +++ /issm/trunk-jpl/test/NightlyRun/test275.m (revision 17762) @@ -13,5 +13,5 @@ md.damage.stabilization=1; -md.damage.requested_outputs={'default','DamageF'} +md.damage.requested_outputs={'default','DamageF'}; md=setflowequation(md,'SSA','all'); @@ -19,6 +19,6 @@ md=solve(md,DamageEvolutionSolutionEnum()); -field_names={'D','F'} -field_tolerances={1e-13,1e-13} +field_names={'D','F'}; +field_tolerances={1e-13,1e-13}; field_values={... (md.results.DamageEvolutionSolution.DamageDbar),... Index: /issm/trunk-jpl/test/NightlyRun/test701.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test701.m (revision 17761) +++ /issm/trunk-jpl/test/NightlyRun/test701.m (revision 17762) @@ -19,6 +19,4 @@ md.materials.rheology_B=paterson(md.initialization.temperature); md.materials.rheology_n=3*ones(md.mesh.numberofelements,1); -md.damage.D=zeros(md.mesh.numberofvertices,1); -md.damage.spcdamage=NaN(md.mesh.numberofvertices,1); %friction Index: /issm/trunk-jpl/test/NightlyRun/test703.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test703.m (revision 17761) +++ /issm/trunk-jpl/test/NightlyRun/test703.m (revision 17762) @@ -20,6 +20,4 @@ md.materials.rheology_B=paterson(md.initialization.temperature); md.materials.rheology_n=3*ones(md.mesh.numberofelements,1); -md.damage.D=zeros(md.mesh.numberofvertices,1); -md.damage.spcdamage=NaN(md.mesh.numberofvertices,1); md.friction.coefficient=zeros(md.mesh.numberofvertices,1); md.friction.coefficient(find(vertexflags(md.mesh,1)))=20; Index: /issm/trunk-jpl/test/Par/79North.par =================================================================== --- /issm/trunk-jpl/test/Par/79North.par (revision 17761) +++ /issm/trunk-jpl/test/Par/79North.par (revision 17762) @@ -20,7 +20,4 @@ md.materials.rheology_B=paterson(md.initialization.temperature); md.materials.rheology_n=3*ones(md.mesh.numberofelements,1); - -%Damage -md.damage.D=zeros(md.mesh.numberofvertices,1); %Friction Index: /issm/trunk-jpl/test/Par/79North.py =================================================================== --- /issm/trunk-jpl/test/Par/79North.py (revision 17761) +++ /issm/trunk-jpl/test/Par/79North.py (revision 17762) @@ -33,7 +33,4 @@ md.initialization.temperature=md.initialization.temperature -#Damage -md.damage.D=numpy.zeros((md.mesh.numberofvertices,1)) - #Friction md.friction.coefficient=50.*numpy.ones((md.mesh.numberofvertices,1)) Index: /issm/trunk-jpl/test/Par/GiaBenchmarksAB.par =================================================================== --- /issm/trunk-jpl/test/Par/GiaBenchmarksAB.par (revision 17761) +++ /issm/trunk-jpl/test/Par/GiaBenchmarksAB.par (revision 17762) @@ -44,7 +44,4 @@ md.materials.rheology_n=3.*ones(md.mesh.numberofelements,1); -%Damage -md.damage.D=zeros(md.mesh.numberofvertices,1); - %Friction md.friction.coefficient=20.*ones(md.mesh.numberofvertices,1); Index: /issm/trunk-jpl/test/Par/GiaBenchmarksCD.par =================================================================== --- /issm/trunk-jpl/test/Par/GiaBenchmarksCD.par (revision 17761) +++ /issm/trunk-jpl/test/Par/GiaBenchmarksCD.par (revision 17762) @@ -43,7 +43,4 @@ md.materials.rheology_n=3.*ones(md.mesh.numberofelements,1); -%Damage -md.damage.D=zeros(md.mesh.numberofvertices,1); - %Friction md.friction.coefficient=20.*ones(md.mesh.numberofvertices,1); Index: /issm/trunk-jpl/test/Par/ISMIPA.par =================================================================== --- /issm/trunk-jpl/test/Par/ISMIPA.par (revision 17761) +++ /issm/trunk-jpl/test/Par/ISMIPA.par (revision 17762) @@ -16,7 +16,4 @@ md.materials.rheology_n=3.*ones(md.mesh.numberofelements,1); -%Damage -md.damage.D=zeros(md.mesh.numberofvertices,1); - disp(' boundary conditions for stressbalance model'); %Create node on boundary first (because we cannot use mesh) Index: /issm/trunk-jpl/test/Par/ISMIPA.py =================================================================== --- /issm/trunk-jpl/test/Par/ISMIPA.py (revision 17761) +++ /issm/trunk-jpl/test/Par/ISMIPA.py (revision 17762) @@ -19,7 +19,4 @@ md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements,1)) -#Damage -md.damage.D=numpy.zeros((md.mesh.numberofvertices,1)) - print " boundary conditions for stressbalance model" #Create node on boundary first (because we cannot use mesh) Index: /issm/trunk-jpl/test/Par/ISMIPB.par =================================================================== --- /issm/trunk-jpl/test/Par/ISMIPB.par (revision 17761) +++ /issm/trunk-jpl/test/Par/ISMIPB.par (revision 17762) @@ -16,7 +16,4 @@ md.materials.rheology_n=3.*ones(md.mesh.numberofelements,1); -%Damage -md.damage.D=zeros(md.mesh.numberofvertices,1); - disp(' boundary conditions for stressbalance model'); %Create node on boundary first (because we cannot use mesh) Index: /issm/trunk-jpl/test/Par/ISMIPB.py =================================================================== --- /issm/trunk-jpl/test/Par/ISMIPB.py (revision 17761) +++ /issm/trunk-jpl/test/Par/ISMIPB.py (revision 17762) @@ -19,7 +19,4 @@ md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements,1)) -#Damage -md.damage.D=numpy.zeros((md.mesh.numberofvertices,1)) - print " boundary conditions for stressbalance model" #Create node on boundary first (because we cannot use mesh) Index: /issm/trunk-jpl/test/Par/ISMIPC.par =================================================================== --- /issm/trunk-jpl/test/Par/ISMIPC.par (revision 17761) +++ /issm/trunk-jpl/test/Par/ISMIPC.par (revision 17762) @@ -17,7 +17,4 @@ md.materials.rheology_n=3.*ones(md.mesh.numberofelements,1); -%Damage -md.damage.D=zeros(md.mesh.numberofvertices,1); - disp(' boundary conditions for stressbalance model:'); %Create node on boundary first (because we can not use mesh) Index: /issm/trunk-jpl/test/Par/ISMIPC.py =================================================================== --- /issm/trunk-jpl/test/Par/ISMIPC.py (revision 17761) +++ /issm/trunk-jpl/test/Par/ISMIPC.py (revision 17762) @@ -20,7 +20,4 @@ md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements,1)) -#Damage -md.damage.D=numpy.zeros((md.mesh.numberofvertices,1)) - print " boundary conditions for stressbalance model:" #Create node on boundary first (because we can not use mesh) Index: /issm/trunk-jpl/test/Par/ISMIPD.par =================================================================== --- /issm/trunk-jpl/test/Par/ISMIPD.par (revision 17761) +++ /issm/trunk-jpl/test/Par/ISMIPD.par (revision 17762) @@ -16,7 +16,4 @@ md.materials.rheology_n=3.*ones(md.mesh.numberofelements,1); -%Damage -md.damage.D=zeros(md.mesh.numberofvertices,1); - disp(' boundary conditions for stressbalance model:'); %Create node on boundary first (because we can not use mesh) Index: /issm/trunk-jpl/test/Par/ISMIPD.py =================================================================== --- /issm/trunk-jpl/test/Par/ISMIPD.py (revision 17761) +++ /issm/trunk-jpl/test/Par/ISMIPD.py (revision 17762) @@ -19,7 +19,4 @@ md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements,1)) -#Damage -md.damage.D=numpy.zeros((md.mesh.numberofvertices,1)) - print " boundary conditions for stressbalance model:" #Create node on boundary first (because we can not use mesh) Index: /issm/trunk-jpl/test/Par/ISMIPE.par =================================================================== --- /issm/trunk-jpl/test/Par/ISMIPE.par (revision 17761) +++ /issm/trunk-jpl/test/Par/ISMIPE.par (revision 17762) @@ -26,7 +26,4 @@ md.materials.rheology_n=3.*ones(md.mesh.numberofelements,1); -%Damage -md.damage.D=zeros(md.mesh.numberofvertices,1); - disp(' boundary conditions for stressbalance model:'); %Create node on boundary first (because we can not use mesh) Index: /issm/trunk-jpl/test/Par/ISMIPE.py =================================================================== --- /issm/trunk-jpl/test/Par/ISMIPE.py (revision 17761) +++ /issm/trunk-jpl/test/Par/ISMIPE.py (revision 17762) @@ -31,7 +31,4 @@ md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements,1)) -#Damage -md.damage.D=numpy.zeros((md.mesh.numberofvertices,1)) - print " boundary conditions for stressbalance model:" #Create node on boundary first (because we can not use mesh) Index: /issm/trunk-jpl/test/Par/ISMIPF.par =================================================================== --- /issm/trunk-jpl/test/Par/ISMIPF.par (revision 17761) +++ /issm/trunk-jpl/test/Par/ISMIPF.par (revision 17762) @@ -17,7 +17,4 @@ md.materials.rheology_n=1.*ones(md.mesh.numberofelements,1); md.materials.rheology_law='None'; - -%Damage -md.damage.D=zeros(md.mesh.numberofvertices,1); disp(' boundary conditions for stressbalance model'); Index: /issm/trunk-jpl/test/Par/ISMIPF.py =================================================================== --- /issm/trunk-jpl/test/Par/ISMIPF.py (revision 17761) +++ /issm/trunk-jpl/test/Par/ISMIPF.py (revision 17762) @@ -20,7 +20,4 @@ md.materials.rheology_n=1.*numpy.ones((md.mesh.numberofelements,1)) md.materials.rheology_law='None' - -#Damage -md.damage.D=numpy.zeros((md.mesh.numberofvertices,1)) print " boundary conditions for stressbalance model" Index: /issm/trunk-jpl/test/Par/Pig.par =================================================================== --- /issm/trunk-jpl/test/Par/Pig.par (revision 17761) +++ /issm/trunk-jpl/test/Par/Pig.par (revision 17762) @@ -26,7 +26,4 @@ md.initialization.temperature=md.initialization.temperature; -%Damage -md.damage.D=zeros(md.mesh.numberofvertices,1); - %Friction md.friction.coefficient=50*ones(md.mesh.numberofvertices,1); Index: /issm/trunk-jpl/test/Par/Pig.py =================================================================== --- /issm/trunk-jpl/test/Par/Pig.py (revision 17761) +++ /issm/trunk-jpl/test/Par/Pig.py (revision 17762) @@ -37,7 +37,4 @@ md.initialization.temperature=md.initialization.temperature -#Damage -md.damage.D=numpy.zeros((md.mesh.numberofvertices,1)) - #Friction md.friction.coefficient=50.*numpy.ones((md.mesh.numberofvertices,1)) Index: /issm/trunk-jpl/test/Par/RoundSheetEISMINT.par =================================================================== --- /issm/trunk-jpl/test/Par/RoundSheetEISMINT.par (revision 17761) +++ /issm/trunk-jpl/test/Par/RoundSheetEISMINT.par (revision 17762) @@ -20,7 +20,4 @@ md.materials.rheology_B=6.81*10^7*ones(md.mesh.numberofvertices,1); %to have the same B as the analytical solution md.materials.rheology_n=3.*ones(md.mesh.numberofelements,1); - -%Damage -md.damage.D=zeros(md.mesh.numberofvertices,1); disp(' creating surface mass balance'); Index: /issm/trunk-jpl/test/Par/RoundSheetEISMINT.py =================================================================== --- /issm/trunk-jpl/test/Par/RoundSheetEISMINT.py (revision 17761) +++ /issm/trunk-jpl/test/Par/RoundSheetEISMINT.py (revision 17762) @@ -23,7 +23,4 @@ md.materials.rheology_B=6.81*10**7*numpy.ones((md.mesh.numberofvertices,1)) #to have the same B as the analytical solution md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements,1)) - -#Damage -md.damage.D=numpy.zeros((md.mesh.numberofvertices,1)) print " creating surface mass balance" Index: /issm/trunk-jpl/test/Par/RoundSheetShelf.par =================================================================== --- /issm/trunk-jpl/test/Par/RoundSheetShelf.par (revision 17761) +++ /issm/trunk-jpl/test/Par/RoundSheetShelf.par (revision 17762) @@ -61,7 +61,4 @@ md.materials.rheology_n=3.*ones(md.mesh.numberofelements,1); -%Damage -md.damage.D=zeros(md.mesh.numberofvertices,1); - %Surface mass balance and basal melting md.surfaceforcings.mass_balance=-10.*ones(md.mesh.numberofvertices,1); @@ -112,5 +109,4 @@ md.mask.ice_levelset(find(md.mesh.vertexonboundary))=0; md.balancethickness.spcthickness=NaN*ones(md.mesh.numberofvertices,1); -md.damage.spcdamage=NaN*ones(md.mesh.numberofvertices,1); md.masstransport.spcthickness=NaN*ones(md.mesh.numberofvertices,1); md.stressbalance.referential=NaN*ones(md.mesh.numberofvertices,6); Index: /issm/trunk-jpl/test/Par/RoundSheetShelf.py =================================================================== --- /issm/trunk-jpl/test/Par/RoundSheetShelf.py (revision 17761) +++ /issm/trunk-jpl/test/Par/RoundSheetShelf.py (revision 17762) @@ -68,7 +68,4 @@ md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements,1)) -#Damage -md.damage.D=numpy.zeros((md.mesh.numberofvertices,1)) - #Surface mass balance and basal melting md.surfaceforcings.mass_balance=-10.*numpy.ones((md.mesh.numberofvertices,1)) @@ -122,5 +119,4 @@ md.mask.ice_levelset[pos]=0 md.balancethickness.spcthickness=float('nan')*numpy.ones((md.mesh.numberofvertices,1)) -md.damage.spcdamage=float('nan')*numpy.ones((md.mesh.numberofvertices,1)) md.masstransport.spcthickness=float('nan')*numpy.ones((md.mesh.numberofvertices,1)) md.stressbalance.referential=float('nan')*numpy.ones((md.mesh.numberofvertices,6)) Index: /issm/trunk-jpl/test/Par/RoundSheetStaticEISMINT.par =================================================================== --- /issm/trunk-jpl/test/Par/RoundSheetStaticEISMINT.par (revision 17761) +++ /issm/trunk-jpl/test/Par/RoundSheetStaticEISMINT.par (revision 17762) @@ -24,7 +24,4 @@ md.materials.rheology_B=6.81*10^7*ones(md.mesh.numberofvertices,1); %to have the same B as the analytical solution md.materials.rheology_n=3.*ones(md.mesh.numberofelements,1); - -%Damage -md.damage.D=zeros(md.mesh.numberofvertices,1); disp(' creating surface mass balance'); Index: /issm/trunk-jpl/test/Par/RoundSheetStaticEISMINT.py =================================================================== --- /issm/trunk-jpl/test/Par/RoundSheetStaticEISMINT.py (revision 17761) +++ /issm/trunk-jpl/test/Par/RoundSheetStaticEISMINT.py (revision 17762) @@ -28,7 +28,4 @@ md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements,1)) -#Damage -md.damage.D=numpy.zeros((md.mesh.numberofvertices,1)) - print " creating surface mass balance" smb_max=0.5 #m/yr Index: /issm/trunk-jpl/test/Par/SquareEISMINT.par =================================================================== --- /issm/trunk-jpl/test/Par/SquareEISMINT.par (revision 17761) +++ /issm/trunk-jpl/test/Par/SquareEISMINT.par (revision 17762) @@ -26,7 +26,4 @@ md.materials.rheology_n=3.*ones(md.mesh.numberofelements,1); -%Damage -md.damage.D=zeros(md.mesh.numberofvertices,1); - disp(' creating surface mass balance'); md.surfaceforcings.mass_balance=0.2*ones(md.mesh.numberofvertices,1); %0m/a Index: /issm/trunk-jpl/test/Par/SquareEISMINT.py =================================================================== --- /issm/trunk-jpl/test/Par/SquareEISMINT.py (revision 17761) +++ /issm/trunk-jpl/test/Par/SquareEISMINT.py (revision 17762) @@ -29,7 +29,4 @@ md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements,1)) -#Damage -md.damage.D=numpy.zeros((md.mesh.numberofvertices,1)) - print " creating surface mass balance" md.surfaceforcings.mass_balance=0.2*numpy.ones((md.mesh.numberofvertices,1)) #0m/a Index: /issm/trunk-jpl/test/Par/SquareSheetConstrained.par =================================================================== --- /issm/trunk-jpl/test/Par/SquareSheetConstrained.par (revision 17761) +++ /issm/trunk-jpl/test/Par/SquareSheetConstrained.par (revision 17762) @@ -30,6 +30,4 @@ md.materials.rheology_n=3.*ones(md.mesh.numberofelements,1); -%Damage -md.damage.D=zeros(md.mesh.numberofvertices,1); md.masstransport.calvingrate=zeros(md.mesh.numberofvertices,1); Index: /issm/trunk-jpl/test/Par/SquareSheetConstrained.py =================================================================== --- /issm/trunk-jpl/test/Par/SquareSheetConstrained.py (revision 17761) +++ /issm/trunk-jpl/test/Par/SquareSheetConstrained.py (revision 17762) @@ -40,7 +40,4 @@ md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements,1)) -#Damage -md.damage.D=numpy.zeros((md.mesh.numberofvertices,1)) - #Masstransport md.masstransport.calvingrate=0.*numpy.ones((md.mesh.numberofvertices,1)) Index: /issm/trunk-jpl/test/Par/SquareSheetShelf.par =================================================================== --- /issm/trunk-jpl/test/Par/SquareSheetShelf.par (revision 17761) +++ /issm/trunk-jpl/test/Par/SquareSheetShelf.par (revision 17762) @@ -32,7 +32,4 @@ md.materials.rheology_n=3.*ones(md.mesh.numberofelements,1); -%Damage -md.damage.D=zeros(md.mesh.numberofvertices,1); - %Accumulation and melting md.surfaceforcings.mass_balance=10.*ones(md.mesh.numberofvertices,1); Index: /issm/trunk-jpl/test/Par/SquareSheetShelf.py =================================================================== --- /issm/trunk-jpl/test/Par/SquareSheetShelf.py (revision 17761) +++ /issm/trunk-jpl/test/Par/SquareSheetShelf.py (revision 17762) @@ -43,7 +43,4 @@ md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements,1)) -#Damage -md.damage.D=numpy.zeros((md.mesh.numberofvertices,1)) - #Accumulation and melting md.surfaceforcings.mass_balance=10.*numpy.ones((md.mesh.numberofvertices,1)) Index: /issm/trunk-jpl/test/Par/SquareShelf.par =================================================================== --- /issm/trunk-jpl/test/Par/SquareShelf.par (revision 17761) +++ /issm/trunk-jpl/test/Par/SquareShelf.par (revision 17762) @@ -29,7 +29,4 @@ md.materials.rheology_n=3*ones(md.mesh.numberofelements,1); -%Damage -md.damage.D=zeros(md.mesh.numberofvertices,1); - %Friction md.friction.coefficient=20*ones(md.mesh.numberofvertices,1); Index: /issm/trunk-jpl/test/Par/SquareShelf.py =================================================================== --- /issm/trunk-jpl/test/Par/SquareShelf.py (revision 17761) +++ /issm/trunk-jpl/test/Par/SquareShelf.py (revision 17762) @@ -59,7 +59,4 @@ md.materials.rheology_n = 3.*numpy.ones((md.mesh.numberofelements,1)) -#Damage -md.damage.D=numpy.zeros((md.mesh.numberofvertices,1)) - #Friction md.friction.coefficient = 20.*numpy.ones((md.mesh.numberofvertices,1)) Index: /issm/trunk-jpl/test/Par/SquareShelf2.par =================================================================== --- /issm/trunk-jpl/test/Par/SquareShelf2.par (revision 17761) +++ /issm/trunk-jpl/test/Par/SquareShelf2.par (revision 17762) @@ -29,7 +29,4 @@ md.materials.rheology_n=3*ones(md.mesh.numberofelements,1); -%Damage -md.damage.D=zeros(md.mesh.numberofvertices,1); - %Friction md.friction.coefficient=20*ones(md.mesh.numberofvertices,1); Index: /issm/trunk-jpl/test/Par/SquareShelf2.py =================================================================== --- /issm/trunk-jpl/test/Par/SquareShelf2.py (revision 17761) +++ /issm/trunk-jpl/test/Par/SquareShelf2.py (revision 17762) @@ -59,7 +59,4 @@ md.materials.rheology_n = 3.*numpy.ones((md.mesh.numberofelements,1)) -#Damage -md.damage.D=numpy.zeros((md.mesh.numberofvertices,1)) - #Friction md.friction.coefficient = 20.*numpy.ones((md.mesh.numberofvertices,1)) Index: /issm/trunk-jpl/test/Par/SquareShelfConstrained.par =================================================================== --- /issm/trunk-jpl/test/Par/SquareShelfConstrained.par (revision 17761) +++ /issm/trunk-jpl/test/Par/SquareShelfConstrained.par (revision 17762) @@ -29,7 +29,4 @@ md.materials.rheology_n=3*ones(md.mesh.numberofelements,1); -%Damage -md.damage.D=zeros(md.mesh.numberofvertices,1); - %Surface mass balance and basal melting md.surfaceforcings.mass_balance=10*ones(md.mesh.numberofvertices,1); Index: /issm/trunk-jpl/test/Par/SquareShelfConstrained.py =================================================================== --- /issm/trunk-jpl/test/Par/SquareShelfConstrained.py (revision 17761) +++ /issm/trunk-jpl/test/Par/SquareShelfConstrained.py (revision 17762) @@ -40,7 +40,4 @@ md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements,1)) -#Damage -md.damage.D=numpy.zeros((md.mesh.numberofvertices,1)) - #Surface mass balance and basal melting md.surfaceforcings.mass_balance=10.*numpy.ones((md.mesh.numberofvertices,1)) Index: /issm/trunk-jpl/test/Par/SquareThermal.par =================================================================== --- /issm/trunk-jpl/test/Par/SquareThermal.par (revision 17761) +++ /issm/trunk-jpl/test/Par/SquareThermal.par (revision 17762) @@ -27,7 +27,4 @@ md.materials.rheology_n=3.*ones(md.mesh.numberofelements,1); -%Damage -md.damage.D=zeros(md.mesh.numberofvertices,1); - disp(' creating surface mass balance'); md.surfaceforcings.mass_balance=ones(md.mesh.numberofvertices,1)/md.constants.yts; %1m/a Index: /issm/trunk-jpl/test/Par/SquareThermal.py =================================================================== --- /issm/trunk-jpl/test/Par/SquareThermal.py (revision 17761) +++ /issm/trunk-jpl/test/Par/SquareThermal.py (revision 17762) @@ -31,7 +31,4 @@ md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements,1)) -#Damage -md.damage.D=numpy.zeros((md.mesh.numberofvertices,1)) - print " creating surface mass balance" md.surfaceforcings.mass_balance=numpy.ones((md.mesh.numberofvertices,1))/md.constants.yts #1m/a Index: /issm/trunk-jpl/test/Par/ValleyGlacierShelf.par =================================================================== --- /issm/trunk-jpl/test/Par/ValleyGlacierShelf.par (revision 17761) +++ /issm/trunk-jpl/test/Par/ValleyGlacierShelf.par (revision 17762) @@ -48,7 +48,4 @@ md.groundingline.migration = 'SubelementMigration'; -%Damage -md.damage.D = zeros(md.mesh.numberofvertices,1); - %Surface mass balance and basal melting md.surfaceforcings.mass_balance = 0.3*ones(md.mesh.numberofvertices,1); Index: /issm/trunk-jpl/test/Par/ValleyGlacierShelf.py =================================================================== --- /issm/trunk-jpl/test/Par/ValleyGlacierShelf.py (revision 17761) +++ /issm/trunk-jpl/test/Par/ValleyGlacierShelf.py (revision 17762) @@ -55,7 +55,4 @@ md.groundingline.migration='SubelementMigration' -#Damage -md.damage.D=numpy.zeros((md.mesh.numberofvertices,1)) - #Surface mass balance and basal melting md.surfaceforcings.mass_balance=0.3*numpy.ones((md.mesh.numberofvertices,1))