software/Nstrophy
1
Fork 0
Code Issues Pull Requests Releases Activity

running average in statistics file

Browse Source
This commit is contained in:
Ian Jauslin
2023-04-25 16:38:25 -04:00
parent b35be9ea88
commit 519bb72726
3 changed files with 42 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/navier-stokes.c
View File

@@ -1,5 +1,6 @@
#include "navier-stokes.h"
#include "io.h"
#include "navier-stokes.h"
#include "statistics.h"
#include <math.h>
#include <stdlib.h>
#include <string.h>
@@ -131,26 +132,10 @@ int eea(
energy=compute_energy(u, K1, K2);
alpha=compute_alpha(u, K1, K2, g, L);
enstrophy=compute_enstrophy(u, K1, K2, L);
// running average
// reset averages
if(t % print_freq == 1){
avg_e=0;
avg_a=0;
avg_en=0;
}
// compute average
// different computationin first box if starting_time is not a multiple of print_freq
if(t < starting_time + first_box){
avg_e+=energy/first_box;
avg_a+=alpha/first_box;
avg_en+=enstrophy/first_box;
} else {
avg_e+=energy/print_freq;
avg_a+=alpha/print_freq;
avg_en+=enstrophy/print_freq;
}
avg_e=average_step(energy, avg_e, t, starting_time, print_freq, first_box);
avg_a=average_step(alpha, avg_a, t, starting_time, print_freq, first_box);
avg_en=average_step(enstrophy, avg_en, t, starting_time, print_freq, first_box);
if(t>starting_time && t%print_freq==0){
fprintf(stderr,"%lu % .8e % .8e % .8e % .8e % .8e % .8e % .8e\n",t,t*delta, avg_a, avg_e, avg_en, alpha, energy, enstrophy);