From 614a21007bfb7b949a41e491c5980b7de59ab959 Mon Sep 17 00:00:00 2001 From: Dmity Razdoburdin Date: Wed, 30 Nov 2016 04:48:18 +0300 Subject: [PATCH] main.cpp update --- .gitignore | 1 + configs/params.conf | 2 +- readme.md | 2 +- sourses/main.cpp | 27 ++++++++++++++++++--------- 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index fcd580b..34b719c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ result/ TG_3D TG_3D.log G_* +G(T)_* Script 3D*/ *rus*/ diff --git a/configs/params.conf b/configs/params.conf index b808f54..6b559dc 100644 --- a/configs/params.conf +++ b/configs/params.conf @@ -1 +1 @@ -KEYS=--kx -1500 --ky 100 --Topt 10 --dz 0.002 --C 0.2 --mu 0.2 --sigma 0.1 --cores 2 --cond1 -2 +KEYS=--kx -450 --ky 30 --Topt 10 --dz 0.002 --C 0.2 --mu 0.2 --sigma 0.1 --cores 2 --cond1 -2 diff --git a/readme.md b/readme.md index 8fab96f..410aa82 100644 --- a/readme.md +++ b/readme.md @@ -18,7 +18,7 @@ See paper #PAPER for details + params.conf *Contains numerical parameters of calculation.* + sourses/ *Sourses files:* - + main.cpp *The main project file (uncoment one of five code blocks).* + + main.cpp *The main project file (uncoment one of code blocks).* + classes.h *Header file with classes description.* + methods.cpp *Class methods which are common for all boundary conditions and metric type.* + methods_3D.cpp *Class methods for metric coincident with acoustic energy of perturbations.* diff --git a/sourses/main.cpp b/sourses/main.cpp index 87e7f7b..e6ac17a 100644 --- a/sourses/main.cpp +++ b/sourses/main.cpp @@ -23,7 +23,22 @@ int main(int N_data, char** char_data) // end_code=vec.evolve(data,bg,0,0); // vec.write(data); -//2. Calculating of N singular values. +//2. Evolution of normalised initial condition forward in time with writing full norm and its vertical component to the "result" folder. +// double Ex,Ey,Ez,Ew,Norm; +// perturbation vec(data,bg,0); +// vec.initial_conditions(data); +// vec.normalisation(data,bg); +// vec.gEz_evolve(data,bg,100,0.1); +// vec.norm_components_calc(data,bg,&Ex,&Ey,&Ez,&Ew,&Norm); +// fprintf(stderr,"Ex=%lf\tEy=%lf\tEz=%lf\tEw=%lf\tNorm=%lf\n",Ex,Ey,Ez,Ew,Norm); + +//3. Calculation of integrated over time momentum flux through the box. +// perturbation vec(data,bg,0); +// vec.initial_conditions(data); +// vec.normalisation(data,bg); +// fprintf(stderr,"Flux=%lf\n",vec.full_momentum_flux(data,bg,200,0.1)); + +//4. Calculating of N singular values. optimal* singular_vectors; int j; int N=1; @@ -34,18 +49,12 @@ int main(int N_data, char** char_data) singular_vectors[j].write_G(data,bg,j+1); } -//3. Calculating of G as function of kx. +//5. Calculating of G as function of kx. // double kx_min=-25*data.ky; // double kx_max=10*data.ky; // G_kx(data,bg,kx_min,kx_max,0.5*data.ky); -//4. Calculating G_max by using analytical expression for T_max. Not tested yet. -// double Re_05=2000; -// data.Topt=pow(Re_05,1.0/3.0)*pow(data.ky*0.5,-2.0/3.0)/data.q; -// data.kx=-data.ky*data.q*data.Topt; -// fprintf(stderr,"Topt=%.2lf\tkx=%.2lf\tbeta=%.1lf\n",data.Topt,data.kx,data.kx/data.ky); - -//5. Calculating maximal G over all kx. Not tested yet. +//6. Calculating maximal G over all kx. // G_T G(data, bg); // G.write(data,bg);