Changeset 351

Timestamp:

05/12/09 11:06:42 (16 years ago)

Author:

Mathieu Morlighem

Message:

minor

File:

• issm/trunk/test/Miscellaneous/connectivity/runme.m (modified) (3 diffs)

issm/trunk/test/Miscellaneous/connectivity/runme.m

@@ -2 +2 @@
 %depending on the connectivity
 
-%connectivity and density
+%1: connectivity
 Connectivity=13:23;
+
+%2: Density
 %Density=5000:1000:9000;  %parallel 2d
 Density=20000:1000:24000;  %parallel 3d
+
+%3: test 3d?
+is3d=1;
+
+%4: test parallel?
+isparallel=1;
+
+%5: number of CPU (if parallel)
+np=3;
 
 %loop over every case
@@ -26 +37 @@
                 md=parameterize(md,'Square.par');
                 md.connectivity=connectivity;
-                md=extrude(md,4,5);
-                md=setelementstype(md,'pattyn','all');
+                md.np=np;
+                if is3d,
+                        md=extrude(md,4,5);
+                        md=setelementstype(md,'pattyn','all');
+                else
+                        md=setelementstype(md,'macayeal','all');
+                end
 
                 %diagnostic
                 t1=clock;
-                %md=solve(md,'diagnostic','cielo');
-                md.cluster='wilkes'; md=solve(md,'diagnostic_horiz','cielo');
+                if isparallel
+                        md.cluster='wilkes';
+                        md=solve(md,'diagnostic_horiz','cielo');
+                else
+                        md=solve(md,'diagnostic','cielo');
+                end
                 t2=clock;
 
@@ -63 +83 @@
         ylabel('time (s)','FontSize',14)
 end
-