[Flexiblesusy-commits] [FlexibleSUSY/FlexibleSUSY] 4e6a97: wrap header inclusions for two-scale models around...

[GitHub]

  Branch: refs/heads/feature-root-solver
  Home:   https://github.com/FlexibleSUSY/FlexibleSUSY
  Commit: 4e6a97080a5b95eeda5d028b36484767581f3eb4
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/4e6a97080a5b95eeda5d028b36484767581f3eb4
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-07-12 (Sun, 12 Jul 2015)

  Changed paths:
    M templates/high_scale_spectrum_generator.hpp.in
    M templates/low_scale_spectrum_generator.hpp.in
    M templates/spectrum_generator_interface.hpp.in

  Log Message:
  -----------
  wrap header inclusions for two-scale models around #ifdef statements


  Commit: 05bded9827cce7b3068807839a61198f89a56b32
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/05bded9827cce7b3068807839a61198f89a56b32
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-07-12 (Sun, 12 Jul 2015)

  Changed paths:
    M meta/Constraint.m
    M meta/FlexibleSUSY.m
    M templates/high_scale_spectrum_generator.hpp.in
    M templates/module.mk
    M templates/module.mk.in
    M templates/two_scale_high_scale_constraint.cpp.in
    M templates/two_scale_high_scale_constraint.hpp.in

  Log Message:
  -----------
  adding high-scale constraint for root solver


  Commit: b625a3bd6762d0730929987542028180a0a59d8b
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/b625a3bd6762d0730929987542028180a0a59d8b
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-07-12 (Sun, 12 Jul 2015)

  Changed paths:
    M meta/Constraint.m
    M meta/FlexibleSUSY.m
    M templates/two_scale_high_scale_constraint.cpp.in
    M templates/two_scale_high_scale_constraint.hpp.in

  Log Message:
  -----------
  move check of non-perturbative parameters into separate function


  Commit: a2e7f94bf322eaa0dd64a5f0904b790f303d2dde
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/a2e7f94bf322eaa0dd64a5f0904b790f303d2dde
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-07-12 (Sun, 12 Jul 2015)

  Changed paths:
    M meta/Constraint.m
    M meta/FlexibleSUSY.m
    M templates/two_scale_high_scale_constraint.cpp.in
    M templates/two_scale_high_scale_constraint.hpp.in

  Log Message:
  -----------
  Merge branch 'development' into feature-semianalytic-solver

Conflicts:
	meta/FlexibleSUSY.m


  Commit: f6f3e6d22766bbf5eb4d9d6aeb06abe303d9c905
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/f6f3e6d22766bbf5eb4d9d6aeb06abe303d9c905
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-07-12 (Sun, 12 Jul 2015)

  Changed paths:
    M templates/high_scale_spectrum_generator.hpp.in
    M templates/low_scale_spectrum_generator.hpp.in
    M templates/spectrum_generator_interface.hpp.in

  Log Message:
  -----------
  correcting header inclusion condition


  Commit: c0b464f61d1e0868cadacd4a092341d43fffddfe
      https://github.com/FlexibleSUSY/FlexibleSUSY/commit/c0b464f61d1e0868cadacd4a092341d43fffddfe
  Author: Alexander Voigt <Alexander.Voigt at desy.de>
  Date:   2015-07-12 (Sun, 12 Jul 2015)

  Changed paths:
    A src/casts.hpp
    M src/module.mk
    M src/root_constraint.hpp
    M src/two_scale_constraint.hpp
    M templates/high_scale_spectrum_generator.hpp.in
    M templates/low_scale_spectrum_generator.hpp.in
    A templates/root_high_scale_constraint.cpp.in
    A templates/root_high_scale_constraint.hpp.in
    M templates/spectrum_generator_interface.hpp.in
    M templates/two_scale_high_scale_constraint.cpp.in
    M templates/two_scale_high_scale_constraint.hpp.in

  Log Message:
  -----------
  Merge branch 'feature-semianalytic-solver' into feature-root-solver

Conflicts:
	meta/FlexibleSUSY.m
	templates/high_scale_spectrum_generator.hpp.in
	templates/low_scale_spectrum_generator.hpp.in
	templates/spectrum_generator_interface.hpp.in
	templates/two_scale_high_scale_constraint.cpp.in
	templates/two_scale_high_scale_constraint.hpp.in


Compare: https://github.com/FlexibleSUSY/FlexibleSUSY/compare/4aa5bac8a9cc...c0b464f61d1e