mirror of
https://github.com/cosmo-sims/MUSIC.git
synced 2024-09-19 17:03:46 +02:00
reverted some default choices in Makefile and example parameter file after merging of NYX plugin
This commit is contained in:
parent
eb86e9c56b
commit
c23c280b51
2 changed files with 18 additions and 13 deletions
12
Makefile
12
Makefile
|
@ -4,21 +4,18 @@ FFTW3 = yes
|
|||
MULTITHREADFFTW = yes
|
||||
SINGLEPRECISION = no
|
||||
HAVEHDF5 = no
|
||||
HAVEBOXLIB = yes
|
||||
HAVEBOXLIB = no
|
||||
BOXLIB_HOME = ${HOME}/nyx_tot_sterben/BoxLib
|
||||
|
||||
##############################################################################
|
||||
### compiler and path settings
|
||||
CC = mpiicpc
|
||||
CC = g++
|
||||
OPT = -Wall -Wno-unknown-pragmas -O3 -g -msse2
|
||||
CFLAGS =
|
||||
LFLAGS = -lgsl -lgslcblas
|
||||
CPATHS = -I. -I$(HOME)/local/include -I/opt/local/include -I/usr/local/include
|
||||
LPATHS = -L$(HOME)/local/lib -L/opt/local/lib -L/usr/local/lib
|
||||
|
||||
CPATHS = -I. -I$(HOME)/music-stuff/inst/include
|
||||
LPATHS = -L$(HOME)/music-stuff/inst/lib -L$(HOME)/fftw-3.3.3/lib
|
||||
|
||||
##############################################################################
|
||||
# if you have FFTW 2.1.5 or 3.x with multi-thread support, you can enable the
|
||||
# option MULTITHREADFFTW
|
||||
|
@ -79,7 +76,8 @@ endif
|
|||
CFLAGS += $(OPT)
|
||||
TARGET = MUSIC
|
||||
OBJS = output.o transfer_function.o Numerics.o defaults.o constraints.o random.o\
|
||||
convolution_kernel.o region_generator.o densities.o cosmology.o poisson.o densities.o cosmology.o poisson.o log.o main.o \
|
||||
convolution_kernel.o region_generator.o densities.o cosmology.o poisson.o\
|
||||
densities.o cosmology.o poisson.o log.o main.o \
|
||||
$(patsubst plugins/%.cc,plugins/%.o,$(wildcard plugins/*.cc))
|
||||
|
||||
##############################################################################
|
||||
|
@ -119,5 +117,7 @@ endif
|
|||
|
||||
clean:
|
||||
rm -rf $(OBJS)
|
||||
pushd .
|
||||
cd plugins/nyx_plugin; make realclean BOXLIB_HOME=$(BOXLIB_HOME)
|
||||
popd
|
||||
|
||||
|
|
|
@ -2,16 +2,14 @@
|
|||
boxlength = 100
|
||||
zstart = 50
|
||||
levelmin = 7
|
||||
levelmin_TF = 7
|
||||
levelmin_TF = 8
|
||||
levelmax = 7
|
||||
levelmax = 8
|
||||
levelmax = 9
|
||||
padding = 8
|
||||
overlap = 4
|
||||
ref_center = 0.5, 0.5, 0.5
|
||||
ref_extent = 0.2, 0.2, 0.2
|
||||
align_top = yes
|
||||
baryons = yes
|
||||
align_top = no
|
||||
baryons = no
|
||||
use_2LPT = no
|
||||
use_LLA = no
|
||||
periodic_TF = yes
|
||||
|
@ -37,10 +35,12 @@ seed[12] = 67890
|
|||
|
||||
[output]
|
||||
##generic MUSIC data format (used for testing)
|
||||
##requires HDF5 installation and HDF5 enabled in Makefile
|
||||
#format = generic
|
||||
#filename = debug.hdf5
|
||||
|
||||
##ENZO - also outputs the settings for the parameter file
|
||||
##requires HDF5 installation and HDF5 enabled in Makefile
|
||||
#format = enzo
|
||||
#filename = ic.enzo
|
||||
|
||||
|
@ -55,8 +55,13 @@ seed[12] = 67890
|
|||
#ramses_nml = yes
|
||||
|
||||
##TIPSY compatible with PKDgrav and Gasoline
|
||||
format = nyx
|
||||
filename = init
|
||||
#format = tipsy
|
||||
#filename = ics_tipsy.dat
|
||||
|
||||
## NYX compatible output format
|
||||
##requires boxlib installation and boxlib enabled in Makefile
|
||||
#format = nyx
|
||||
#filename = init
|
||||
|
||||
[poisson]
|
||||
fft_fine = yes
|
||||
|
|
Loading…
Reference in a new issue