diff --git a/faq.rst b/faq.rst index d74175c..cfbdae0 100644 --- a/faq.rst +++ b/faq.rst @@ -264,7 +264,7 @@ mass distribution (e.g. if you are starting with an arbitrary set of particles a build a basis from that with the most naive approach - here you would use ``pnum`` ~ 100 and let it go). These generally don't need to be changed from the defaults. -The EJ parameters are explained in :ref: `the section on centering `. +The EJ parameters are explained in :ref:`the section on centering `. You only want to change these values from their defaults if you have an external perturber, these shouldn't be changed if you are working with with simulations of isolated systems. diff --git a/topics/howtosim.rst b/topics/howtosim.rst index 96aa299..be5cd22 100644 --- a/topics/howtosim.rst +++ b/topics/howtosim.rst @@ -15,7 +15,8 @@ The general steps for creating an N-body simulation in EXP are to: #. Generate a model file and body files. The model file contains the initial density distribution for your dark matter halo. The body file contains the initial phase space positions for (e.g.) your stellar disk and dark matter halo -#. Generate a cache file with your bases. In this example, you would need one cache file for your cylindrical (disk) basis and another for your spherical (halo) basis +#. Generate a cache file with your bases. In this example, you would need one cache file for your cylindrical (disk) basis and another for your spherical (halo) basis. +This is unnecessary in newer versions of EXP. #. Run a three-step relaxation process to ensure that your initial conditions are as quiet as possible @@ -46,83 +47,79 @@ Parameters for ``gendisk`` are specified in a YAML file with the following field CMAPR : 1 # Radial coordinate mapping type for cylindrical grid (0:none, 1:rational fct) CMAPZ : 1 # Vertical coordinate mapping type for cylindrical grid (0:none, 1:sech, 2:power in z DF : 1 # Use change-over from Jeans to Eddington - DFLAG : 6 # Output flags for DiskHalo + DFLAG : 0 # Output flags for DiskHalo DIVERGE : 0 # Cusp extrapolation for primary halo model DIVERGE2 : 0 # Cusp extrapolation for number model DIVERGE_RFAC : 1 # Extrapolation exponent for primary mass model DIVERGE_RFAC2 : 1 # Extrapolation exponent for number model - DMFAC : 0.0 # Disk mass scaling factor for spherical deprojection model - DR_DF : 5 # Width of change for to Eddington + DMFAC : 1.0 # Disk mass scaling factor for spherical deprojection model + DR_DF : 1.0 # Width of change for to Eddington DUMPCOEF : false # Dump coefficients + ASCALE : XXXXX # radial scale length for disk basis construction (e.g. 0.01) HSCALE : XXXXX # Vertical scale length for disk basis construction (e.g. 0.002) - LMAX : 6 # Number of harmonics for Spherical SL for halo/spheroid - LMAXFID : 64 # Number of harmonics for Spherical SL for determining disk basis + LMAX : 18 # Number of harmonics for Spherical SL for halo/spheroid + LMAXFID : 128 # Number of harmonics for Spherical SL for determining disk basis (may want to bump to 256) LOGR : true # Make a logarithmic coordinate mapping MMAX : 6 # Number of azimuthal harmonics for disk basis - NCHEB : 16 # Chebyshev order for smoothing - NDP : 1 + CHEBY : false # Chebyshev smoothing + NCHEB : 12 # Chebyshev order for smoothing if CHEBY = true + NDP : 8 # Number of angular wedges for disc NDR : 2000 # Number of points in DiskHalo radial table for disk - NDZ : 200 # Number of points in DiskHalo vertical table for disk + NDZ : 800 # Number of points in DiskHalo vertical table for disk NHR : 800 # Number of points in DiskHalo radial table for halo - NHT : 200 # Number of points in DiskHalo cos(theta) table for halo + NHT : 800 # Number of points in DiskHalo cos(theta) table for halo NMAXH : 18 # Number of radial basis functions in Spherical SL for halo/spheroid - NMAXFID : 72 # Number of radial basis functions in Spherical SL for determining disk basis - NODD : 8 # Number of vertically antisymmetric disk basis functions per M-order + NMAXFID : 64 # Number of radial basis functions in Spherical SL for determining disk basis (may want to bump to 128) + NODD : 6 # Number of vertically antisymmetric disk basis functions per M-order NMAXD : 18 # Number of disk basis functions per M-order NMAXLIM : 10000 # Restricts disk basis function to NORDER1`. Step Two: generate cache files ****************************** -If you didn't generate cache files in step one, you need to generate these files now. An example of how to do this is in the +If you didn't generate cache files in step one and you have an old install of EXP, you need to generate these files now. An example of how to do this is in the `pyEXP-Examples repo `_. If you are including a stellar disk in your simulation, EXP requires that you provide a cylindrical cache file with a name that matches the ``cachename`` for the **star disk** in the EXP YAML config file. You are not required to provide a spherical cache file, as it is much diff --git a/topics/yamlconfig.rst b/topics/yamlconfig.rst index 290aa67..e5f7826 100644 --- a/topics/yamlconfig.rst +++ b/topics/yamlconfig.rst @@ -97,7 +97,7 @@ is an EXP YAML file with annotation. bodyfile : halo.bod force : id : sphereSL - parameters : {rmax : 27.5} + parameters : {rmax : 2.5} - name : star disk parameters : {nlevel: 1, indexing: true, EJ: 2, nEJkeep: 256, EJdryrun: true} @@ -231,8 +231,8 @@ documentation `. Cachename: slgrid_sph_cache # cache name, this can be omitted if you are only interested in making a basis and not a simulation -The parameters *rmin* and *rmax* define the inner and outer radii for the basis in virial units -(e.g. where :math:`R_{vir} = 1`), *Lmax* and *nmax* describe the maximum harmonic and radial +The parameters *rmin* and *rmax* define the inner and outer radii for the basis in units where +:math:`G = 1`, *Lmax* and *nmax* describe the maximum harmonic and radial orders for the basis, respectively. The *rmapping* parameter adjusts the internal coordinate mapping and a good choice is the characteristic or scale radius of the halo.