Skip to content

Commit

Permalink
Add semi-analytic solver to configure options
Browse files Browse the repository at this point in the history
  • Loading branch information
Dylan Harries committed Dec 13, 2016
1 parent ccee980 commit 044d82c
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
3 changes: 3 additions & 0 deletions config/config.h.in
Expand Up @@ -101,6 +101,9 @@
/* Enable lattice BVP solver */
@DEFINE_ENABLE_LATTICE_SOLVER@

/* Enable semi-analytic BVP solver */
@DEFINE_ENABLE_SEMI_ANALYTIC_SOLVER@

/* Enable statements for addons */
@DEFINE_ENABLE_ADDONS@

Expand Down
12 changes: 10 additions & 2 deletions configure
Expand Up @@ -153,6 +153,7 @@ DEFINE_ENABLE_TSIL="#undef ENABLE_TSIL"
DEFINE_ENABLE_VERBOSE="#undef ENABLE_VERBOSE"
DEFINE_ENABLE_TWO_SCALE_SOLVER="#undef ENABLE_TWO_SCALE_SOLVER"
DEFINE_ENABLE_LATTICE_SOLVER="#undef ENABLE_LATTICE_SOLVER"
DEFINE_ENABLE_SEMI_ANALYTIC_SOLVER="#undef ENABLE_SEMI_ANALYTIC_SOLVER"
DEFINE_ENABLE_ADDONS=""

boost_lib_dir=""
Expand Down Expand Up @@ -206,7 +207,7 @@ tsil_lib_dir=""
tsil_inc_dir=""
# available RG solvers
SOLVERS="two_scale"
available_solvers="two_scale lattice"
available_solvers="two_scale lattice semi_analytic"
# models that will be compiled
MODELS="all"
# BEGIN: NOT EXPORTED ##########################################
Expand Down Expand Up @@ -887,7 +888,7 @@ check_solvers() {
case "$a" in
all)
SOLVERS="$available_solvers"; break ;;
two_scale|lattice)
two_scale|lattice|semi_analytic)
SOLVERS="$SOLVERS $a"
continue ;;
*)
Expand Down Expand Up @@ -2279,8 +2280,10 @@ enable_defines() {
all)
DEFINE_ENABLE_TWO_SCALE_SOLVER="#define ENABLE_TWO_SCALE_SOLVER 1"
DEFINE_ENABLE_LATTICE_SOLVER="#define ENABLE_LATTICE_SOLVER 1"
DEFINE_ENABLE_SEMI_ANALYTIC_SOLVER="#define ENABLE_SEMI_ANALYTIC_SOLVER 1"
logmsg " ${DEFINE_ENABLE_TWO_SCALE_SOLVER}"
logmsg " ${DEFINE_ENABLE_LATTICE_SOLVER}"
logmsg " ${DEFINE_ENABLE_SEMI_ANALYTIC_SOLVER}"
break ;;
two_scale)
DEFINE_ENABLE_TWO_SCALE_SOLVER="#define ENABLE_TWO_SCALE_SOLVER 1";
Expand All @@ -2290,6 +2293,10 @@ enable_defines() {
DEFINE_ENABLE_LATTICE_SOLVER="#define ENABLE_LATTICE_SOLVER 1";
logmsg " ${DEFINE_ENABLE_LATTICE_SOLVER}"
continue ;;
semi_analytic)
DEFINE_ENABLE_SEMI_ANALYTIC_SOLVER="#define ENABLE_SEMI_ANALYTIC_SOLVER 1";
logmsg " ${DEFINE_ENABLE_SEMI_ANALYTIC_SOLVER}"
continue ;;
*)
message "Error: unknown solver: $a";
message "Available solvers: $available_solvers";
Expand Down Expand Up @@ -2711,6 +2718,7 @@ sed -e "s|@FLEXIBLESUSY_VERSION@|$FLEXIBLESUSY_VERSION|" \
-e "s|@DEFINE_ENABLE_VERBOSE@|$DEFINE_ENABLE_VERBOSE|" \
-e "s|@DEFINE_ENABLE_TWO_SCALE_SOLVER@|$DEFINE_ENABLE_TWO_SCALE_SOLVER|" \
-e "s|@DEFINE_ENABLE_LATTICE_SOLVER@|$DEFINE_ENABLE_LATTICE_SOLVER|" \
-e "s|@DEFINE_ENABLE_SEMI_ANALYTIC_SOLVER@|$DEFINE_ENABLE_SEMI_ANALYTIC_SOLVER|" \
-e "s|@DEFINE_ENABLE_ADDONS@|$DEFINE_ENABLE_ADDONS|" \
< $CONFIGHDR_TMPL > $CONFIGHDR

Expand Down

0 comments on commit 044d82c

Please sign in to comment.