Changeset 13664

Timestamp:

10/15/12 11:39:38 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: cosmetics on matlab file (model -> model())

Location:

issm/trunk-jpl/test/NightlyRun

Files:

• ad.m (modified) (1 diff)
• ad_maxalloc.m (modified) (1 diff)
• test1106.m (modified) (1 diff)
• test1201.m (modified) (1 diff)
• test1208.m (modified) (1 diff)
• test1501.m (modified) (1 diff)
• test1502.m (modified) (1 diff)
• test1601.m (modified) (1 diff)
• test1602.m (modified) (1 diff)
• test3001.m (modified) (1 diff)
• test3002.m (modified) (1 diff)
• test3003.m (modified) (1 diff)
• test3004.m (modified) (1 diff)
• test3005.m (modified) (1 diff)
• test3006.m (modified) (1 diff)
• test3007.m (modified) (1 diff)
• test3008.m (modified) (1 diff)
• test3009.m (modified) (1 diff)
• test3010.m (modified) (1 diff)
• test3015.m (modified) (1 diff)
• test3019.m (modified) (1 diff)
• test3020.m (modified) (1 diff)
• test328.m (modified) (1 diff)
• test329.m (modified) (1 diff)
• test401.m (modified) (1 diff)
• test402.m (modified) (1 diff)
• test403.m (modified) (1 diff)
• test404.m (modified) (1 diff)
• test405.m (modified) (1 diff)
• test406.m (modified) (1 diff)
• test407.m (modified) (1 diff)
• test408.m (modified) (1 diff)
• test409.m (modified) (1 diff)
• test410.m (modified) (1 diff)
• test411.m (modified) (1 diff)
• test412.m (modified) (1 diff)
• test413.m (modified) (1 diff)
• test414.m (modified) (1 diff)
• test415.m (modified) (1 diff)
• test416.m (modified) (1 diff)
• test417.m (modified) (1 diff)
• test418.m (modified) (1 diff)
• test419.m (modified) (1 diff)
• test420.m (modified) (1 diff)
• test421.m (modified) (1 diff)
• test422.m (modified) (1 diff)
• test423.m (modified) (1 diff)
• test424.m (modified) (1 diff)
• test425.m (modified) (1 diff)
• test426.m (modified) (1 diff)
• test427.m (modified) (1 diff)
• test428.m (modified) (1 diff)
• test429.m (modified) (1 diff)
• test430.m (modified) (1 diff)
• test431.m (modified) (1 diff)
• test432.m (modified) (1 diff)
• test501.m (modified) (1 diff)
• test502.m (modified) (1 diff)
• test503.m (modified) (1 diff)
• test504.m (modified) (1 diff)
• test505.m (modified) (1 diff)
• test506.m (modified) (1 diff)
• test507.m (modified) (1 diff)
• test508.m (modified) (1 diff)
• test509.m (modified) (1 diff)
• test510.m (modified) (1 diff)
• test511.m (modified) (1 diff)
• test512.m (modified) (1 diff)
• test512.py (modified) (2 diffs)
• test513.m (modified) (1 diff)
• test515.m (modified) (1 diff)
• test516.m (modified) (1 diff)
• test601.m (modified) (1 diff)
• test602.m (modified) (1 diff)
• test603.m (modified) (1 diff)
• test604.m (modified) (1 diff)
• test605.m (modified) (1 diff)
• test606.m (modified) (1 diff)
• test607.m (modified) (1 diff)
• test608.m (modified) (1 diff)
• test609.m (modified) (1 diff)
• test610.m (modified) (1 diff)
• test611.m (modified) (1 diff)
• test612.m (modified) (1 diff)
• test613.m (modified) (1 diff)

issm/trunk-jpl/test/NightlyRun/ad.m

@@ -1 @@
-md=triangle(model,'../Exp/Square.exp',100000);
+md=triangle(model(),'../Exp/Square.exp',100000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelfConstrained.par');

issm/trunk-jpl/test/NightlyRun/ad_maxalloc.m

@@ -1 @@
-md=triangle(model,'../Exp/Square.exp',100000);
+md=triangle(model(),'../Exp/Square.exp',100000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelfConstrained.par');

issm/trunk-jpl/test/NightlyRun/test1106.m

@@ -7 +7 @@
 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');

issm/trunk-jpl/test/NightlyRun/test1201.m

@@ -6 +6 @@
 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');

issm/trunk-jpl/test/NightlyRun/test1208.m

@@ -4 +4 @@
 
 %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');

issm/trunk-jpl/test/NightlyRun/test1501.m

@@ -1 +1 @@
 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');

issm/trunk-jpl/test/NightlyRun/test1502.m

@@ -1 +1 @@
 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');

issm/trunk-jpl/test/NightlyRun/test1601.m

@@ -1 @@
-md=triangle(model,'../Exp/Square.exp',150000);
+md=triangle(model(),'../Exp/Square.exp',150000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelf.par');

issm/trunk-jpl/test/NightlyRun/test1602.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test3001.m

@@ -1 @@
-md=triangle(model,'../Exp/Square.exp',50000);
+md=triangle(model(),'../Exp/Square.exp',50000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelfConstrained.par');

issm/trunk-jpl/test/NightlyRun/test3002.m

@@ -1 @@
-md=triangle(model,'../Exp/Square.exp',180000);
+md=triangle(model(),'../Exp/Square.exp',180000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelfConstrained.par');

issm/trunk-jpl/test/NightlyRun/test3003.m

@@ -1 @@
-md=triangle(model,'../Exp/Square.exp',180000);
+md=triangle(model(),'../Exp/Square.exp',180000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelfConstrained.par');

issm/trunk-jpl/test/NightlyRun/test3004.m

@@ -1 @@
-md=triangle(model,'../Exp/Square.exp',180000);
+md=triangle(model(),'../Exp/Square.exp',180000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelfConstrained.par');

issm/trunk-jpl/test/NightlyRun/test3005.m

@@ -1 @@
-md=triangle(model,'../Exp/Square.exp',150000);
+md=triangle(model(),'../Exp/Square.exp',150000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelfConstrained.par');

issm/trunk-jpl/test/NightlyRun/test3006.m

@@ -1 @@
-md=triangle(model,'../Exp/Square.exp',150000);
+md=triangle(model(),'../Exp/Square.exp',150000);
 md=meshconvert(md);
 md=setmask(md,'all','');

issm/trunk-jpl/test/NightlyRun/test3007.m

@@ -1 @@
-md=triangle(model,'../Exp/Square.exp',150000);
+md=triangle(model(),'../Exp/Square.exp',150000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelfConstrained.par');

issm/trunk-jpl/test/NightlyRun/test3008.m

@@ -1 @@
-md=triangle(model,'../Exp/Square.exp',180000);
+md=triangle(model(),'../Exp/Square.exp',180000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelfConstrained.par');

issm/trunk-jpl/test/NightlyRun/test3009.m

@@ -1 @@
-md=triangle(model,'../Exp/Square.exp',180000);
+md=triangle(model(),'../Exp/Square.exp',180000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelfConstrained.par');

issm/trunk-jpl/test/NightlyRun/test3010.m

@@ -1 @@
-md=triangle(model,'../Exp/Square.exp',150000);
+md=triangle(model(),'../Exp/Square.exp',150000);
 md=setmask(md,'all','');
 md=parameterize(md,'../Par/SquareShelfConstrained.par');

issm/trunk-jpl/test/NightlyRun/test3015.m

@@ -3 +3 @@
 
 %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');

issm/trunk-jpl/test/NightlyRun/test3019.m

@@ -1 +1 @@
 %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');

issm/trunk-jpl/test/NightlyRun/test3020.m

@@ -3 +3 @@
 
 %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');

issm/trunk-jpl/test/NightlyRun/test328.m

@@ -1 @@
-md=triangle(model,'../Exp/Square.exp',150000);
+md=triangle(model(),'../Exp/Square.exp',150000);
 md=setmask(md,'','');
 md=parameterize(md,'../Par/SquareSheetConstrained.par');

issm/trunk-jpl/test/NightlyRun/test329.m

@@ -1 @@
-md=triangle(model,'../Exp/Square.exp',150000);
+md=triangle(model(),'../Exp/Square.exp',150000);
 md=setmask(md,'','');
 md=parameterize(md,'../Par/SquareSheetConstrained.par');

issm/trunk-jpl/test/NightlyRun/test401.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test402.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test403.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test404.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test405.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test406.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test407.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test408.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test409.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test410.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test411.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test412.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test413.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test414.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test415.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test416.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test417.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test418.m

@@ -1 +1 @@
 %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');

issm/trunk-jpl/test/NightlyRun/test419.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test420.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test421.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test422.m

@@ -1 @@
-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');

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

@@ -2 +2 @@
 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);

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

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test425.m

@@ -1 @@
-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');

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

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test427.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test428.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test429.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test430.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test431.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test432.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test501.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test502.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test503.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test504.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test505.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test506.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test507.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test508.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test509.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test510.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test511.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test512.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test512.py

@@ -8 +8 @@
 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 +20 @@
 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]

issm/trunk-jpl/test/NightlyRun/test513.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test515.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test516.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test601.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test602.m

@@ -1 @@
-md=triangle(model,'../Exp/79North.exp',10000);
+md=triangle(model(),'../Exp/79North.exp',10000);
 md=meshconvert(md);
 md=setmask(md,'../Exp/79NorthShelf.exp','');

issm/trunk-jpl/test/NightlyRun/test603.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test604.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test605.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test606.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test607.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test608.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test609.m

@@ -1 @@
-md=triangle(model,'../Exp/79North.exp',10000);
+md=triangle(model(),'../Exp/79North.exp',10000);
 md=meshconvert(md);
 md=setmask(md,'../Exp/79NorthShelf.exp','');

issm/trunk-jpl/test/NightlyRun/test610.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test611.m

@@ -1 @@
-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');

issm/trunk-jpl/test/NightlyRun/test612.m

@@ -1 @@
-md=triangle(model,'../Exp/79North.exp',10000);
+md=triangle(model(),'../Exp/79North.exp',10000);
 md=meshconvert(md);
 md=setmask(md,'../Exp/79NorthShelf.exp','');

issm/trunk-jpl/test/NightlyRun/test613.m

@@ -1 @@
-md=triangle(model,'../Exp/79North.exp',10000);
+md=triangle(model(),'../Exp/79North.exp',10000);
 md=meshconvert(md);
 md=setmask(md,'../Exp/79NorthShelf.exp','');