Commit c3b4600d authored by Udo Ziegler's avatar Udo Ziegler
Browse files

version 4.1 update

parent 632a0ff8
......@@ -8,7 +8,7 @@
*
* Category: Infrastructure.User
*
* Version: 4
* Version: 4.1
*
* @author Udo Ziegler, AIP
*
......@@ -34,11 +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 NO /* HLLD: LOW MACH CORRECTION:{NO,YES} */
#define BORIS_CORR NO /* BORIS CORRECTION:{NO,YES,AUTO} */
#define BORIS_CRED 2.0 /* BORIS: RED. C */
#define BORIS_CRED_MIN -2. /* BORIS: MIN RED. C IN UNITS 2|v|+cs */
#define BORIS_AUTO_CA_MAX 5. /* BORIS: MAX CA IN UNITS 2|v|+cs */
/* PHYSICS-RELATED PARAMETERS (DO NOT REMOVE) ------------------------------- */
#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 (DO NOT REMOVE) ---------------------------------- */
......
......@@ -8,7 +8,7 @@
*
* Category: Infrastructure.User
*
* Version: 4
* Version: 4.1
*
* @author Udo Ziegler, AIP
*/
......@@ -32,11 +32,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 NO /* HLLD: LOW MACH CORRECTION:{NO,YES} */
#define BORIS_CORR NO /* BORIS CORRECTION:{NO,YES,AUTO} */
#define BORIS_CRED 2.0 /* BORIS: RED. C */
#define BORIS_CRED_MIN -2. /* BORIS: MIN RED. C IN UNITS 2|v|+cs */
#define BORIS_AUTO_CA_MAX 5. /* BORIS: MAX CA IN UNITS 2|v|+cs */
/* PHYSICS-RELATED PARAMETERS (DO NOT REMOVE) ------------------------------- */
#define CENTRIFUGAL_FORCE NO /* 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 (DO NOT REMOVE) ---------------------------------- */
......
......@@ -41,7 +41,7 @@ DDPPPP >bc[0-5]:{I,O,A,M,R,C,P,D,F,U}
0.00000e+00 0.00000e+00 0.00000e+00 >param[12-14] /
0 0 0 0 0 0 0 0 >flag[0-7] /
>SOLVER SPECIFICATIONS ---------------------------------------------------------------------------
RK3 CU CCT 4.0e-01 >mhd_solver_{time,flux,ef},mhd_courant
RK3 HLLD CT 4.0e-01 >mhd_solver_{time,flux,ef},mhd_courant
STD 4.0e-01 >viscosity_{solver,courant}
STD 4.0e-01 >diffusion_{solver,courant}
STD 4.0e-01 >conduction_{solver,courant}
......
......@@ -40,8 +40,8 @@ pih=0.5/_C.permeability;
x0=2.*PI/(_C.up[0]-_C.lo[0]);
rho0=2.77778;
e0=5./3./(_C.gamma-1.);
rho0=_C.gamma*_C.gamma;
e0=_C.gamma/(_C.gamma-1.);
b0=1.;
for(g=gm[0]; (g); g=g->next) /* LOOP OVER BASE GRID ON PARTITION */
......
......@@ -41,7 +41,7 @@ PPPPPP >bc[0-5]:{I,O,A,M,R,C,P,D,F,U}
0.00000e+00 0.00000e+00 0.00000e+00 >param[12-14] /
0 0 0 0 0 0 0 0 >flag[0-7] /
>SOLVER SPECIFICATIONS ---------------------------------------------------------------------------
RK3 CU CCT 5.0e-01 >mhd_solver_{time,flux,ef},mhd_courant
RK3 HLLD CT 4.0e-01 >mhd_solver_{time,flux,ef},mhd_courant
STD 4.0e-01 >viscosity_{solver,courant}
STD 4.0e-01 >diffusion_{solver,courant}
STD 4.0e-01 >conduction_{solver,courant}
......@@ -55,7 +55,7 @@ PPPPPP >bc[0-5]:{I,O,A,M,R,C,P,D,F,U}
N 0.00e+00 >diffusion{,_coeff}
N 0.00e+00 0.00e+00 0.00e+00 >conduction{,_coeff,_coeff_perp,_sat}
N 0.00e+00 >APdiffusion{,_coeff}
Y 0.05 >energy,energy_dual_sw:[0,1]
Y 0.001 >energy,energy_dual_sw:[0,1]
N >force
N >gravity
ADI 1.67e+00 1.00e+00 1.00e+00 >eos,gamma,poly_const,temperature
......
/** @file nirvanaUser.h
*
* @brief User-controllable NIRVANA header
*
* NIRVANA header file containing user-controllable macros.
*
* Copyright (C) 2020 Udo Ziegler
*
* Category: Infrastructure.User
*
* Version: 4.1
*
* @author Udo Ziegler, AIP
*
* @note DO NOT REMOVE ANY MACRO
*/
/* NUMERICS-RELATED PARAMETERS ---------------------------------------------- */
#define SPACE_ORDER 2 /* {2} */
#define LIM(a) VL(a) /* SLOPE LIMITER:{MM,MC,VL} */
#define LIM_MULTI_DIM YES /* {YES,NO} */
#define PSI 0.9 /* PARAMETER IN MULTI_D_LIMITER:[0.5,1] */
#define MAXLEVEL 24 /* MAXIMUM REFINEMENT LEVEL: (<128) */
#define MG_ITMAX 80 /* MULTI-GRID: MAX ITERATIONS */
#define MG_TYPE MULT /* MULTI-GRID: TYPE:{MULT} */
#define MG_TOL 1.e-6 /* MULTI-GRID: ERROR TOLERANCE */
#define RKL_COURANT_EXPL 0.25 /* RKL: EXPL COURANT NUMBER: <0.5 */
#define RKL_MAX_COURANT 1.e3 /* RKL: MAX COURANT NUMBER: <=1000 */
#define RKL_DT_LIM 0.10 /* RKL: DT/DT_DYN LIMIT */
#define HEATLOSS_TOL 1.e-4 /* HEATLOSS SOLVER: REL. ERR TOL */
#define HEATLOSS_ATOL 0.01 /* HEATLOSS SOLVER: ABS. ERR TOL */
#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 NO /* HLLD: LOW MACH CORRECTION:{NO,YES} */
#define BORIS_CORR NO /* BORIS CORRECTION:{NO,YES,AUTO} */
#define BORIS_CRED 10.0 /* BORIS: RED. C */
#define BORIS_CRED_MIN -2.0 /* BORIS: MIN RED. C IN UNITS 2|v|+cs */
#define BORIS_AUTO_CA_MAX -8.0 /* 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 -------------------------------------------------- */
#define CR_IH 1.75e-16 /* H CR IONISATION RATE STD: 2.5e-17
Indriolo & McCall: 1.75e-16 */
#define TDUST 10. /* DUST TEMPERATURE */
#define ADUST 1. /* DUST ABUNDANCE REL. TO MILKY WAY */
#define ISRF_G 0.03 /* ISRF HABING STRENGTH (STD=1.13) */
#define DBNCCM YES /* NCCM DATA BASE AVAILABILITY FLAG */
#define CHECK_REACTIONS YES /* CHECK REACTIONS ? {YES,NO} */
/* ANALYTIC EOS-RELATED MACROS ---------------------------------------------- */
#define PUSR(rho,eth) (0.*(rho)+0.*(eth))
#define CS2USR(rho,eth) (0.*(rho)+0.*(eth))
#define TUSR(rho,eth) (0.*(rho)+0.*(eth))
#define ETUSR(rho,eth) (0.*(rho)+0.*(eth))
/** @file nirvanaUser.h
*
* @brief User-controllable NIRVANA header
*
* NIRVANA header file containing user-controllable macros.
*
* Copyright (C) 2020 Udo Ziegler
*
* Category: Infrastructure.User
*
* Version: 4.1
*
* @author Udo Ziegler, AIP
*
* @note DO NOT REMOVE ANY MACRO
*/
/* NUMERICS-RELATED PARAMETERS ---------------------------------------------- */
#define SPACE_ORDER 2 /* {2} */
#define LIM(a) VL(a) /* SLOPE LIMITER:{MM,MC,VL} */
#define LIM_MULTI_DIM YES /* {YES,NO} */
#define PSI 0.9 /* PARAMETER IN MULTI_D_LIMITER:[0.5,1] */
#define MAXLEVEL 24 /* MAXIMUM REFINEMENT LEVEL: (<128) */
#define MG_ITMAX 80 /* MULTI-GRID: MAX ITERATIONS */
#define MG_TYPE MULT /* MULTI-GRID: TYPE:{MULT} */
#define MG_TOL 1.e-6 /* MULTI-GRID: ERROR TOLERANCE */
#define RKL_COURANT_EXPL 0.25 /* RKL: EXPL COURANT NUMBER: <0.5 */
#define RKL_MAX_COURANT 1.e3 /* RKL: MAX COURANT NUMBER: <=1000 */
#define RKL_DT_LIM 0.10 /* RKL: DT/DT_DYN LIMIT */
#define HEATLOSS_TOL 1.e-4 /* HEATLOSS SOLVER: REL. ERR TOL */
#define HEATLOSS_ATOL 0.01 /* HEATLOSS SOLVER: ABS. ERR TOL */
#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 NO /* HLLD: LOW MACH CORRECTION:{NO,YES} */
#define BORIS_CORR YES /* BORIS CORRECTION:{NO,YES,AUTO} */
#define BORIS_CRED 2.0 /* BORIS: RED. C */
#define BORIS_CRED_MIN -2.0 /* BORIS: MIN RED. C IN UNITS 2|v|+cs */
#define BORIS_AUTO_CA_MAX -8.0 /* 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 -------------------------------------------------- */
#define CR_IH 1.75e-16 /* H CR IONISATION RATE STD: 2.5e-17
Indriolo & McCall: 1.75e-16 */
#define TDUST 10. /* DUST TEMPERATURE */
#define ADUST 1. /* DUST ABUNDANCE REL. TO MILKY WAY */
#define ISRF_G 0.03 /* ISRF HABING STRENGTH (STD=1.13) */
#define DBNCCM YES /* NCCM DATA BASE AVAILABILITY FLAG */
#define CHECK_REACTIONS YES /* CHECK REACTIONS ? {YES,NO} */
/* ANALYTIC EOS-RELATED MACROS ---------------------------------------------- */
#define PUSR(rho,eth) (0.*(rho)+0.*(eth))
#define CS2USR(rho,eth) (0.*(rho)+0.*(eth))
#define TUSR(rho,eth) (0.*(rho)+0.*(eth))
#define ETUSR(rho,eth) (0.*(rho)+0.*(eth))
......@@ -8,7 +8,7 @@
*
* Category: Infrastructure.User
*
* Version: 4
* Version: 4.1
*
* @author Udo Ziegler, AIP
*
......@@ -37,11 +37,16 @@
#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 SPEED FLOW CORRECTION */
#define BORIS_CORR NO /* BORIS CORRECTION:{NO,YES,AUTO} */
#define BORIS_CRED -1.0e+10 /* BORIS: RED. C */
#define BORIS_CRED_MIN 4. /* BORIS: MIN RED. C IN UNITS 2|v|+cs */
#define BORIS_AUTO_CA_MAX 8. /* BORIS: MAX CA IN UNITS 2|v|+cs */
/* PHYSICS-RELATED PARAMETERS ----------------------------------------------- */
#define CENTRIFUGAL_FORCE NO /* 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 -------------------------------------------------- */
......
......@@ -41,7 +41,7 @@ DDOOPP >bc[0-5]:{I,O,A,M,R,C,P,D,F,U}
0.00000e+00 0.00000e+00 0.00000e+00 >param[12-14] /
0 0 0 0 0 0 0 0 >flag[0-7] /
>SOLVER SPECIFICATIONS ---------------------------------------------------------------------------
RK3 HLLD CCT 4.5e-01 >mhd_solver_{time,flux,ef},mhd_courant
RK3 HLLD CT 4.5e-01 >mhd_solver_{time,flux,ef},mhd_courant
STD 4.0e-01 >viscosity_{solver,courant}
STD 4.0e-01 >diffusion_{solver,courant}
STD 4.0e-01 >conduction_{solver,courant}
......
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