diff --git a/docs/cellcoal.manual.v1.html b/docs/cellcoal.manual.v1.html index 18fa99b..0989378 100644 --- a/docs/cellcoal.manual.v1.html +++ b/docs/cellcoal.manual.v1.html @@ -326,9 +326,9 @@

2. Citation

3. Getting started

    -
  1. Download: get the program from the GitHub repository at https://github.com/dapogon/cellcoal. Under the Code tab you will see a section call release. Click on it download the source code in .zip (or tar.gz) format. Then unzip the cellcoal-x.y.z.zip file (for example, cellcoal-1.0.0.zip). You should see now a folder called cellcoal-x.y.z.Move into the folder to compile and run the program.

  2. +
  3. Download: get the program from the GitHub repository at https://github.com/dapogon/cellcoal. Under the Code tab you will see a section call release. Click on it download the source code in .zip (or tar.gz) format. Then unzip the cellcoal-x.y.z.zip file (for example, cellcoal-1.0.0.zip). You should see now a folder called cellcoal-x.y.z.Move into the folder to compile and run the program.

  4. Compile: type make. The program should compile without much problem in Linux/MacOSX. A Makefile is provided for the gcc compiler. The executable file will be located in the bin folder.

  5. -
  6. Run: type ./cellcoal. In this case, the program arguments will be read from a file called parameters. Alternatively, arguments can be entered directly in the command line.

  7. +
  8. Run: type ./cellcoal. In this case, the program arguments will be read from a file called parameters. Alternatively, arguments can be entered directly in the command line, or from a specific parameter file with a different name.

  9. Inspect results: Once the run is finished, different output files will be written inside a folder called results.

@@ -338,6 +338,8 @@

4. Basic usage

If no arguments are passed in the command line, CellCoal will look for a file called parameters in the current working directory:

./cellcoal

The parameters file is a text file that contains the different arguments for the program. The arguments correspond to different letters whose case (uppercase or lowercase) makes a difference. Comments within brackets are allowed. To avoid unexpected problems, users are encouraged to maintain the same order of the arguments as in the example files. For clarity, the example parameters files are divided in different blocks or sections including related arguments.

+

Alternatively, users can specify their own parameter file (option -F), for example:

+

./ cellcoal -Fmyparameters.txt

Otherwise, CellCoal will run under the arguments specified in the command line, using default values for the absent arguments:

./ cellcoal -n100 -s20 -l1000 -e10000 -g1.0e-04 -k1 -i1 -b1 -j250 -p0.0 -f0.3 0.2 0.2 0.3 -r0.00 0.03 0.12 0.04 0.11 0.00 0.02 0.68 0.68 0.02 0.00 0.11 0.04 0.12 0.03 0.00 -1 -2 -3 -4 -6 -9 -v -x -#200011

A brief usage guide plus the current default values for the different parameters can be obtained with the argument -h:

@@ -903,6 +905,11 @@

6.6 Other options

-##: seed

Seed for the random number generator. If no seed is specified, the current time will be used as seed.

+
+

6.7 Parameter file name at the command line

+

By default, the parameter file is called parameters. Alternatively, the user can indicate the name of the parameter file name at the command line with the option -F, like this:

+

./cellcoal -Fmyparameterfile.txt

+

7. Default settings

diff --git a/docs/cellcoal.manual.v1.pdf b/docs/cellcoal.manual.v1.pdf index c17b71c..a72ffc9 100644 Binary files a/docs/cellcoal.manual.v1.pdf and b/docs/cellcoal.manual.v1.pdf differ