Commit 29bd57ab authored by David Deepwell's avatar David Deepwell
Browse files

Change some stderr to stdout

Some fprintf statements were written as stderr and should be stdout
parent 12252fbc
......@@ -228,26 +228,26 @@ namespace NSIntegrator {
default: abort();
}
if (master()) {
fprintf(stderr,"Beginning Navier-Stokes timestepping, on a %d x %d x %d grid\n",szx,szy,szz);
fprintf(stderr, "X-dimension: type %s, expansion %s\n",DIMTYPE_NAME[tx],S_EXP_NAME[Sx]);
fprintf(stderr, "Y-dimension: type %s, expansion %s\n",DIMTYPE_NAME[ty],S_EXP_NAME[Sy]);
fprintf(stderr, "Z-dimension: type %s, expansion %s\n",DIMTYPE_NAME[tz],S_EXP_NAME[Sz]);
fprintf(stderr, "%d tracers\n",(int) tracers.size());
fprintf(stdout,"Beginning Navier-Stokes timestepping, on a %d x %d x %d grid\n",szx,szy,szz);
fprintf(stdout, "X-dimension: type %s, expansion %s\n",DIMTYPE_NAME[tx],S_EXP_NAME[Sx]);
fprintf(stdout, "Y-dimension: type %s, expansion %s\n",DIMTYPE_NAME[ty],S_EXP_NAME[Sy]);
fprintf(stdout, "Z-dimension: type %s, expansion %s\n",DIMTYPE_NAME[tz],S_EXP_NAME[Sz]);
fprintf(stdout, "%d tracers\n",(int) tracers.size());
for (unsigned int k = 0; k < tracers.size(); k++) {
if (t_diffusivity[k] == 0) {
fprintf(stderr," tracer %u nondiffusive\n",k);
fprintf(stdout," tracer %u nondiffusive\n",k);
} else
fprintf(stderr," tracer %u diffusivity %g\n",k,t_diffusivity[k]);
fprintf(stdout," tracer %u diffusivity %g\n",k,t_diffusivity[k]);
}
if (visco == 0) {
fprintf(stderr,"Inviscid problem\n");
fprintf(stdout,"Inviscid problem\n");
} else {
fprintf(stderr,"Viscosity %g\n",visco);
fprintf(stdout,"Viscosity %g\n",visco);
}
if (mapped_problem) {
fprintf(stderr,"Mapped grid\n");
fprintf(stdout,"Mapped grid\n");
} else {
fprintf(stderr,"Unmapped grid\n");
fprintf(stdout,"Unmapped grid\n");
}
}
......@@ -262,7 +262,7 @@ namespace NSIntegrator {
BaseCase to return a Jacobian directly (necessary for
mapping), set this automatically based on lengths */
if (mapped_problem) {
if (master()) fprintf(stderr,"Performing mapping\n");
if (master()) fprintf(stdout,"Performing mapping\n");
assert (Sz == CHEBY);
x_alpha = new DTArray(local_lbounds,local_extents,local_storage);
x_beta = new DTArray(local_lbounds,local_extents,local_storage);
......@@ -274,7 +274,7 @@ namespace NSIntegrator {
DTArray & xgrid = *get_temp();
DTArray & ygrid = *get_temp();
DTArray & zgrid = *get_temp();
if (master()) fprintf(stderr,"Getting mapped coordinates\n");
if (master()) fprintf(stdout,"Getting mapped coordinates\n");
usercode->do_mapping(xgrid,ygrid,zgrid);
// Remove the base length in x from xgrid,
// because a linear map (x->x) doesn't play well with a trig
......@@ -287,7 +287,7 @@ namespace NSIntegrator {
blitz::firstIndex ii;
xgrid = xgrid - (Lx/bl_x)*cos(ii*M_PI/(szx-1));
}
if (master()) fprintf(stderr,"Computing Jacobian\n");
if (master()) fprintf(stdout,"Computing Jacobian\n");
gradient->setup_array(&xgrid,(Sx==SINE || Sx==REAL ? COSINE : Sx),Sy,Sz);
gradient->get_dx(x_alpha);
*x_alpha = *x_alpha + Lx/bl_x;
......
......@@ -528,7 +528,7 @@ void filter3(DTArray & source, TransWrapper & tform,
high_km = values[6];
high_klm = values[7];
if (0&&master()) {
fprintf(stderr,"Implicit filtering values:\n low_level: %g, \nhigh_k: %g, high_l: %g, high_m: %g, \nhigh_kl: %g, high_lm: %g, high_km: %g, \nhigh_klm: %g\n",low_level,high_k,high_l,high_m,high_kl,high_lm,high_km,high_klm);
fprintf(stdout,"Implicit filtering values:\n low_level: %g, \nhigh_k: %g, high_l: %g, high_m: %g, \nhigh_kl: %g, high_lm: %g, high_km: %g, \nhigh_klm: %g\n",low_level,high_k,high_l,high_m,high_kl,high_lm,high_km,high_klm);
}
// Now, compute what sort of strengths are required to tame possible
......@@ -633,7 +633,7 @@ void filter3(DTArray & source, TransWrapper & tform,
if (0&&master()) {
fprintf(stderr,"Computed iLES filter strengths: %g %g %g\n",strength_x,strength_y,strength_z);
fprintf(stdout,"Computed iLES filter strengths: %g %g %g\n",strength_x,strength_y,strength_z);
}
/* Rescale the k,l,m vectors such that the filter is of the appropriate
......@@ -917,7 +917,7 @@ void read_array(blitz::Array<double,3> & ar, const char * filename,
continue;
}
fprintf(stderr,"Processor %d mapping file %s\n",myrank,filename);
fprintf(stdout,"Processor %d mapping file %s\n",myrank,filename);
int my_fd = open(filename,O_RDONLY); // Open the file for mapping
if (my_fd == -1) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment