From 232822a183703c5308eb424ab5aaaeeff9c736c6 Mon Sep 17 00:00:00 2001 From: Ian Jauslin Date: Wed, 18 May 2022 10:42:30 +0200 Subject: tiny fix --- julia/navier_stokes.jl | 2 +- julia/print.jl | 2 +- src/navier-stokes.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/julia/navier_stokes.jl b/julia/navier_stokes.jl index 5f8a9ca..a76e918 100644 --- a/julia/navier_stokes.jl +++ b/julia/navier_stokes.jl @@ -18,7 +18,7 @@ function navier_stokes_uk( if i % print_freq==0 @printf("% .15e ",delta*i) - print_u(u,N1,N2,K1,K2) + print_u_inline(u,N1,N2,K1,K2) # print to stderr @printf(stderr,"% .8e ",delta*i) diff --git a/julia/print.jl b/julia/print.jl index 7e04013..61be40d 100644 --- a/julia/print.jl +++ b/julia/print.jl @@ -1,4 +1,4 @@ -function print_u( +function print_u_inline( u::Array{Complex{Float64},1}, N1::Int64, N2::Int64, diff --git a/src/navier-stokes.c b/src/navier-stokes.c index ab4803c..3fbce07 100644 --- a/src/navier-stokes.c +++ b/src/navier-stokes.c @@ -34,8 +34,8 @@ int uk( ins_step(u, K1, K2, N1, N2, nu, delta, g, fft1, fft2, ifft, tmp1, tmp2, tmp3); if(t%print_freq==0){ - fprintf(stderr,"% .8e ",t*delta); - printf("% .15e ",t*delta); + fprintf(stderr,"%d % .8e ",t,t*delta); + printf("%8d % .15e ",t,t*delta); for(kx=-K1;kx<=K1;kx++){ for (ky=-K2;ky<=K2;ky++){ @@ -43,7 +43,7 @@ int uk( fprintf(stderr,"% .8e % .8e ",__real__ u[klookup(kx,ky,2*K1+1,2*K2+1)], __imag__ u[klookup(kx,ky,2*K1+1,2*K2+1)]); } - printf("% .8e % .8e ",__real__ u[klookup(kx,ky,2*K1+1,2*K2+1)], __imag__ u[klookup(kx,ky,2*K1+1,2*K2+1)]); + printf("% .15e % .15e ",__real__ u[klookup(kx,ky,2*K1+1,2*K2+1)], __imag__ u[klookup(kx,ky,2*K1+1,2*K2+1)]); } } fprintf(stderr,"\n"); -- cgit v1.2.3-54-g00ecf