r224: *** empty log message ***

diff --git a/tools/Makefile.am b/tools/Makefile.am
index ff514447abde20be325180d114b4f98f87357076..7f2398bc4addcda31db6d882933d732b0a9cfe20 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -49,7 +49,7 @@ realclean:
        rm -f *.pgm *.if *~ *.pj
 
 if USE_LAM
        rm -f *.pgm *.if *~ *.pj
 
 if USE_LAM

-CC_LAM = $(lamdir)/bin/balky
+CC_LAM = $(lamdir)/bin/hcp

 LAM_EXTRA_SRC = mpiworld.cpp
 
 pjrec-lam: pjrec.cpp mpiworld.cpp ../include/ct.h  ../libctsim/libctsim.a ../libctsupport/libctsupport.a
 LAM_EXTRA_SRC = mpiworld.cpp
 
 pjrec-lam: pjrec.cpp mpiworld.cpp ../include/ct.h  ../libctsim/libctsim.a ../libctsupport/libctsupport.a

diff --git a/tools/Makefile.in b/tools/Makefile.in
index ce4917d615efe342d42a5cf1360c2ae210a29219..dbfd186286670b5a9819783677d7722dab9cb407 100644 (file)
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -133,7 +133,7 @@ phm2if_lam_LDADD = @ctlamlibs@
 phm2pj_lam_SOURCES = phm2pj.cpp
 phm2pj_lam_LDADD = @ctlamlibs@
 
 phm2pj_lam_SOURCES = phm2pj.cpp
 phm2pj_lam_LDADD = @ctlamlibs@
 

-@USE_LAM_TRUE@CC_LAM = $(lamdir)/bin/balky
+@USE_LAM_TRUE@CC_LAM = $(lamdir)/bin/hcp

 @USE_LAM_TRUE@LAM_EXTRA_SRC = mpiworld.cpp
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 @USE_LAM_TRUE@LAM_EXTRA_SRC = mpiworld.cpp
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h

diff --git a/tools/phm2if.cpp b/tools/phm2if.cpp
index f56a8f1a13c102d9d409b2930f047bc41fae8906..de845725f964c20c9333f917922b32267de57920 100644 (file)
--- a/tools/phm2if.cpp
+++ b/tools/phm2if.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **

-**  $Id: phm2if.cpp,v 1.13 2000/11/09 00:12:25 kevin Exp $
+**  $Id: phm2if.cpp,v 1.14 2000/11/29 11:12:53 kevin Exp $

 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as


@@ -50,7 +50,7 @@ static struct option my_options[] =
   {0, 0, 0, 0}
 };
 
   {0, 0, 0, 0}
 };
 

-static const char* g_szIdStr = "$Id: phm2if.cpp,v 1.13 2000/11/09 00:12:25 kevin Exp $";
+static const char* g_szIdStr = "$Id: phm2if.cpp,v 1.14 2000/11/29 11:12:53 kevin Exp $";

 
 void 
 phm2if_usage (const char *program)
 
 void 
 phm2if_usage (const char *program)


@@ -301,7 +301,7 @@ phm2if_main (int argc, char* argv[])
   pImGlobal = new ImageFile (opt_nx, opt_ny);
 #endif
 
   pImGlobal = new ImageFile (opt_nx, opt_ny);
 #endif
 

-  ImageFileArray v;
+  ImageFileArray v = NULL;

 #ifdef HAVE_MPI
   if (mpiWorld.getRank() == 0)
     v = pImGlobal->getArray ();
 #ifdef HAVE_MPI
   if (mpiWorld.getRank() == 0)
     v = pImGlobal->getArray ();