Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
William Xu
SPINS_main
Commits
29bd57ab
Commit
29bd57ab
authored
Aug 23, 2017
by
David Deepwell
Browse files
Change some stderr to stdout
Some fprintf statements were written as stderr and should be stdout
parent
12252fbc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
17 deletions
+17
-17
src/NSIntegrator.hpp
src/NSIntegrator.hpp
+14
-14
src/T_util.cpp
src/T_util.cpp
+3
-3
No files found.
src/NSIntegrator.hpp
View file @
29bd57ab
...
...
@@ -228,26 +228,26 @@ namespace NSIntegrator {
default:
abort
();
}
if
(
master
())
{
fprintf
(
std
err
,
"Beginning Navier-Stokes timestepping, on a %d x %d x %d grid
\n
"
,
szx
,
szy
,
szz
);
fprintf
(
std
err
,
"X-dimension: type %s, expansion %s
\n
"
,
DIMTYPE_NAME
[
tx
],
S_EXP_NAME
[
Sx
]);
fprintf
(
std
err
,
"Y-dimension: type %s, expansion %s
\n
"
,
DIMTYPE_NAME
[
ty
],
S_EXP_NAME
[
Sy
]);
fprintf
(
std
err
,
"Z-dimension: type %s, expansion %s
\n
"
,
DIMTYPE_NAME
[
tz
],
S_EXP_NAME
[
Sz
]);
fprintf
(
std
err
,
"%d tracers
\n
"
,(
int
)
tracers
.
size
());
fprintf
(
std
out
,
"Beginning Navier-Stokes timestepping, on a %d x %d x %d grid
\n
"
,
szx
,
szy
,
szz
);
fprintf
(
std
out
,
"X-dimension: type %s, expansion %s
\n
"
,
DIMTYPE_NAME
[
tx
],
S_EXP_NAME
[
Sx
]);
fprintf
(
std
out
,
"Y-dimension: type %s, expansion %s
\n
"
,
DIMTYPE_NAME
[
ty
],
S_EXP_NAME
[
Sy
]);
fprintf
(
std
out
,
"Z-dimension: type %s, expansion %s
\n
"
,
DIMTYPE_NAME
[
tz
],
S_EXP_NAME
[
Sz
]);
fprintf
(
std
out
,
"%d tracers
\n
"
,(
int
)
tracers
.
size
());
for
(
unsigned
int
k
=
0
;
k
<
tracers
.
size
();
k
++
)
{
if
(
t_diffusivity
[
k
]
==
0
)
{
fprintf
(
std
err
,
" tracer %u nondiffusive
\n
"
,
k
);
fprintf
(
std
out
,
" tracer %u nondiffusive
\n
"
,
k
);
}
else
fprintf
(
std
err
,
" tracer %u diffusivity %g
\n
"
,
k
,
t_diffusivity
[
k
]);
fprintf
(
std
out
,
" tracer %u diffusivity %g
\n
"
,
k
,
t_diffusivity
[
k
]);
}
if
(
visco
==
0
)
{
fprintf
(
std
err
,
"Inviscid problem
\n
"
);
fprintf
(
std
out
,
"Inviscid problem
\n
"
);
}
else
{
fprintf
(
std
err
,
"Viscosity %g
\n
"
,
visco
);
fprintf
(
std
out
,
"Viscosity %g
\n
"
,
visco
);
}
if
(
mapped_problem
)
{
fprintf
(
std
err
,
"Mapped grid
\n
"
);
fprintf
(
std
out
,
"Mapped grid
\n
"
);
}
else
{
fprintf
(
std
err
,
"Unmapped grid
\n
"
);
fprintf
(
std
out
,
"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
(
std
err
,
"Performing mapping
\n
"
);
if
(
master
())
fprintf
(
std
out
,
"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
(
std
err
,
"Getting mapped coordinates
\n
"
);
if
(
master
())
fprintf
(
std
out
,
"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
(
std
err
,
"Computing Jacobian
\n
"
);
if
(
master
())
fprintf
(
std
out
,
"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
;
...
...
src/T_util.cpp
View file @
29bd57ab
...
...
@@ -528,7 +528,7 @@ void filter3(DTArray & source, TransWrapper & tform,
high_km
=
values
[
6
];
high_klm
=
values
[
7
];
if
(
0
&&
master
())
{
fprintf
(
std
err
,
"Implicit filtering values:
\n
low_level: %g,
\n
high_k: %g, high_l: %g, high_m: %g,
\n
high_kl: %g, high_lm: %g, high_km: %g,
\n
high_klm: %g
\n
"
,
low_level
,
high_k
,
high_l
,
high_m
,
high_kl
,
high_lm
,
high_km
,
high_klm
);
fprintf
(
std
out
,
"Implicit filtering values:
\n
low_level: %g,
\n
high_k: %g, high_l: %g, high_m: %g,
\n
high_kl: %g, high_lm: %g, high_km: %g,
\n
high_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
(
std
err
,
"Computed iLES filter strengths: %g %g %g
\n
"
,
strength_x
,
strength_y
,
strength_z
);
fprintf
(
std
out
,
"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
(
std
err
,
"Processor %d mapping file %s
\n
"
,
myrank
,
filename
);
fprintf
(
std
out
,
"Processor %d mapping file %s
\n
"
,
myrank
,
filename
);
int
my_fd
=
open
(
filename
,
O_RDONLY
);
// Open the file for mapping
if
(
my_fd
==
-
1
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment