Changeset 12959

Timestamp:

08/09/12 16:13:42 (13 years ago)

Author:

jschierm

Message:

CHG: Change variable name list in matlab scripts to keep consistent with python, where it is very bad.

Location:

issm/trunk-jpl

Files:

• src/m/model/setflowequation.m (modified) (3 diffs)
• test/NightlyRun/runme.m (modified) (1 diff)

issm/trunk-jpl/src/m/model/setflowequation.m

@@ -135 +135 @@
                 %rule out elements that don't touch the 2 boundaries
                 pos=find(macayealpattynflag);
-                list=zeros(length(pos),1);
-                list = list + any(sum(nodeonmacayeal(md.mesh.elements(pos,:)),2),2);
-                list = list - any(sum(nodeonpattyn(md.mesh.elements(pos,:))  ,2),2);
-                pos1=find(list==1);
+                elist=zeros(length(pos),1);
+                elist = elist + any(sum(nodeonmacayeal(md.mesh.elements(pos,:)),2),2);
+                elist = elist - any(sum(nodeonpattyn(md.mesh.elements(pos,:))  ,2),2);
+                pos1=find(elist==1);
                 macayealflag(pos(pos1))=1;
                 macayealpattynflag(pos(pos1))=0;
-                pos2=find(list==-1);
+                pos2=find(elist==-1);
                 pattynflag(pos(pos2))=1;
                 macayealpattynflag(pos(pos2))=0;
@@ -167 +167 @@
                 %rule out elements that don't touch the 2 boundaries
                 pos=find(pattynstokesflag);
-                list=zeros(length(pos),1);
-                list = list + any(sum(nodeonstokes(md.mesh.elements(pos,:)),2),2);
-                list = list - any(sum(nodeonpattyn(md.mesh.elements(pos,:)),2),2);
-                pos1=find(list==1);
+                elist=zeros(length(pos),1);
+                elist = elist + any(sum(nodeonstokes(md.mesh.elements(pos,:)),2),2);
+                elist = elist - any(sum(nodeonpattyn(md.mesh.elements(pos,:)),2),2);
+                pos1=find(elist==1);
                 stokesflag(pos(pos1))=1;
                 pattynstokesflag(pos(pos1))=0;
-                pos2=find(list==-1);
+                pos2=find(elist==-1);
                 pattynflag(pos(pos2))=1;
                 pattynstokesflag(pos(pos2))=0;
@@ -199 +199 @@
                 %rule out elements that don't touch the 2 boundaries
                 pos=find(macayealstokesflag);
-                list=zeros(length(pos),1);
-                list = list + any(sum(nodeonmacayeal(md.mesh.elements(pos,:)),2),2);
-                list = list - any(sum(nodeonstokes(md.mesh.elements(pos,:))  ,2),2);
-                pos1=find(list==1);
+                elist=zeros(length(pos),1);
+                elist = elist + any(sum(nodeonmacayeal(md.mesh.elements(pos,:)),2),2);
+                elist = elist - any(sum(nodeonstokes(md.mesh.elements(pos,:))  ,2),2);
+                pos1=find(elist==1);
                 macayealflag(pos(pos1))=1;
                 macayealstokesflag(pos(pos1))=0;
-                pos2=find(list==-1);
+                pos2=find(elist==-1);
                 stokesflag(pos(pos2))=1;
                 macayealstokesflag(pos(pos2))=0;

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

@@ -72 +72 @@
 % }}}
 %GET ids  {{{1
-list=dir;%use dir, as it seems to act OS independent
+flist=dir;%use dir, as it seems to act OS independent
 list_ids=[];
-for i=1:numel(list),
-        if ( strncmp(list(i).name,'test',4) &...                         %File name must start with 'test'
-                        strncmp(fliplr(list(i).name),fliplr('.m'),2)&...           %File name must end by '.m'
-                        ~strcmp(list(i).name,'test.m'))                            %File name must be different than 'test.m'
-                list_ids(end+1)=eval(list(i).name(5:end-2));                  %Keep test id only (skip 'test' and '.m')
+for i=1:numel(flist),
+        if ( strncmp(flist(i).name,'test',4) &...                         %File name must start with 'test'
+                        strncmp(fliplr(flist(i).name),fliplr('.m'),2)&...           %File name must end by '.m'
+                        ~strcmp(flist(i).name,'test.m'))                            %File name must be different than 'test.m'
+                list_ids(end+1)=eval(flist(i).name(5:end-2));                  %Keep test id only (skip 'test' and '.m')
         end
 end