[cig-commits] [commit] master: Merge branch 'master' of github.com:geodynamics/sw4 (d5da240)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/sw4

On branch  : master
Link       : https://github.com/geodynamics/sw4/compare/98d7bd9a0b6cd48a418cfa18d198ad2a7a5f6690...d5da240a9d8092ed6aaf96656a305fa284076d53

>---------------------------------------------------------------

commit d5da240a9d8092ed6aaf96656a305fa284076d53
Merge: 732a4fc 98d7bd9
Author: Anders Petersson <petersson1 at llnl.gov>
Date:   Tue Jan 6 09:15:23 2015 -0800

    Merge branch 'master' of github.com:geodynamics/sw4



>---------------------------------------------------------------

d5da240a9d8092ed6aaf96656a305fa284076d53
 .gitignore                                         |    4 +
 CMakeLists.txt                                     |    2 +-
 Makefile                                           |    2 +-
 src/EW.C                                           |    1 +
 src/EW.h                                           |    2 +-
 src/GridPointSource.C                              |   90 +-
 src/Source.C                                       |   43 +-
 src/TimeDep.h                                      |    2 +-
 src/bcfort.f                                       |    2 +-
 src/lamb_one_point.f                               |  462 ---------
 src/main.C                                         |    2 +-
 src/parallelStuff.C                                |    2 +-
 src/parseInputFile.C                               |   98 +-
 src/sacutils.C                                     |  190 ++++
 src/sacutils.h                                     |   15 +
 .../CMakeFiles/CMakeDirectoryInformation.cmake     |   16 -
 .../Esw4imgDatabase_ser.dir/CXX.includecache       | 1000 --------------------
 .../Esw4imgDatabase_ser.dir/DependInfo.cmake       |   76 --
 .../avtsw4imgFileFormat.C.o                        |  Bin 66264 -> 0 bytes
 .../CMakeFiles/Esw4imgDatabase_ser.dir/build.make  |  222 -----
 .../Esw4imgDatabase_ser.dir/cmake_clean.cmake      |   13 -
 .../Esw4imgDatabase_ser.dir/depend.internal        |  235 -----
 .../CMakeFiles/Esw4imgDatabase_ser.dir/depend.make |  235 -----
 .../CMakeFiles/Esw4imgDatabase_ser.dir/flags.make  |    8 -
 .../CMakeFiles/Esw4imgDatabase_ser.dir/link.txt    |    1 -
 .../Esw4imgDatabase_ser.dir/progress.make          |    5 -
 .../sw4imgCommonPluginInfo.C.o                     |  Bin 12856 -> 0 bytes
 .../sw4imgEnginePluginInfo.C.o                     |  Bin 19060 -> 0 bytes
 .../Esw4imgDatabase_ser.dir/sw4imgPluginInfo.C.o   |  Bin 10624 -> 0 bytes
 .../Isw4imgDatabase.dir/CXX.includecache           |   36 -
 .../Isw4imgDatabase.dir/DependInfo.cmake           |   63 --
 .../CMakeFiles/Isw4imgDatabase.dir/build.make      |  104 --
 .../Isw4imgDatabase.dir/cmake_clean.cmake          |   10 -
 .../CMakeFiles/Isw4imgDatabase.dir/depend.internal |   10 -
 .../CMakeFiles/Isw4imgDatabase.dir/depend.make     |   10 -
 .../CMakeFiles/Isw4imgDatabase.dir/flags.make      |    8 -
 .../sw4img/CMakeFiles/Isw4imgDatabase.dir/link.txt |    1 -
 .../CMakeFiles/Isw4imgDatabase.dir/progress.make   |    2 -
 .../Isw4imgDatabase.dir/sw4imgPluginInfo.C.o       |  Bin 10624 -> 0 bytes
 .../Msw4imgDatabase.dir/CXX.includecache           | 1000 --------------------
 .../Msw4imgDatabase.dir/DependInfo.cmake           |   76 --
 .../Msw4imgDatabase.dir/avtsw4imgFileFormat.C.o    |  Bin 66264 -> 0 bytes
 .../CMakeFiles/Msw4imgDatabase.dir/build.make      |  222 -----
 .../Msw4imgDatabase.dir/cmake_clean.cmake          |   13 -
 .../CMakeFiles/Msw4imgDatabase.dir/depend.internal |  235 -----
 .../CMakeFiles/Msw4imgDatabase.dir/depend.make     |  235 -----
 .../CMakeFiles/Msw4imgDatabase.dir/flags.make      |    8 -
 .../sw4img/CMakeFiles/Msw4imgDatabase.dir/link.txt |    1 -
 .../CMakeFiles/Msw4imgDatabase.dir/progress.make   |    5 -
 .../Msw4imgDatabase.dir/sw4imgCommonPluginInfo.C.o |  Bin 12856 -> 0 bytes
 .../sw4imgMDServerPluginInfo.C.o                   |  Bin 18896 -> 0 bytes
 .../Msw4imgDatabase.dir/sw4imgPluginInfo.C.o       |  Bin 10624 -> 0 bytes
 tools/sw4img/CMakeFiles/progress.marks             |    1 -
 tools/sw4img/Makefile                              |  384 --------
 tools/sw4img/cmake_install.cmake                   |  107 ---
 55 files changed, 433 insertions(+), 4826 deletions(-)