From c62ce075798fd8db209ca3f6a6749e8bd740dc67 Mon Sep 17 00:00:00 2001 From: Ian Jauslin Date: Thu, 26 May 2022 21:26:13 -0400 Subject: Compute energy, enstrophy and alpha all at once --- src/navier-stokes.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/navier-stokes.h') diff --git a/src/navier-stokes.h b/src/navier-stokes.h index 07b7550..7841f8f 100644 --- a/src/navier-stokes.h +++ b/src/navier-stokes.h @@ -18,8 +18,8 @@ int uk( int K1, int K2, int N1, int N2, unsigned int nsteps, double nu, double d // compute the energy as a function of time int energy( int K1, int K2, int N1, int N2, unsigned int nsteps, double nu, double delta, double L, _Complex double* u0, _Complex double* g, unsigned int print_freq, unsigned int nthreads); -// compute alpha -int alpha( int K1, int K2, int N1, int N2, unsigned int nsteps, double nu, double delta, double L, _Complex double* u0, _Complex double* g, unsigned int print_freq, unsigned int nthreads); +// compute energy, enstrophy and alpha +int eea( int K1, int K2, int N1, int N2, unsigned int nsteps, double nu, double delta, double L, _Complex double* u0, _Complex double* g, unsigned int print_freq, unsigned int nthreads); // compute solution as a function of time, but do not print anything (useful for debugging) int quiet( int K1, int K2, int N1, int N2, unsigned int nsteps, double nu, double delta, double L, _Complex double* u0, _Complex double* g, unsigned int nthreads); @@ -46,7 +46,11 @@ int ns_T( _Complex double* u, int K1, int K2, int N1, int N2, fft_vect fft1, fft int ns_T_nofft( _Complex double* out, _Complex double* u, int K1, int K2, int N1, int N2); // compute alpha -_Complex double compute_alpha( _Complex double* u, int K1, int K2, _Complex double* g); +double compute_alpha( _Complex double* u, int K1, int K2, _Complex double* g); +// compute energy +double compute_energy( _Complex double* u, int K1, int K2); +// compute enstrophy +double compute_enstrophy( _Complex double* u, int K1, int K2, double L); // get index for kx,ky in array of size S int klookup( int kx, int ky, int S1, int S2); -- cgit v1.2.3-54-g00ecf