Squashed merge of svn-insitu-improvements.

The squashed commit consists of the following changes:

commit 84cc8e8d5e4bafaa36a8a38cb2dcb3c1b2f6fcc5
Merge: 00cd4e7 e3ae041
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Thu Feb 6 18:22:18 2014 +0000

    Merge branch 'master' into svn-insitu-improvements

    Conflicts:
    	Makefile
    	cosmotools/programs/cosmotools-driver.cxx
    	env/bashrc.titan-opencl
    	env/bashrc.voyager
    	env/cshrc.edison.gcc
    	env/cshrc.edison.gcc-openmp
    	env/cshrc.titan-opencl
    	nbody/cpu/Makefile
    	nbody/halo_finder/Makefile
    	nbody/opencl/Makefile
    	nbody/opencl/ParticleActions.cxx

    From: George Zagaris <george.zagaris@kitware.com>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1825 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit 00cd4e79bb16efecfd27d6b5ac6263a5ef69285d
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Tue Feb 4 15:35:57 2014 +0000

    BUGFIX: Global-to-local block ID mapping

    Employ Global-to-local block ID mapping when reading
    individual blocks.

    From: George Zagaris <george.zagaris@kitware.com>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1820 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit 4a01dd8b008ca783856f30a8f81c98466c1f41d3
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Mon Feb 3 18:26:53 2014 +0000

    DOC: Added genericio-tutorial to repository

    From: George Zagaris <george.zagaris@kitware.com>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1813 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit 05f9c6cc051ef54de162deeda2fe699d1789c253
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Sat Feb 1 20:45:19 2014 +0000

    BUGFIX: Always construct IJK to rank mapping

    From: George Zagaris <george.zagaris@kitware.com>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1810 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit 47834e421dd16c398695dfa48194fd98c8528a48
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Sat Feb 1 20:45:13 2014 +0000

    BUGFIX: Fix RCB split of size 2

    Fixed issue for the corner case where we split
    along a dimension of size 2, i.e., [0 1].

    From: George Zagaris <george.zagaris@kitware.com>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1809 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit 495a7ec9682c12e76bc869b3b623a32e9827240f
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Fri Jan 31 00:45:10 2014 +0000

    COMP: Compile standalone halofinder (HaloTestP)

    This commit changes the nbody module build such that
    HaloTestP is built by default.

    From: George Zagaris <george.zagaris@kitware.com>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1808 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit 8fd46f0708962eaabc23a3988664858c13ab4ca7
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Fri Jan 31 00:45:08 2014 +0000

    Added very neccesary print statement reporting the compile options set in the GPU code.
    NOTE: Currently we need to set the variable USE_POLY YES to use the polynomial kernel (which is the one that is optimized).

    From: nfrontie <nfrontie@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1807 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit 4cdd289c6634e3b54f0951b68f3cc1d95ee68528
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Fri Jan 31 00:45:06 2014 +0000

    hacc/trunk/halo_finder hacked Makefile to get HaloTestP working, ended up adding -L and -l for libraries in addition to having them in the object list. doesn't seem like this is how things should be but this is how the nbody executable is currently linked

    From: apope <apope@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1806 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit 484dac6cd3c00ad0b1a98079499427dcb89e188c
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Fri Jan 31 00:45:05 2014 +0000

    hacc/trunk fix halo_finder/Makefile for HaloTestP, some problem with SubHaloFinder.o and libhalofinder.a

    From: apope <apope@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1805 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit 29724feb15dbadef005ac65e56ba77bb22f004e0
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Thu Jan 30 16:09:14 2014 +0000

    Updated PM driver with the ifdef changes and GPU initialization that are now required to run on titan.

    From: nfrontie <nfrontie@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1801 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit 571b49608215ed8c6502fb117193bca6af5590b2
Author: apope <apope@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Wed Jan 29 21:04:46 2014 +0000

    hacc/svn-insitu-improvements: same edison PrgEnv swap fixes as hacc/trunk plus some additional minor env whitespace fixes, but no csh setenv syntax fixes for GIO variables as in hacc/trunk

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1799 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit f67095fdf22c9463cc4a4622bfa308806504bc24
Author: hfinkel <hfinkel@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Tue Jan 21 21:14:47 2014 +0000

    fix wrong c files compilation in libBHForceTree

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1794 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit 62511b8dd91184927045f838db1bfd90f463431b
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Tue Jan 21 12:22:44 2014 +0000

    STYLE: Change switch(rank) with if/else.

    This commit changes a switch(rank) pattern used in
    various places in the code with an if/else. The
    switch is confusing, since there is only "one" special
    rank, i.e., rank 0. Using an if/else instead, makes the
    code more clear.

    From: George Zagaris <george.zagaris@kitware.com>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1793 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit bff2e4de75bf830ca76cf68701cfe1c75fec2da6
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Mon Jan 13 14:22:36 2014 +0000

    Ported over all the new GPU changes for branch gpufix

    From: nfrontie <nfrontie@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1791 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit 074f5d038dbfb495fb07d01fc0232ce2a8890487
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Sat Dec 21 01:41:45 2013 +0000

    COMP: Fix missing <iostream> include

    From: George Zagaris <george.zagaris@kitware.com>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1784 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit 718dfebe46c27fc9dabdbe124c476355d07e61e8
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Sat Dec 14 19:14:31 2013 +0000

    Fix an indexing error in the SOD halo finder

    Two lines needed to be changed: I found one, then Nick found the other... teamwork :)

    From: Hal Finkel <hfinkel@anl.gov>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1782 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit 50903dfa3b49396f8e15fde2aa16598c34ae08ac
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Fri Dec 13 22:30:30 2013 +0000

    COMP: Use $(MAKE) instead of `make`

    Use $(MAKE) to call make recursively to ensure that the
    correct executable will be used when building recursivelly,
    e.g., on some systems we may have to do `gmake`, as well
    as ensure that any flags are included accordingly.

    From: George Zagaris <george.zagaris@kitware.com>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1779 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit e82e0210f07c42e1054ba2cde09d25bc6056472f
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Fri Dec 13 22:06:17 2013 +0000

    implemented fix to parrallel build.(tested on voyager and works for the hacc_tpm and hacc_p3m executables). Will begin testing on other machines.

    Conflicts:
    	nbody/halo_finder/Makefile

    From: nfrontie <nfrontie@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1778 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit 7da0d5d9ec6fdaf68afff85989ae1329e07bb01c
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Thu Dec 12 14:50:51 2013 +0000

    numerous changes to support backward compatible nbody build; updates to top level build including opencl support

    Conflicts:
    	Makefile

    From: apope <apope@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1776 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit d65263a961242097c22229f42bcab3b0de9d23b4
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Wed Dec 11 20:58:37 2013 +0000

    ENH: out-of-core support in cosmotools-driver

    Implemented method for reading genericio particle datasets.

    From: George Zagaris <george.zagaris@kitware.com>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1774 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit c4f2bb48a1bf332a4f155cff9b1ecc48b42cb5ae
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Wed Dec 11 20:21:14 2013 +0000

    COMP: Add -DID_64 needed to ensure 64 bit IDs

    Added the -DID_64 macro definition in the HACC_MPI_CXXFLAGS environment
    variable, which was needed to ensure that CosmoTools will be type-compatible
    when compiled within hacc.

    From: George Zagaris <george.zagaris@kitware.com>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1772 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit cdc449fb1248a454f76c57aa79715b95cd1653ed
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Wed Dec 11 16:04:38 2013 +0000

    enable gio file partitioning in HaloTestP

    From: hfinkel <hfinkel@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1771 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit b6d082f893010e80f98a0e635cbe20ef653e1049
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Mon Dec 9 19:00:59 2013 +0000

    ENH: Add I/O to in situ halo finder wrapper

    This commit adds code for I/O to dupm *.haloparticles files in the
    in situ wrapper. Further, it removes other dead/old code in the
    wrapper. Note, this I/O solution is temporary since in the near
    future, the halofinder in CosmoTools would be refactored.

    From: George Zagaris <george.zagaris@kitware.com>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1769 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit 5fb3bc97e4cd360f8268172cbdf4232d692badd9
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Mon Dec 9 19:00:57 2013 +0000

    ENH: Fuse Execute and WriteOutput methods

    From: George Zagaris <george.zagaris@kitware.com>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1768 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit 28a5ae535144811596e18ac96d4298287ebf9fad
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Mon Dec 9 19:00:54 2013 +0000

    ENH: Use *.gio in ParticleIOInSituAlgorithm

    Modified ParticleIOInSituAlgorithm such that it used the *.gio
    extension when dumping particles in GenericIO.

    From: George Zagaris <george.zagaris@kitware.com>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1767 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit 1590486d7080887519df3141459fd493421a3cf5
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Mon Dec 9 19:00:52 2013 +0000

    BUGFIX: Call cosmotoolsExecute correctly

    Fixed wherein the call to cosmotoolsExecute was within the
    native halofinder logic, which was causing cosmotools to execute
    only when the native halofinder was used.

    From: George Zagaris <george.zagaris@kitware.com>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1766 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit de0a9a5e88ad6de0f58a3c3c6106efdbacec12a6
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Mon Dec 9 19:00:50 2013 +0000

    ENH: Implement parallel breakpoint

    Added parallel breakpoint method to facilitate in quick debugging of
    parallel codes.

    From: George Zagaris <george.zagaris@kitware.com>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1765 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit 759fb2b62f62019150ff03d1d1a3db80d196c61f
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Mon Dec 9 19:00:48 2013 +0000

    ENH: Remove ConfigurationRead flag

    From: George Zagaris <george.zagaris@kitware.com>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1764 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit e902a6edd66e0e7dd92e5326a00a9416942e1279
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Mon Dec 9 19:00:46 2013 +0000

    ENH: Remove performance counters

    Removed performance counters from InSituAnalysisManager

    From: George Zagaris <george.zagaris@kitware.com>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1763 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit 90fe7c5a94bbac693a70f88113d74076b7fcb8b7
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Mon Dec 9 19:00:44 2013 +0000

    ENH: turned off sub-halofinding

    Commented out sub-halofinding, which currently is not working properly.

    From: George Zagaris <george.zagaris@kitware.com>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1762 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit 2827be5bcd2db5ab4755880ab7a8903501242247
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Mon Dec 9 19:00:43 2013 +0000

    ENH: Handle conversion of aa to z

    This commit adds functionality to convert the aa
    scale factor at each timestep to the corresponding
    redshift, since the cosmotools API accepts redshifts
    and not the scale factor.

    From: George Zagaris <george.zagaris@kitware.com>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1761 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit de59a18821254acd4a2028f9790ab568c68fcf04
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Mon Dec 9 19:00:40 2013 +0000

    ENH: Improved cosmotools triggers

    This commit improves the config refresh triggering mechanism. Now,
    users can specify a -1 to indicate that the config file will be
    read once. Further, added support for REDSHIFTS in
    InsituAlgorith::ShouldExecute.

    From: George Zagaris <george.zagaris@kitware.com>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1760 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit 5d6238bb4defd5273d85fb5790fc04625a891b59
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Mon Dec 9 19:00:38 2013 +0000

    BUGFIX: Remove MPI_Barrier() from ~MC3Extras

    Removed erroneous MPI_Barrier() from the MC3Extras destructor.
    When the destructor of the MC3Extras object is called, MPI_Finalize()
    has already been called, and hence, no other calls to MPI should be
    made.

    From: George Zagaris <george.zagaris@kitware.com>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1759 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit 36e17029044b1ed0a5bde11b733d12d91fb0dc22
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Mon Dec 9 19:00:36 2013 +0000

    COMP: Single AR command to build GenericIO library

    This commit ensures that when running in parallel a
    single AR command will be issued to build the final
    library archive.

    From: George Zagaris <george.zagaris@kitware.com>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1758 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit dcf53ef5fabb372e956e3457072e4b24eb19e6b5
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Mon Dec 9 19:00:35 2013 +0000

    ENH: Add bash HACC environment on hopper with gcc

    From: George Zagaris <george.zagaris@kitware.com>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1757 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit 55c74cbcd6c10814dbbb5fe8377bd8319a2ca189
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Mon Dec 9 19:00:33 2013 +0000

    COMP: Fix parallel build

    From: George Zagaris <george.zagaris@kitware.com>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1756 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit 21ad872c0dbe2cb6811f1d88ffb8d8f9819d023b
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Mon Dec 9 19:00:31 2013 +0000

    DOC: Correct documentation in HACCGitSvnSetup.sh

    From: George Zagaris <george.zagaris@kitware.com>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1755 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit 48d59dc9016139c79a3cb5bd98fc48c2bc93e1b1
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Mon Dec 9 19:00:29 2013 +0000

    ENH: Merge GenericIO Fix from r1724

    From: Hal Finkel <hfinkel@anl.gov>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1754 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit 4ad1dbb9810ea57a200c1e04f831c94bbb6d7a02
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Mon Dec 9 19:00:27 2013 +0000

    ENH: Script to setup convenient git-svn aliases:wq

    From: George Zagaris <george.zagaris@kitware.com>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1753 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit 4d77935b4b997545e4c2e179d304d18cbeef7751
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Mon Dec 9 19:00:25 2013 +0000

    ENH: Remove setting of GIO vars in env scripts.

    The genericio module Makefile has been updated to
    automatically detect if a hacc environment is present
    in which case, hacc's compiler/flag definitions will
    be used. Hence, there is no longer need to specify
    the genericio compiler/flags in the env scripts.
    This now happens trasparently.

    From: George Zagaris <george.zagaris@kitware.com>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1752 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit b2b46a0cc1212d43ac766409fc3db8cd52a19eee
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Mon Dec 9 19:00:21 2013 +0000

    COMP: Ensure HACC_MPI_LDFLAGS are defined last.

    When building within HACC, it is important to ensure that
    HACC_MPI_LDFLAGS will be at the end, since (a) on certain
    platforms this env variable will bring in MPI, (b) other
    cosmotools dependencies depend on MPI and (c) order of
    static libraries matters.

    From: George Zagaris <george.zagaris@kitware.com>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1751 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit f0d4eaf1f7b220615126e9a6b2a343ecda580116
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Mon Dec 9 19:00:19 2013 +0000

    COMP: Make nbody/cpu work with top-level gio

    From: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1750 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit 3d04908f7c4385cac43d58f8cbbfa139219947fb
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Mon Dec 9 19:00:16 2013 +0000

    ENH: Remove GenericIO code from nbody/halo_finder

    From: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1749 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit 7644369ad690753275b3a796fea1d926141df2b0
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Mon Dec 9 19:00:13 2013 +0000

    COMP: Remove dep to BasicDefinition.h in genericio

    Modified GenericIO2Cosmo.cxx s.t. it compiles w/out
    including BasicDefinition.h which is used in the
    halo-finder code.

    From: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1748 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit e87897d017ef33c907ada8f01317818384444804
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Mon Dec 9 19:00:11 2013 +0000

    ENH: Bring GenericIO2Cosmo & GenericIOCompress.h

    Copy the GenericIO2Cosmo utility, the GenericIOCompress code
    and GenericIOCompressTest to the top-level genericio hacc module.

    From: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1747 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit b3e89cb8dff1597c92f8d714033e2883c1342f65
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Mon Dec 9 19:00:08 2013 +0000

    ENH: Removing gio-redistributable from nbody.

    The genericio module in hacc, hacc/trunk/genericio, can be
    compiled individually outside of hacc as a standalone library.
    Hence, no need for a gio-redistributable that has links to the
    GenericIO library sources.

    From: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1746 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit 98c8f073f8f46005f5c23f5a1db43984ac2a4f12
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Mon Dec 9 19:00:03 2013 +0000

    ENH: Integrate sqlite + build enhancements

    This commit brings in the sqlite thirdparty library
    and GenericIOSQLite. In addition, functionality is
    added to the Makefile-build of the cosmotools and
    genericio modules to detect whether a hacc environment
    is available. This is achieved by checking if the variable
    HACC_PLATFORM is defined. If it is, then HACC compilers/flags
    are used. This simplifies the number of parameters that need
    to be propagated from the master Makefile at the
    top level. Last, made each compilation unit
    print in bold face to make the output of the build
    easier to read.

    From: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1745 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit 28c370fb53fc2a64e824dbf0550d3baf5f63d70f
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Mon Dec 9 18:59:57 2013 +0000

    ENH: Integrate blosc into genericio module

    From: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1744 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit 3bb2edc64f6bdd11816a6bf665827a4d186925f2
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Mon Dec 9 18:59:54 2013 +0000

    ENH: blosc compression

    From: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1743 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

commit f06a9028e776baa36cd2e7b2c663221c7deff7c4
Author: gzagaris <gzagaris@952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf>
Date:   Mon Dec 9 18:27:45 2013 +0000

    Creating branch: svn-insitu-improvements

    git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/branches/svn-insitu-improvements@1742 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf

From: George Zagaris <george.zagaris@kitware.com>

git-svn-id: https://svn.alcf.anl.gov/repos/DarkUniverse/hacc/trunk/cosmotools@1826 952bdfbe-fa2e-45c0-a9ae-ac90d4a62daf
Merge branch 'svn/trunk'