projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r22: Code cleaning
[ctsim.git]
/
src
/
phm2rs.c
diff --git
a/src/phm2rs.c
b/src/phm2rs.c
index 8c9d450378f2b4ab9336f0b6b463d2142f44b000..0612fb945a14834bb80d13652d3b88ad991e58cd 100644
(file)
--- a/
src/phm2rs.c
+++ b/
src/phm2rs.c
@@
-2,8
+2,14
@@
** 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.
4 2000/04/30 04:06:1
3 kevin Exp $
+** $Id: phm2rs.c,v 1.
6 2000/04/30 18:23:5
3 kevin Exp $
** $Log: phm2rs.c,v $
** $Log: phm2rs.c,v $
+** Revision 1.6 2000/04/30 18:23:53 kevin
+** Code cleaning
+**
+** 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.4 2000/04/30 04:06:13 kevin
** Update Raysum i/o routines
** Fix MPI bug in ctrec (scatter_raysum) that referenced rs_global
@@
-117,8
+123,8
@@
main (const int argc, char *const argv[])
{
DETECTOR *det;
PICTURE *pic = NULL;
{
DETECTOR *det;
PICTURE *pic = NULL;
- RAYSUM *rs_global;
- char str[256], *opt_outfile, opt_desc[MAXREMARK+1];
+ RAYSUM *rs_global
= NULL
;
+ char str[256], *opt_outfile
= NULL
, opt_desc[MAXREMARK+1];
char opt_picfilename[256];
char *endptr, *endstr;
int opt_ndet, opt_nview;
char opt_picfilename[256];
char *endptr, *endstr;
int opt_ndet, opt_nview;
@@
-127,12
+133,12
@@
main (const int argc, char *const argv[])
int opt_verbose = 0;
int opt_debug = 0;
double opt_rotangle = 1;
int opt_verbose = 0;
int opt_debug = 0;
double opt_rotangle = 1;
- double time_start
, time_end
;
+ double time_start
= 0, time_end = 0
;
#ifdef MPI_CT
RAYSUM *rs_local;
int mpi_argc = argc;
char **mpi_argv = (char **) argv;
#ifdef MPI_CT
RAYSUM *rs_local;
int mpi_argc = argc;
char **mpi_argv = (char **) argv;
- double mpi_t1
, mpi_t2
, mpi_t, mpi_t_g;
+ double mpi_t1
= 0, mpi_t2 = 0
, mpi_t, mpi_t_g;
MPI_Init(&mpi_argc, &mpi_argv);
MPI_Comm_dup (MPI_COMM_WORLD, &mpi_ct.comm);
MPI_Init(&mpi_argc, &mpi_argv);
MPI_Comm_dup (MPI_COMM_WORLD, &mpi_ct.comm);
@@
-290,6
+296,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);