projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r17: Fixed MPI bugs
[ctsim.git]
/
src
/
phm2rs.c
diff --git
a/src/phm2rs.c
b/src/phm2rs.c
index 1f28679fec2d03489a954a0f69163ac962ee4303..3ed5e97644a0a153ddc6ddb3b1e92d8d7bd5bad5 100644
(file)
--- a/
src/phm2rs.c
+++ b/
src/phm2rs.c
@@
-2,8
+2,15
@@
** 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: phm2rs.c,v 1.
3 2000/04/29 23:24:56
kevin Exp $
+** $Id: phm2rs.c,v 1.
5 2000/04/30 10:13:27
kevin Exp $
** $Log: phm2rs.c,v $
** $Log: phm2rs.c,v $
+** Revision 1.5 2000/04/30 10:13:27 kevin
+** Fixed MPI bugs
+**
+** 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
+**
** Revision 1.3 2000/04/29 23:24:56 kevin
** *** empty log message ***
**
** Revision 1.3 2000/04/29 23:24:56 kevin
** *** empty log message ***
**
@@
-140,9
+147,6
@@
main (const int argc, char *const argv[])
mpi_ct.nproc, MPI_MAX_PROCESS);
exit(1);
}
mpi_ct.nproc, MPI_MAX_PROCESS);
exit(1);
}
-#endif
-
-#ifdef MPI_CT
time_start = MPI_Wtime();
#else
time_start = td_current_sec();
time_start = MPI_Wtime();
#else
time_start = td_current_sec();
@@
-289,6
+293,7
@@
main (const int argc, char *const argv[])
mpi_ct_calc_work_units(opt_nview);
if (mpi_ct.my_rank == 0) {
rs_global = raysum_create_from_det (opt_outfile, det);
mpi_ct_calc_work_units(opt_nview);
if (mpi_ct.my_rank == 0) {
rs_global = raysum_create_from_det (opt_outfile, det);
+ raysum_alloc_views(rs_global);
}
rs_local = raysum_create_from_det (NULL, det);
}
rs_local = raysum_create_from_det (NULL, det);