Index: /issm/trunk-jpl/test/NightlyRun/ad.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/ad.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/ad.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',100000); +md=triangle(model(),'../Exp/Square.exp',100000); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); Index: /issm/trunk-jpl/test/NightlyRun/ad_maxalloc.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/ad_maxalloc.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/ad_maxalloc.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',100000); +md=triangle(model(),'../Exp/Square.exp',100000); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); Index: /issm/trunk-jpl/test/NightlyRun/test1106.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1106.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test1106.m (revision 13664) @@ -7,5 +7,5 @@ for i=1:length(L_list), L=L_list{i}; - md=triangle(model,['../Exp/Square_' num2str(L) '.exp'],L/10); %size 3*L + md=triangle(model(),['../Exp/Square_' num2str(L) '.exp'],L/10); %size 3*L md=setmask(md,'',''); %ice sheet test md=parameterize(md,'../Par/ISMIPC.par'); Index: /issm/trunk-jpl/test/NightlyRun/test1201.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1201.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test1201.m (revision 13664) @@ -6,5 +6,5 @@ for stabilization=1:3; %The goal is to test the prognostic model - md=bamg(model,'domain','../Exp/SquareEISMINT.exp','hmax',3000); + md=bamg(model(),'domain','../Exp/SquareEISMINT.exp','hmax',3000); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareEISMINT.par'); Index: /issm/trunk-jpl/test/NightlyRun/test1208.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1208.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test1208.m (revision 13664) @@ -4,5 +4,5 @@ %To begin with the numerical model -md=triangle(model,'../Exp/SquareEISMINT750000.exp',resolution); +md=triangle(model(),'../Exp/SquareEISMINT750000.exp',resolution); md=setmask(md,'',''); md=parameterize(md,'../Par/RoundSheetEISMINT.par'); Index: /issm/trunk-jpl/test/NightlyRun/test1501.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1501.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test1501.m (revision 13664) @@ -1,5 +1,5 @@ printingflag = false; -md=triangle(model,'../Exp/Square.exp',350000); +md=triangle(model(),'../Exp/Square.exp',350000); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); Index: /issm/trunk-jpl/test/NightlyRun/test1502.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1502.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test1502.m (revision 13664) @@ -1,5 +1,5 @@ printingflag = false; -md=triangle(model,'../Exp/Square.exp',450000); +md=triangle(model(),'../Exp/Square.exp',450000); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); Index: /issm/trunk-jpl/test/NightlyRun/test1601.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1601.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test1601.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',150000); +md=triangle(model(),'../Exp/Square.exp',150000); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); Index: /issm/trunk-jpl/test/NightlyRun/test1602.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1602.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test1602.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',150000); +md=triangle(model(),'../Exp/Square.exp',150000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); Index: /issm/trunk-jpl/test/NightlyRun/test3001.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3001.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test3001.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',50000); +md=triangle(model(),'../Exp/Square.exp',50000); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); Index: /issm/trunk-jpl/test/NightlyRun/test3002.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3002.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test3002.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',180000); +md=triangle(model(),'../Exp/Square.exp',180000); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); Index: /issm/trunk-jpl/test/NightlyRun/test3003.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3003.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test3003.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',180000); +md=triangle(model(),'../Exp/Square.exp',180000); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); Index: /issm/trunk-jpl/test/NightlyRun/test3004.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3004.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test3004.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',180000); +md=triangle(model(),'../Exp/Square.exp',180000); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); Index: /issm/trunk-jpl/test/NightlyRun/test3005.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3005.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test3005.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',150000); +md=triangle(model(),'../Exp/Square.exp',150000); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); Index: /issm/trunk-jpl/test/NightlyRun/test3006.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3006.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test3006.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',150000); +md=triangle(model(),'../Exp/Square.exp',150000); md=meshconvert(md); md=setmask(md,'all',''); Index: /issm/trunk-jpl/test/NightlyRun/test3007.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3007.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test3007.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',150000); +md=triangle(model(),'../Exp/Square.exp',150000); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); Index: /issm/trunk-jpl/test/NightlyRun/test3008.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3008.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test3008.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',180000); +md=triangle(model(),'../Exp/Square.exp',180000); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); Index: /issm/trunk-jpl/test/NightlyRun/test3009.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3009.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test3009.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',180000); +md=triangle(model(),'../Exp/Square.exp',180000); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); Index: /issm/trunk-jpl/test/NightlyRun/test3010.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3010.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test3010.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',150000); +md=triangle(model(),'../Exp/Square.exp',150000); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); Index: /issm/trunk-jpl/test/NightlyRun/test3015.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3015.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test3015.m (revision 13664) @@ -3,5 +3,5 @@ %First configure -md=triangle(model,'../Exp/Square.exp',50000); +md=triangle(model(),'../Exp/Square.exp',50000); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); Index: /issm/trunk-jpl/test/NightlyRun/test3019.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3019.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test3019.m (revision 13664) @@ -1,4 +1,4 @@ %test reverse scalar vs forward vectorial drivers in ADOLC, using the test3009 setup, equivalent to test109 setup. -md=triangle(model,'../Exp/Square.exp',100000); +md=triangle(model(),'../Exp/Square.exp',100000); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); Index: /issm/trunk-jpl/test/NightlyRun/test3020.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3020.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test3020.m (revision 13664) @@ -3,5 +3,5 @@ %First configure -md=triangle(model,'../Exp/Square.exp',150000); +md=triangle(model(),'../Exp/Square.exp',150000); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); Index: /issm/trunk-jpl/test/NightlyRun/test328.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test328.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test328.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',150000); +md=triangle(model(),'../Exp/Square.exp',150000); md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); Index: /issm/trunk-jpl/test/NightlyRun/test329.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test329.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test329.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',150000); +md=triangle(model(),'../Exp/Square.exp',150000); md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); Index: /issm/trunk-jpl/test/NightlyRun/test401.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test401.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test401.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',150000); +md=triangle(model(),'../Exp/Square.exp',150000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); Index: /issm/trunk-jpl/test/NightlyRun/test402.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test402.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test402.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',150000); +md=triangle(model(),'../Exp/Square.exp',150000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); Index: /issm/trunk-jpl/test/NightlyRun/test403.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test403.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test403.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',180000); +md=triangle(model(),'../Exp/Square.exp',180000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); Index: /issm/trunk-jpl/test/NightlyRun/test404.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test404.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test404.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',180000); +md=triangle(model(),'../Exp/Square.exp',180000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); Index: /issm/trunk-jpl/test/NightlyRun/test405.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test405.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test405.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',180000); +md=triangle(model(),'../Exp/Square.exp',180000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); Index: /issm/trunk-jpl/test/NightlyRun/test406.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test406.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test406.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',150000); +md=triangle(model(),'../Exp/Square.exp',150000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); Index: /issm/trunk-jpl/test/NightlyRun/test407.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test407.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test407.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',150000); +md=triangle(model(),'../Exp/Square.exp',150000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); Index: /issm/trunk-jpl/test/NightlyRun/test408.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test408.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test408.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',150000); +md=triangle(model(),'../Exp/Square.exp',150000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); Index: /issm/trunk-jpl/test/NightlyRun/test409.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test409.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test409.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',180000); +md=triangle(model(),'../Exp/Square.exp',180000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); Index: /issm/trunk-jpl/test/NightlyRun/test410.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test410.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test410.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',150000); +md=triangle(model(),'../Exp/Square.exp',150000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); Index: /issm/trunk-jpl/test/NightlyRun/test411.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test411.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test411.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',150000); +md=triangle(model(),'../Exp/Square.exp',150000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); Index: /issm/trunk-jpl/test/NightlyRun/test412.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test412.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test412.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',300000); +md=triangle(model(),'../Exp/Square.exp',300000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); Index: /issm/trunk-jpl/test/NightlyRun/test413.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test413.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test413.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',150000); +md=triangle(model(),'../Exp/Square.exp',150000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); Index: /issm/trunk-jpl/test/NightlyRun/test414.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test414.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test414.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',150000); +md=triangle(model(),'../Exp/Square.exp',150000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); Index: /issm/trunk-jpl/test/NightlyRun/test415.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test415.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test415.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',170000); +md=triangle(model(),'../Exp/Square.exp',170000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); Index: /issm/trunk-jpl/test/NightlyRun/test416.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test416.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test416.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',170000); +md=triangle(model(),'../Exp/Square.exp',170000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); Index: /issm/trunk-jpl/test/NightlyRun/test417.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test417.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test417.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',150000); +md=triangle(model(),'../Exp/Square.exp',150000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); Index: /issm/trunk-jpl/test/NightlyRun/test418.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test418.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test418.m (revision 13664) @@ -1,4 +1,4 @@ %test partitioning, and partition averaging -md=triangle(model,'../Exp/Square.exp',30000); +md=triangle(model(),'../Exp/Square.exp',30000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); Index: /issm/trunk-jpl/test/NightlyRun/test419.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test419.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test419.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',180000); +md=triangle(model(),'../Exp/Square.exp',180000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); Index: /issm/trunk-jpl/test/NightlyRun/test420.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test420.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test420.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',200000); +md=triangle(model(),'../Exp/Square.exp',200000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); Index: /issm/trunk-jpl/test/NightlyRun/test421.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test421.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test421.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',180000); +md=triangle(model(),'../Exp/Square.exp',180000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); Index: /issm/trunk-jpl/test/NightlyRun/test422.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test422.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test422.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',180000); +md=triangle(model(),'../Exp/Square.exp',180000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); Index: /issm/trunk-jpl/test/NightlyRun/test423.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test423.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test423.m (revision 13664) @@ -2,5 +2,5 @@ shelfextent=2e5; -md=roundmesh(model,radius,50000); +md=roundmesh(model(),radius,50000); %fix center node to 0,0 rad=sqrt(md.mesh.x.^2+md.mesh.y.^2); Index: /issm/trunk-jpl/test/NightlyRun/test424.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test424.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test424.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',150000); +md=triangle(model(),'../Exp/Square.exp',150000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); Index: /issm/trunk-jpl/test/NightlyRun/test425.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test425.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test425.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',150000); +md=triangle(model(),'../Exp/Square.exp',150000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); Index: /issm/trunk-jpl/test/NightlyRun/test426.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test426.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test426.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',350000); +md=triangle(model(),'../Exp/Square.exp',350000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); Index: /issm/trunk-jpl/test/NightlyRun/test427.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test427.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test427.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',150000); +md=triangle(model(),'../Exp/Square.exp',150000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); Index: /issm/trunk-jpl/test/NightlyRun/test428.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test428.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test428.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',150000); +md=triangle(model(),'../Exp/Square.exp',150000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); Index: /issm/trunk-jpl/test/NightlyRun/test429.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test429.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test429.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',180000); +md=triangle(model(),'../Exp/Square.exp',180000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); Index: /issm/trunk-jpl/test/NightlyRun/test430.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test430.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test430.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',180000); +md=triangle(model(),'../Exp/Square.exp',180000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); Index: /issm/trunk-jpl/test/NightlyRun/test431.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test431.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test431.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',150000); +md=triangle(model(),'../Exp/Square.exp',150000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); Index: /issm/trunk-jpl/test/NightlyRun/test432.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test432.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test432.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',150000); +md=triangle(model(),'../Exp/Square.exp',150000); md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); Index: /issm/trunk-jpl/test/NightlyRun/test501.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test501.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test501.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Pig.exp',20000.); +md=triangle(model(),'../Exp/Pig.exp',20000.); md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); Index: /issm/trunk-jpl/test/NightlyRun/test502.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test502.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test502.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Pig.exp',20000).; +md=triangle(model(),'../Exp/Pig.exp',20000).; md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); Index: /issm/trunk-jpl/test/NightlyRun/test503.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test503.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test503.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Pig.exp',20000.); +md=triangle(model(),'../Exp/Pig.exp',20000.); md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); Index: /issm/trunk-jpl/test/NightlyRun/test504.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test504.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test504.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Pig.exp',20000.); +md=triangle(model(),'../Exp/Pig.exp',20000.); md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); Index: /issm/trunk-jpl/test/NightlyRun/test505.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test505.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test505.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Pig.exp',30000.); +md=triangle(model(),'../Exp/Pig.exp',30000.); md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); Index: /issm/trunk-jpl/test/NightlyRun/test506.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test506.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test506.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Pig.exp',30000.); +md=triangle(model(),'../Exp/Pig.exp',30000.); md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); Index: /issm/trunk-jpl/test/NightlyRun/test507.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test507.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test507.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Pig.exp',30000.); +md=triangle(model(),'../Exp/Pig.exp',30000.); md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); Index: /issm/trunk-jpl/test/NightlyRun/test508.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test508.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test508.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Pig.exp',30000.); +md=triangle(model(),'../Exp/Pig.exp',30000.); md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); Index: /issm/trunk-jpl/test/NightlyRun/test509.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test509.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test509.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Pig.exp',30000.); +md=triangle(model(),'../Exp/Pig.exp',30000.); md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); Index: /issm/trunk-jpl/test/NightlyRun/test510.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test510.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test510.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Pig.exp',20000.); +md=triangle(model(),'../Exp/Pig.exp',20000.); md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); Index: /issm/trunk-jpl/test/NightlyRun/test511.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test511.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test511.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Pig.exp',10000.); +md=triangle(model(),'../Exp/Pig.exp',10000.); md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); Index: /issm/trunk-jpl/test/NightlyRun/test512.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test512.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test512.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Pig.exp',20000.); +md=triangle(model(),'../Exp/Pig.exp',20000.); md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); Index: /issm/trunk-jpl/test/NightlyRun/test512.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test512.py (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test512.py (revision 13664) @@ -8,6 +8,11 @@ from solve import * from MatlabFuncs import * +from triangle import * +from setmask import * +from parameterize import * +from setflowequation import * +from solve import * -md=triangle(model(),'../Exp/Pig.exp',20000.) +md=triangle(model,'../Exp/Pig.exp',20000.) md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp') md=parameterize(md,'../Par/Pig.py') @@ -15,23 +20,28 @@ md=setflowequation(md,'pattyn','all') + # control parameters + md.inversion.iscontrol=1 md.inversion.control_parameters=['FrictionCoefficient'] -md.inversion.min_parameters=1.*numpy.ones((md.mesh.numberofvertices,1)) -md.inversion.max_parameters=200.*numpy.ones((md.mesh.numberofvertices,1)) +md.inversion.min_parameters=1*ones(md.mesh.numberofvertices,1) +md.inversion.max_parameters=200*ones(md.mesh.numberofvertices,1) md.inversion.nsteps=2 -md.inversion.cost_functions=numpy.hstack((103*numpy.ones((md.inversion.nsteps,1)),501*numpy.ones((md.inversion.nsteps,1)))) -md.inversion.cost_functions_coefficients=numpy.ones((md.mesh.numberofvertices,2)) -md.inversion.cost_functions_coefficients[:,1]=2.*10**-7 -md.inversion.gradient_scaling=3.*numpy.ones((md.inversion.nsteps,1)) -md.inversion.maxiter_per_step=2.*numpy.ones((md.inversion.nsteps,1)) -md.inversion.step_threshold=2.99*numpy.ones((md.inversion.nsteps,1)) +md.inversion.cost_functions=[103*ones(md.inversion.nsteps,1) 501*ones(md.inversion.nsteps,1)] +md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,2) + md.inversion.cost_functions_coefficients(:,2)=2.*10^-7 +md.inversion.gradient_scaling=3.*ones(md.inversion.nsteps,1) +md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1) +md.inversion.step_threshold=0.99*ones(md.inversion.nsteps,1) md.inversion.vx_obs=md.initialization.vx -md.inversion.vy_obs=md.initialization.vy + md.inversion.vy_obs=md.initialization.vy + md.cluster=generic('name',oshostname(),'np',3) md=solve(md,DiagnosticSolutionEnum()) + # Fields and tolerances to track changes + field_names =['Gradient','Misfits','FrictionCoefficient','Pressure','Vel','Vx','Vy'] field_tolerances=[1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11] Index: /issm/trunk-jpl/test/NightlyRun/test513.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test513.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test513.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Pig.exp',30000.); +md=triangle(model(),'../Exp/Pig.exp',30000.); md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); Index: /issm/trunk-jpl/test/NightlyRun/test515.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test515.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test515.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Pig.exp',30000.); +md=triangle(model(),'../Exp/Pig.exp',30000.); md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); Index: /issm/trunk-jpl/test/NightlyRun/test516.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test516.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test516.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Pig.exp',30000.); +md=triangle(model(),'../Exp/Pig.exp',30000.); md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); Index: /issm/trunk-jpl/test/NightlyRun/test601.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test601.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test601.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/79North.exp',10000); +md=triangle(model(),'../Exp/79North.exp',10000); md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); Index: /issm/trunk-jpl/test/NightlyRun/test602.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test602.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test602.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/79North.exp',10000); +md=triangle(model(),'../Exp/79North.exp',10000); md=meshconvert(md); md=setmask(md,'../Exp/79NorthShelf.exp',''); Index: /issm/trunk-jpl/test/NightlyRun/test603.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test603.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test603.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/79North.exp',10000); +md=triangle(model(),'../Exp/79North.exp',10000); md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); Index: /issm/trunk-jpl/test/NightlyRun/test604.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test604.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test604.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/79North.exp',10000); +md=triangle(model(),'../Exp/79North.exp',10000); md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); Index: /issm/trunk-jpl/test/NightlyRun/test605.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test605.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test605.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/79North.exp',10000); +md=triangle(model(),'../Exp/79North.exp',10000); md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); Index: /issm/trunk-jpl/test/NightlyRun/test606.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test606.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test606.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/79North.exp',10000); +md=triangle(model(),'../Exp/79North.exp',10000); md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); Index: /issm/trunk-jpl/test/NightlyRun/test607.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test607.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test607.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/79North.exp',10000); +md=triangle(model(),'../Exp/79North.exp',10000); md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); Index: /issm/trunk-jpl/test/NightlyRun/test608.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test608.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test608.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/79North.exp',10000); +md=triangle(model(),'../Exp/79North.exp',10000); md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); Index: /issm/trunk-jpl/test/NightlyRun/test609.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test609.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test609.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/79North.exp',10000); +md=triangle(model(),'../Exp/79North.exp',10000); md=meshconvert(md); md=setmask(md,'../Exp/79NorthShelf.exp',''); Index: /issm/trunk-jpl/test/NightlyRun/test610.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test610.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test610.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/79North.exp',10000); +md=triangle(model(),'../Exp/79North.exp',10000); md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); Index: /issm/trunk-jpl/test/NightlyRun/test611.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test611.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test611.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/79North.exp',10000); +md=triangle(model(),'../Exp/79North.exp',10000); md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); Index: /issm/trunk-jpl/test/NightlyRun/test612.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test612.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test612.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/79North.exp',10000); +md=triangle(model(),'../Exp/79North.exp',10000); md=meshconvert(md); md=setmask(md,'../Exp/79NorthShelf.exp',''); Index: /issm/trunk-jpl/test/NightlyRun/test613.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test613.m (revision 13663) +++ /issm/trunk-jpl/test/NightlyRun/test613.m (revision 13664) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/79North.exp',10000); +md=triangle(model(),'../Exp/79North.exp',10000); md=meshconvert(md); md=setmask(md,'../Exp/79NorthShelf.exp','');