1
0
Fork 0
mirror of https://github.com/cosmo-sims/MUSIC.git synced 2024-09-19 17:03:46 +02:00
Commit graph

47 commits

Author SHA1 Message Date
Oliver Hahn
19cc12a603 moved all omp function calls into #ifndef SINGLETHREAD_FFTW so that the code also compiles on non-openmp compilers 2012-03-28 12:38:31 -07:00
Oliver Hahn
924092d96c Fixed a missing velocity unit factor when using "linger++" transfer functions, which
have different velocity units than the other transfer functions, and 2LPT.
2011-09-19 18:49:43 -07:00
Oliver Hahn
826071634a updated version to 1.01 2011-08-29 16:12:40 -07:00
Oliver Hahn
e6137dcf07 Fixed a bug that prevented the 'MUSIC' transfer function plugin to be used when
also the 'LINGER++' one was present (they used the same class name, so which one
was actually used depended on the compile order rather than the user choice).
2011-08-29 16:12:14 -07:00
Oliver Hahn
e5f663ab0a Added a missing pragma that leads to errors when compiling for single-threaded FFTW3 2011-07-21 10:43:00 -07:00
Oliver Hahn
6bc18e1aaf More 64 bit compliance fixes for output plugins.
Gadget-2 output plugin now can write multiple output files.
Saved a bit of memory in main loop
2011-06-08 20:58:42 -07:00
Oliver Hahn
0f012ee9f9 a 64bit compliance fix in convolution_kernel
fixed a bug introduced in this branch in random.cc
2011-06-02 15:10:05 -07:00
Oliver Hahn
e470be5da7 added support for new linger++ transfer function file format
cleaned up a bit of code
2011-06-02 11:12:44 -07:00
Oliver Hahn
aac5720a41 more fixes to ensure 64bit compliance throughout the code 2011-06-01 11:25:53 -07:00
Oliver Hahn
b7756e22a0 full64bitcompliance 2011-06-01 11:01:24 -07:00
Oliver Hahn
088fb32c23 Fixed some compiler warnings (and possibly errors with GCC 4.3) 2011-03-16 15:33:03 -07:00
Oliver Hahn
ff5d87273c Some minor fixes. No longer uses FFT to compute 2LPT terms when in unigrid mode and
when using deconolve=true (default=true).
2010-12-13 08:47:01 -08:00
Oliver Hahn
c927462924 Fixed a bug that caused the baryon velocity field to be not shifted in the SPH
case when a transfer function with no velocity info was used.
2010-11-18 22:30:16 -08:00
Oliver Hahn
2ea869e85a Fixed a bug where memory was deallocated that shouldn't be
Re-enabled the staggering for SPH particles.
2010-11-17 21:24:21 -08:00
Oliver Hahn
ccf7c3dab1 changed version number to 0.9b, this is the beta version.
no more features will be added.
2010-11-16 21:01:15 -08:00
Oliver Hahn
3ad0ac6a10 Fixed a memory leak.
Slightly better memory conservation.
Fixed a bug introduced in the previous revision that led to code termination.
2010-11-16 20:56:08 -08:00
Oliver Hahn
8d9068852e * IMPORTANT: removed code left over from testing that caused suppression of small scale perturbations
* added baryon staggering for SPH
* added 2LPT for baryons/DM two-component fluid
* cleaned up some code
2010-11-16 16:41:40 -08:00
Oliver Hahn
27fe21e3d4 Migrated several implementations to .cc files.
Some minor bugfixes.
No longer use Akima splines, use cubic splines in tabulated transfer functions
Added more ocnstraint infrastructure.
2010-11-12 15:05:45 -08:00
Oliver Hahn
f3364e9877 * Added support for velocity potentials for baryons and CDM
* Added new transfer function type 'music' which reads in a file with
  density and velocity transfer functions for baryons and CDM.
* Powerspectrum evolution in two-fluid sim appears to scale as
  predicted now at the per cent level
* Tool to compute velocity transfer functions is not included as of
  now. Let's see..
* Velocity potentials are not yet supported with 2LPT.
2010-11-02 23:35:57 -07:00
Oliver Hahn
61caef1575 2LPT now reuses velocity data to compute displacements in pure DM case (instead of recomputing everything).
Random number generator now creates 'dummy seeds' if seeds are not specified
2010-10-26 22:46:33 -07:00
Oliver Hahn
6735894892 More 64bit fixes and some more OpenMP parallelizations 2010-10-26 21:54:15 -07:00
Oliver Hahn
85ab2aa1ce Hybrid poisson solver is now default 2010-10-26 21:44:17 -07:00
Oliver Hahn
dec2181626 Some more 64bit related fixes.
Fixed a bug in the Gadget-2 output that was left from an unfinished modification.
2010-10-26 21:42:49 -07:00
Oliver Hahn
c98e030c7c Updated MUSIC internal array access to 64bit compatibility.
Added support for FFTW3 (can be switched on in the Makefile), needed for
64bit compatible FFTs.
2010-10-26 11:37:31 -07:00
Oliver Hahn
c09f2adbe4 Random numbers are now only generated once. Can choose between memory caching and disk caching of random numbers
in conf file (option '[random]/disk_cache={yes|no}').
2010-10-04 18:57:24 -07:00
Oliver Hahn
ad709d7400 Various minor fixes.
* Fixed a bug in the coarse grid density correction that lead to a shift in the correction in some rare cases
* Fixed a bug in restricting fine grid noise when the double size fine grid (for FFT) is actually larger than the domain.
* Added new log file routines that use printf syntax
* Added log file output to most parts of the code
* Removed the stats file output, it is now appended to the log file
2010-09-29 15:42:07 -07:00
Oliver Hahn
e424f3c205 Some fixes
* Fixed a normalisation bug in the hybrid Poisson solver
* Added calculation of the exact T(r=0) by summing modes rather than by analytical integration
* Fixed a bug in the deconvolution that caused the Nyquist mode to be excluded in the deconv.
* Fixed a bug in the random number generator when using single thereaded FFTW.
2010-09-28 15:58:41 -07:00
Oliver Hahn
fcc53f6edf Massive code cleanup
New conservative transfer function scheme.
New random number generator that preserves coarse Fourier modes instead of applying Hoffman-Ribak
Some minor bugs fixed.
2010-09-24 16:14:09 -07:00
Oliver Hahn
aa9e88310e Fixed a normalization issue for they hybrid Poisson solver.
Option 'avg_fine' now defaults to 'true'.
2010-09-08 01:06:18 -07:00
Oliver Hahn
275753ede2 Many minor changes
* Moved hybrid poisson solver from convolution_kernel.cc to poisson.cc
* Fine-tuned deconvolution schemes for various running modes
* Added lots of doxygen documentation
2010-08-31 21:59:31 -07:00
Oliver Hahn
af02e4ef4e Added new fine-grid hybrid poisson solver. This can be turned on with '[poisson]/fft_fine=yes'. Needs more testing though.
Also added a cut-off for baryons when using CAMB tabulated transfer functions to reduce ringing.
2010-08-21 19:43:21 -07:00
Oliver Hahn
28701c3d8e Added some logging infra structure. 2010-08-14 18:19:48 -07:00
Oliver Hahn
8e1ed3d284 Added option '[setup]/center_velocities' that centers the box rest-frame to
the mean velocity in the finest refinement grid.
2010-08-05 16:22:40 -07:00
Oliver Hahn
b3622955e8 Added a new averaged transfer function for coarse grids. This beats down errors there and
improves the solution.

Also fixed another bug related to the previous grid placement correction with align_top,
size corrected grids have to be enforced to have an even offset.
2010-08-05 12:14:41 -07:00
Oliver Hahn
a97d185644 Baryon density is now re-normalized when using LLA.
LLA baryon density might deviate from the mean density by up to a few percent.
This is now corrected explcitly by subtracting the mean after calculation
2010-08-05 10:22:03 -07:00
Oliver Hahn
6227b1179a Fixed a bug that sometimes caused wrong offset in multi-grid convolution.
Grid sizes have to be a multiple of 4 during density convolution when using
isolated boundary conditions. Otherwise the padding region is not coextensive
with coarse grid cells. This is now enforced during density generation but
is readjusted afterwards.
2010-08-05 10:19:47 -07:00
Oliver Hahn
a013f95452 Fixed that Gadget-2 particle masses were not written after last update. 2010-07-31 19:33:16 -07:00
Oliver Hahn
dbaad65c5a MAJOR REV: FIXED 2LPT SIGNS, WHICH WERE ACTUALLY CORRECT!!
Note to myself: don't fix signs while listening to talks!!
Other mods/fixes:
* 2LPT is now supported also with distinct baryon/DM
  power spectra. This creates now an overhead when
  using Eisenstein&Hu or BBKS. But who cares.
* Reverted to determinant formulation of LLA rather than
  second order expansion. This is much more accurate.
* Added baryon density filter. Baryon density field is now
  consistent with CIC DM density. This is achieved by
  convolving with an additional grid cell filter (and
  no deconvolution).
* Tested LLA, skewness is now exact to a few per cent
  but tends to be systematically higher.
* 2LPT needs a bit less memory now in multigrid mode
  (FFT based 2LPT still needs humongous amounts).
* Cleaned up code output.
2010-07-31 05:38:55 -07:00
Oliver Hahn
02a822a92a resolving some mercurial issues 2010-07-27 17:01:37 -07:00
Oliver Hahn
fbebfabdfb Fixed a minus in 2LPT. Fixed an issue with a deconvolution filter.
Code needs cleanup! Added (undocumented) k-space 2LPT.
2010-07-27 15:21:50 -07:00
Oliver Hahn
f9e6a8faca Fixed a bug that caused Poisson solver not to converge for baryons and some fields
to have wrong size when using baryons. Fixes bug #2 and #3
2010-07-25 11:40:44 -07:00
Oliver Hahn
002763346f major mod: added subgrid deconvolution for DM
* The DM transfer function is now deconvolved with the cell assignment
  function in order to restore power near the Nyquist wavenumber.
* Added an option to change the random number sample cube size
  [random]/cubesize. This should be set >128 to generate un-
  correlated numbers. True fix pending.
* Removed some unused code
* Increased Buffer size for Gadget-2 output plug-in
2010-07-21 01:10:29 -07:00
Oliver Hahn
2383f8b68d Fixed a bug that lead to refinement grid centering being ignored when using levelmin_TF=levelmax.
Fixed a bug with top grid kernel normalization, this reduces errors a bit.
A non-cubic grid is now extended to a cubic grid in the density calculation. This should reduce artefacts due to TF truncation.
Added a new (undocumented and internal) parameter that forces grid centering on the specified refinement region also in unigrid mode. This should in the future also obey that the shift comes in multiples of the top grid cells (which are however unknown).
Fixed a bug in the generic output plugin that caused non-cubic grids to be cut to cubic grids.
2010-07-09 01:01:54 -07:00
Oliver Hahn
d805e99df3 Fixed a bug that prevented levelmin_TF from working properly.
Fixed a missing reduction operation when normalizing convolution kernels in an OpenMP loop.
Some other minor beauty fixes.
2010-07-07 22:15:33 -07:00
Oliver Hahn
689484eb68 Fixed a bug that caused only 4th order gradients to be used.
Fixed a bug causing wrong shift-backs of particle positions for Gadget.
Disabled optimized unigrid mode as it did not work in all circumstances (issue posted).
2010-07-07 15:31:15 -07:00
Oliver Hahn
288749aea9 minor fixes 2010-07-02 16:17:14 -07:00
Oliver Hahn
c48c73488a Initial commit, beta version release candidate 2010-07-02 11:49:30 -07:00