Changeset 3996

Timestamp:

06/02/10 11:36:26 (15 years ago)

Author:

jschierm

Message:

Chaco: minor changes to meshdemo.m in patch file.

File:

• issm/trunk/externalpackages/meshpart/meshpart.patch (modified) (6 diffs)

issm/trunk/externalpackages/meshpart/meshpart.patch

@@ -1 +1 @@
 diff -rc src/chaco/Makefile new/chaco/Makefile
 *** src/chaco/Makefile  1998-07-06 13:08:26.000000000 -0700
---- new/chaco/Makefile  2010-02-23 09:35:05.758059211 -0800
+--- new/chaco/Makefile  2010-04-06 15:51:33.913224536 -0700
 ***************
 *** 24,51 ****
@@ -185 +185 @@
 diff -rc src/chaco/mlchaco.c new/chaco/mlchaco.c
 *** src/chaco/mlchaco.c 1999-07-23 12:19:09.000000000 -0700
---- new/chaco/mlchaco.c 2010-02-22 15:23:01.839849734 -0800
+--- new/chaco/mlchaco.c 2010-04-06 15:51:33.920224545 -0700
 ***************
 *** 32,37 ****
@@ -336 +336 @@
 diff -rc src/chaco.m new/chaco.m
 *** src/chaco.m 1999-07-23 12:13:26.000000000 -0700
---- new/chaco.m 2010-02-22 15:23:01.846849738 -0800
+--- new/chaco.m 2010-04-06 15:51:33.926224552 -0700
 ***************
 *** 142,148 ****
@@ -357 +357 @@
 diff -rc src/fiedler.m new/fiedler.m
 *** src/fiedler.m       1996-02-23 10:03:20.000000000 -0800
---- new/fiedler.m       2010-02-22 15:23:01.852849742 -0800
+--- new/fiedler.m       2010-04-06 15:51:33.932224559 -0700
 ***************
 *** 58,64 ****
@@ -381 +381 @@
 diff -rc src/meshdemo.m new/meshdemo.m
 *** src/meshdemo.m      2002-02-08 07:38:21.000000000 -0800
---- new/meshdemo.m      2010-02-22 15:23:01.859849746 -0800
-***************
-*** 97,103 ****
-  disp(' Hit space to continue ...');
+--- new/meshdemo.m      2010-06-02 11:20:25.564177135 -0700
+***************
+*** 98,103 ****
+--- 98,106 ----
   pause;
   
-! usechaco = 0;
+  usechaco = 0;
++ if (exist('mlchaco','file') == 3)
++     usechaco = 1;
++ end
   if usechaco
   disp(' ');
   disp(' Next is multilevel Kernighan-Lin partitioning, which first partitions');
---- 97,103 ----
-  disp(' Hit space to continue ...');
+***************
+*** 116,122 ****
   pause;
-  
-! usechaco = 1;
-  if usechaco
+  end % if usechaco
+  
+! usemetis = 1;
+  if usemetis
   disp(' ');
-  disp(' Next is multilevel Kernighan-Lin partitioning, which first partitions');
+  disp(' Next is a multilevel method from the "Metis" package.');
+--- 119,128 ----
+  pause;
+  end % if usechaco
+  
+! usemetis = 0;
+! if (exist('metismex','file') == 3)
+!     usemetis = 1;
+! end
+  if usemetis
+  disp(' ');
+  disp(' Next is a multilevel method from the "Metis" package.');
 diff -rc src/metis/metismex.c new/metis/metismex.c
 *** src/metis/metismex.c        2009-07-13 14:37:08.000000000 -0700
---- new/metis/metismex.c        2010-02-22 15:23:01.866849750 -0800
+--- new/metis/metismex.c        2010-04-06 15:51:33.944224574 -0700
 ***************
 *** 92,98 ****
@@ -422 +437 @@
       /* Find MATLAB's matrix structure */
 diff -rc src/metis/proto.h new/metis/proto.h
-*** src/metis/proto.h   2009-09-22 17:24:29.402085000 -0700
---- new/metis/proto.h   2010-02-22 15:23:01.874849755 -0800
+*** src/metis/proto.h   2010-04-13 12:32:38.504256000 -0700
+--- new/metis/proto.h   2010-04-06 15:51:33.949224580 -0700
 ***************
 *** 230,237 ****