X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Fphm2if.cpp;h=9b2b33b040798ad2a4647180aaa65616d33a2a4f;hb=013445d4e52c07491291289eb32fa325d9f9f8ff;hp=2afac40c8030132cec197c927aa62f3610d05087;hpb=59ff52843f44bec1ecd1ad36625cdda305cc7ef8;p=ctsim.git

diff --git a/src/phm2if.cpp b/src/phm2if.cpp
index 2afac40..9b2b33b 100644
--- a/src/phm2if.cpp
+++ b/src/phm2if.cpp
@@ -1,50 +1,15 @@
 /*****************************************************************************
-**  This is part of the CTSim program
-**  Copyright (C) 1983-2000 Kevin Rosenberg
-**
-**  $Id: phm2if.cpp,v 1.3 2000/06/07 07:43:19 kevin Exp $
-**  $Log: phm2if.cpp,v $
-**  Revision 1.3  2000/06/07 07:43:19  kevin
-**  Converted to IF data files and C++
-**
-**  Revision 1.2  2000/06/07 03:50:27  kevin
-**  *** empty log message ***
-**
-**  Revision 1.1  2000/06/07 02:29:05  kevin
-**  Initial C++ versions
-**
-**  Revision 1.10  2000/05/24 22:50:04  kevin
-**  Added support for new SGP library
-**
-**  Revision 1.9  2000/05/16 04:33:59  kevin
-**  Improved option processing
-**
-**  Revision 1.8  2000/05/11 01:06:30  kevin
-**  Changed sprintf to snprintf
-**
-**  Revision 1.7  2000/05/08 20:02:32  kevin
-**  ANSI C changes
-**
-**  Revision 1.6  2000/05/03 08:49:50  kevin
-**  Code cleanup
-**
-**  Revision 1.5  2000/04/30 19:17:54  kevin
-**  *** empty log message ***
-**
-**  Revision 1.4  2000/04/30 04:06:13  kevin
-**  Update Raysum i/o routines
-**  Fix MPI bug in ctrec (scatter_raysum) that referenced rs_global
+** FILE IDENTIFICATION
 **
-**  Revision 1.3  2000/04/28 18:19:01  kevin
-**  removed unused files
-**
-**  Revision 1.2  2000/04/28 13:50:45  kevin
-**  Removed Makefile Makefile.in that are automatically generated by autoconf
-**
-**  Revision 1.1.1.1  2000/04/28 13:02:44  kevin
-**  Initial CVS import for first public release
+**   Name:          phm2if.cpp
+**   Purpose:       Convert an phantom object to an image file
+**   Programmer:    Kevin Rosenberg
+**   Date Started:  1984
 **
+**  This is part of the CTSim program
+**  Copyright (C) 1983-2000 Kevin Rosenberg
 **
+**  $Id: phm2if.cpp,v 1.5 2000/06/08 16:43:10 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
@@ -137,8 +102,8 @@ phm2sdf_usage (const char *program)
   fprintf(stdout,"     --help          Print this help message\n");
 }
 
-#ifdef MPI_CT
-void mpi_gather_image (ImageFile& im_global, ImageFile& im_local, const int opt_debug);
+#ifdef HAVE_MPI
+void mpi_gather_image (ImageFile* im_global, ImageFile* im_local, const int opt_debug);
 #endif
 
 int 
@@ -161,30 +126,30 @@ phm2sdf_main (const int argc, char *const argv[])
   int opt_trace = TRACE_NONE;
   int opt_verbose = 0;
   double time_start=0, time_end=0;
-#ifdef MPI_CT
+#ifdef HAVE_MPI
   ImageFile* im_local = NULL;
   int mpi_argc = argc;
   char **mpi_argv = (char **) argv;
   double mpi_t1, mpi_t2, mpi_t, mpi_t_g;
 
-  MPI_Init(&mpi_argc, &mpi_argv);
-  MPI_Comm_dup (MPI_COMM_WORLD, &mpi_ct.comm);
-  MPI_Comm_size(mpi_ct.comm, &mpi_ct.nproc);
-  MPI_Comm_rank(mpi_ct.comm, &mpi_ct.my_rank);
+  MPI::Init (mpi_argc, mpi_argv);
+  mpi_ct.comm = MPI::COMM_WORLD.Dup ();
+  mpi_ct.nproc = mpi_ct.comm.Get_size();
+  mpi_ct.my_rank = mpi_ct.comm.Get_rank();
 
-  if (mpi_ct.nproc > MPI_MAX_PROCESS) {
+  if (mpi_ct.nproc > CT_MPI_MAX_PROCESS) {
     sys_error(ERR_FATAL, "Number of mpi processes (%d) exceeds max processes (%d)",
-	      mpi_ct.nproc, MPI_MAX_PROCESS);
+	      mpi_ct.nproc, CT_MPI_MAX_PROCESS);
   }
 #endif
 
-#ifdef MPI_CT
-  time_start = MPI_Wtime();
+#ifdef HAVE_MPI
+  time_start = MPI::Wtime();
 #else
   time_start = td_current_sec();
 #endif
   
-#ifdef MPI_CT
+#ifdef HAVE_MPI
   if (mpi_ct.my_rank == 0) {
 #endif
 
@@ -208,7 +173,7 @@ phm2sdf_main (const int argc, char *const argv[])
       case O_PHMFILE:
 	strncpy(opt_phmfilename, optarg, sizeof(opt_phmfilename));
 	phm = phm_create_from_file(opt_phmfilename);
-#ifdef MPI_CT
+#ifdef HAVE_MPI
 	if (mpi_ct.my_rank == 0) 
 	  fprintf(stderr, "Can't use phantom from file in MPI mode\n");
 	return (1);
@@ -333,28 +298,28 @@ phm2sdf_main (const int argc, char *const argv[])
     
     if (opt_verbose)
       printf("Rasterize Phantom to Image\n\n");
-#ifdef MPI_CT
+#ifdef HAVE_MPI
   }
 #endif
 
-#ifdef MPI_CT
-  mpi_t1 = MPI_Wtime();
-  MPI_Bcast(&opt_verbose, 1, MPI_INT, 0, mpi_ct.comm);
-  MPI_Bcast(&opt_debug, 1, MPI_INT, 0, mpi_ct.comm);
-  MPI_Bcast(&opt_trace, 1, MPI_INT, 0, mpi_ct.comm);
-  MPI_Bcast(&opt_nx, 1, MPI_INT, 0, mpi_ct.comm);
-  MPI_Bcast(&opt_ny, 1, MPI_INT, 0, mpi_ct.comm);
-  MPI_Bcast(&opt_nsample, 1, MPI_INT, 0, mpi_ct.comm);
-  MPI_Bcast(&opt_phmnum, 1, MPI_INT, 0, mpi_ct.comm);
-  MPI_Bcast(&opt_filter, 1, MPI_INT, 0, mpi_ct.comm);
-  MPI_Bcast(&opt_filter_domain, 1, MPI_INT, 0, mpi_ct.comm);
-  MPI_Bcast(&opt_filter_param, 1, MPI_DOUBLE, 0, mpi_ct.comm);
-  MPI_Bcast(&opt_filter_bw, 1, MPI_DOUBLE, 0, mpi_ct.comm);
+#ifdef HAVE_MPI
+  mpi_t1 = MPI::Wtime();
+  mpi_ct.comm.Bcast (&opt_verbose, 1, MPI::INT, 0);
+  mpi_ct.comm.Bcast (&opt_debug, 1, MPI::INT, 0);
+  mpi_ct.comm.Bcast (&opt_trace, 1, MPI::INT, 0);
+  mpi_ct.comm.Bcast (&opt_nx, 1, MPI::INT, 0);
+  mpi_ct.comm.Bcast (&opt_ny, 1, MPI::INT, 0);
+  mpi_ct.comm.Bcast (&opt_nsample, 1, MPI::INT, 0);
+  mpi_ct.comm.Bcast (&opt_phmnum, 1, MPI::INT, 0);
+  mpi_ct.comm.Bcast (&opt_filter, 1, MPI::INT, 0);
+  mpi_ct.comm.Bcast (&opt_filter_domain, 1, MPI::INT, 0);
+  mpi_ct.comm.Bcast (&opt_filter_param, 1, MPI::DOUBLE, 0);
+  mpi_ct.comm.Bcast (&opt_filter_bw, 1, MPI::DOUBLE, 0);
 
   if (opt_verbose) {
-    mpi_t2 = MPI_Wtime();
+    mpi_t2 = MPI::Wtime();
     mpi_t = mpi_t2 - mpi_t1;
-    MPI_Reduce(&mpi_t, &mpi_t_g, 1, MPI_DOUBLE, MPI_MAX, 0, mpi_ct.comm);
+    mpi_ct.comm.Reduce (&mpi_t, &mpi_t_g, 1, MPI::DOUBLE, MPI::MAX, 0);
     if (mpi_ct.my_rank == 0)
       printf("Time to Bcast vars = %f secs, Max time = %f\n", mpi_t, mpi_t_g);
   }
@@ -365,7 +330,6 @@ phm2sdf_main (const int argc, char *const argv[])
     im_global = new ImageFile (opt_outfile, opt_nx, opt_ny);
     im_global->adf.fileCreate();
   }
-
   im_local = new ImageFile (opt_nx, opt_ny);
 #else
   im_global = new ImageFile (opt_outfile, opt_nx, opt_ny);
@@ -375,7 +339,7 @@ phm2sdf_main (const int argc, char *const argv[])
   if (opt_phmnum >= 0)
       phm = phm_create (opt_phmnum);
 
-#ifdef MPI_CT
+#ifdef HAVE_MPI
   else {
     if (mpi_ct.my_rank == 0)
       fprintf(stderr, "phmnum < 0\n");
@@ -383,10 +347,13 @@ phm2sdf_main (const int argc, char *const argv[])
   }
 #endif
 
-  ImageFileArray v = im_global->getArray ();
   double calctime = 0;
+  ImageFileArray v;
+
+#ifdef HAVE_MPI
+  if (mpi_ct.my_rank == 0)
+    v = im_global->getArray ();
 
-#ifdef MPI_CT
   if (phm->type == P_UNIT_PULSE) {
     if (mpi_ct.my_rank == 0) {
       v[opt_nx/2][opt_ny/2] = 1.;
@@ -398,19 +365,22 @@ phm2sdf_main (const int argc, char *const argv[])
       calctime = 0;
     }
   } else {
+    mpi_ct.comm.Barrier();
+
     if (opt_verbose)
-      mpi_t1 = MPI_Wtime();
+      mpi_t1 = MPI::Wtime();
     phm_to_imagefile (phm, *im_local, mpi_ct.start_work_unit[mpi_ct.my_rank],  mpi_ct.local_work_units[mpi_ct.my_rank], opt_nsample, opt_trace);
     if (opt_verbose) {
-      mpi_t2 = MPI_Wtime();
+      mpi_t2 = MPI::Wtime();
       mpi_t = mpi_t2 - mpi_t1;
-      MPI_Reduce(&mpi_t, &mpi_t_g, 1, MPI_DOUBLE, MPI_MAX, 0, mpi_ct.comm);
+      mpi_ct.comm.Reduce(&mpi_t, &mpi_t_g, 1, MPI::DOUBLE, MPI::MAX, 0);
       if (mpi_ct.my_rank == 0)
 	printf("Time to compile phm = %f secs, Max time = %f\n", mpi_t, mpi_t_g);
     }
-    mpi_gather_image(*im_global, *im_local, opt_debug);
+    mpi_gather_image(im_global, im_local, opt_debug);
   }
 #else
+  v = im_global->getArray ();
   if (phm->type == P_UNIT_PULSE) {
     v[opt_nx/2][opt_ny/2] = 1.;
     calctime = 0;
@@ -426,13 +396,13 @@ phm2sdf_main (const int argc, char *const argv[])
   }
 #endif
 
-#ifdef MPI_CT
-  time_end = MPI_Wtime();
+#ifdef HAVE_MPI
+  time_end = MPI::Wtime();
 #else
   time_end = td_current_sec();
 #endif
 
-#ifdef MPI_CT
+#ifdef HAVE_MPI
   if (mpi_ct.my_rank == 0) 
 #endif
   {
@@ -442,17 +412,17 @@ phm2sdf_main (const int argc, char *const argv[])
     im_global->adf.fileClose ();
     if (opt_verbose)
       fprintf (stdout, "Time to compile image = %.2f sec\n\n", calctime);
-  }
-
-  if (opt_trace >= TRACE_PHM) {
-    double dmin, dmax;
-    int nscale;
 
-    printf ("Enter display size scale (nominal = 1): ");
-    scanf ("%d", &nscale);
-    printf ("Enter minimum and maximum densities (min, max): ");
-    scanf ("%lf %lf", &dmin, &dmax);
-    image_display_scale (*im_global, nscale, dmin, dmax);
+    if (opt_trace >= TRACE_PHM) {
+      double dmin, dmax;
+      int nscale;
+      
+      printf ("Enter display size scale (nominal = 1): ");
+      scanf ("%d", &nscale);
+      printf ("Enter minimum and maximum densities (min, max): ");
+      scanf ("%lf %lf", &dmin, &dmax);
+      image_display_scale (*im_global, nscale, dmin, dmax);
+    }
   }
 
   phm_free (phm);
@@ -462,17 +432,18 @@ phm2sdf_main (const int argc, char *const argv[])
 
 
 
-#ifdef MPI_CT
-void mpi_gather_image (ImageFile& im_global, ImageFile& im_local, const int opt_debug)
+#ifdef HAVE_MPI
+void mpi_gather_image (ImageFile* im_global, ImageFile* im_local, const int opt_debug)
 {
-  ImageFileArray vLocal = im_local.getArray();
-  ImageFileArray vGlobal = im_global.getArray();
-  int nyLocal = im_local.ny();
-  int nyGlobal = im_global.ny();
+  ImageFileArray vLocal = im_local->getArray();
+  ImageFileArray vGlobal = NULL;
+  if (mpi_ct.my_rank == 0)
+    vGlobal = im_global->getArray();
+  int nyLocal = im_local->ny();
   
   int end_work_unit = mpi_ct.local_work_units[mpi_ct.my_rank] - 1;
   for (int iw = 0; iw <= end_work_unit; iw++) {
-    MPI_Send(vLocal[iw], nyLocal, im_local.getMPIDataType(), 0, 0, mpi_ct.comm);
+    mpi_ct.comm.Send(vLocal[iw], nyLocal, im_local->getMPIDataType(), 0, 0);
   }
 
   if (mpi_ct.my_rank == 0) {
@@ -485,8 +456,8 @@ void mpi_gather_image (ImageFile& im_global, ImageFile& im_local, const int opt_
       }
 
       for (int iw = mpi_ct.start_work_unit[iproc]; iw <= end_work_unit; iw++) {
-	MPI_Status status;
-	MPI_Recv(vGlobal[iw], nyGlobal, MPI_FLOAT, iproc, 0, mpi_ct.comm, &status);
+	MPI::Status status;
+	mpi_ct.comm.Recv(vGlobal[iw], nyLocal, im_local->getMPIDataType(), iproc, 0, status);
       }
     }
   }