[Flexiblesusy-commits] [FlexibleSUSY/FlexibleSUSY] d92c2a: chenged the move_goldstone_to routine to a shuffle...

[GitHub]

  Branch: refs/heads/development
  Home:   https://github.com/FlexibleSUSY/FlexibleSUSY
  Commit: d92c2ac4d996780b4095d0e825f8547309caa391
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/d92c2ac4d996780b4095d0e825f8547309caa391
  Author: Peter Athron <peter.athron at adelaide.edu.au>
  Date:   2014-06-20 (Fri, 20 Jun 2014)

  Changed paths:
    M src/wrappers.hpp

  Log Message:
  -----------
  chenged the move_goldstone_to routine to a shuffle rather than a swap.
thus preserving mass ordering amongst physical states.


  Commit: c4cbf9c86fc7ada287abdac408560a279941e99a
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/c4cbf9c86fc7ada287abdac408560a279941e99a
  Author: Peter Athron <peter.athron at adelaide.edu.au>
  Date:   2014-06-20 (Fri, 20 Jun 2014)

  Changed paths:
    M meta/WriteOut.m
    M src/slha_io.cpp
    M src/slha_io.hpp
    M templates/slha_io.hpp.in
    M test/test_MSSM_slha_input.cpp

  Log Message:
  -----------
  Merge branch 'development' into fix-goldstone-reorder


  Commit: 2843de83cb91e8e2795463062581c134fc1f04f6
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/2843de83cb91e8e2795463062581c134fc1f04f6
  Author: Peter Athron <peter.athron at adelaide.edu.au>
  Date:   2014-06-20 (Fri, 20 Jun 2014)

  Changed paths:
    M src/wrappers.hpp
    M test/test_goldstones.cpp

  Log Message:
  -----------
  resolved conflict.


Compare: https://github.com/FlexibleSUSY/FlexibleSUSY/compare/acb598d2dfa9...2843de83cb91