Commit 2b384887 authored by Udo Ziegler's avatar Udo Ziegler
Browse files

version 4.1 update

parent c0b0284b
File mode changed from 100755 to 100644
......@@ -6,7 +6,7 @@
*
* Category: Infrastructure.Kernel
*
* Version: 4
* Version: 4.1
*
* @author Udo Ziegler, AIP
*
......@@ -26,7 +26,8 @@ typedef struct /* GENERAL CONTROL PARAMETERS */
amr_Field,amr_exp,rhoref,eref,vref,bref,Cref,amr_eps[5],lo[3],up[3],
omega[3],param[15],xcm[3],mass,Q11,Q22,Q33,Q12,Q13,Q23,O111,O222,O333,
O112,O113,O122,O133,O223,O233,O123,background_density,background_flow,
background_field,walltime,freq_walltime,timings[20],metallicity;
background_field,walltime,freq_walltime,timings[20],metallicity,
boris_cred;
int *reactions_id,flag[8],mod,mod_max,freq_log,freq_nir,freq_ana,level,
level_all,blocks[128],dim[3],idmax[128][3],bnx,bny,bnz,body,species,
species_reactive,reactions,tracer,testfields,dust,exception_type,
......@@ -34,7 +35,7 @@ typedef struct /* GENERAL CONTROL PARAMETERS */
char bc[6],bce[6],partitioning_type[30],signature[99],exception_msg[256];
flag_t mhd_solver_time,mhd_solver_flux,mhd_solver_ef,diss_solver[4],
hd,mf,diss[4],gravity,force,rotating_frame,eos,heatloss,energy,
energy_reactions,NCCM,radiation,multifluid,nbody,dissRKL,
energy_reactions,NCCM,radiation,multifluid,nbody,dissRKL,boris_corr,
geometry,idz,idz2,idz3,idz4,ngc,imr,amr,mode,reactionsTP[99];
} CTL;
......
......@@ -9,7 +9,7 @@
*
* Category: Infrastructure.Kernel
*
* Version: 4
* Version: 4.1
*
* @author Udo Ziegler, AIP
*/
......@@ -67,6 +67,7 @@
#define BUFS 256
#define NO 0
#define YES 1
#define AUTO 2
#define POSITIVE 1
#define NEGATIVE -1
#define OK 0
......@@ -81,12 +82,12 @@
#define BLOCK 0
#define SUPERBLOCK 1
#define SUBMESH -1
#define RK2 0
#define RK3 1
#define CU 0
#define HLLD 1
#define CT 0
#define CCT 1
#define RK2 0
#define RK3 1
#define CU 0
#define HLLD 1
#define CT 0
#define CCT 1
#define STD 0
#define RKL 1
#define VAR_SOL 0
......@@ -180,6 +181,12 @@
fabs(_C.up[1]-PI)<0.5*(_C.up[1]-_C.lo[1])/_C.dim[1])
#define CENTROID 0
#define FACE 1
#define FACEX 2
#define FACEY 3
#define FACEZ 4
#define EDGEX 5
#define EDGEY 6
#define EDGEZ 7
#define NBX (_C.dim[0]/4)
#define NBY (_C.dim[1]/4)
#define NBZ (_C.dim[2]/4)
......@@ -258,6 +265,7 @@ typedef struct grid /* GRID STRUCTURE */
****nX,****C,****tfx,****tfy,****tfz,
***et,***T,***ne,***ex,***ey,***ez,****etfx,****etfy, /* DERIVED */
****etfz,****fx,****fy,****fz,***bsqr,
***B0x,***B0y,***B0z, /* SPLIT B */
****U,****U0,****U1,****U2,****U3,***bx0,***by0,***bz0, /* SCRATCH */
***bx1,***by1,***bz1,***bx2,***by2,***bz2,****tfx1,
****tfy1,****tfz1,
......
File mode changed from 100755 to 100644
......@@ -8,7 +8,7 @@
*
* Category: Infrastructure.User
*
* Version: 4
* Version: 4.1
*
* @author Udo Ziegler, AIP
*
......@@ -34,12 +34,17 @@
#define REACTIONS_TOL 1.e-5 /* REACTIONS SOLVER: REL. ERR TOL */
#define REACTIONS_ATOL_X 0. /* REACTIONS SOLVER: ABS. ERR TOL_X */
#define REACTIONS_ATOL_T 0.01 /* REACTIONS SOLVER: ABS. ERR TOL_T */
#define HLLD_PRESSURE_CORR YES /* HLLD: LOW MACH PRESSURE CORRECTION */
#define HLLD_PRESSURE_CORR NO /* HLLD: LOW MACH CORRECTION:{NO,YES} */
#define BORIS_CORR NO /* BORIS CORRECTION:{NO,YES,AUTO} */
#define BORIS_CRED -10. /* BORIS: RED. C */
#define BORIS_CRED_MIN 1. /* BORIS: MIN RED. C IN UNITS 2|v|+cs */
#define BORIS_AUTO_CA_MAX 4. /* BORIS: MAX CA IN UNITS 2|v|+cs */
/* PHYSICS-RELATED PARAMETERS ----------------------------------------------- */
#define CENTRIFUGAL_FORCE YES /* CENTRIFUGAL FORCE TERM:{YES,NO} */
#define COND_FORCE_ISO NO /* ISOTROPY IN CONDUCTION:{YES,NO} */
#define B_FIELD_SPLITTING NO /* MAGNETIC FIELD SPLITTING:{YES,NO} */
/* NCCM-RELATED PARAMETERS -------------------------------------------------- */
......
......@@ -8,7 +8,7 @@
*
* Category: Infrastructure.Kernel
*
* Version: 4
* Version: 4.1
*
* @author Udo Ziegler, AIP
*/
......@@ -150,7 +150,9 @@ void COtransmitDataInterface(DLT **);
/* utilFV.c -------------------------------------------- Finite-Volume-solver */
void FVcomputeB0(GRD *, flag_t);
void FVcomputeBSQR(GRD **);
void FVcomputeBTSQR(GRD *, double ***);
void FVcomputeFlux(GRD *, double, DER, double ****, double ****, double ****);
void FVcomputeSource(GRD *, double, DER);
void FVdualEnergySync(GRD **);
......@@ -257,6 +259,7 @@ void forceUser(GRD *, double ***, double ***, double ***);
int initDomainUser(double, double, double);
void modifyConfigUser(GRD **);
void modifyFluxUser(GRD *, double, double ****, double ****, double ****);
void sourceB0User(double *, double, double, double);
double sourceCoolingUser(double, double, flag_t *, double *);
double sourceHeatingUser(double, double, flag_t *, double *);
UTAB tabDataUser(void);
......
File mode changed from 100755 to 100644
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment