Merge branch 'release/v.1.0.2'

ttadano · Jan 29, 2018 · 09f4737 · 09f4737
2 parents 7d6b98a + 7b63113
commit 09f4737
Show file tree

Hide file tree

Showing 40 changed files with 1,511 additions and 886 deletions.
diff --git a/alm/alamode.cpp b/alm/alamode.cpp
@@ -57,6 +57,7 @@ ALM::ALM(int narg, char **arg)
 
     if (mode == "fitting") {
 
+        fcs->init();
         constraint->setup();
         fitting->fitmain();
         writes->writeall();
@@ -94,7 +95,6 @@ void ALM::initialize()
     files->init();
     symmetry->init();
     interaction->init();
-    fcs->init();
 }
 
 ALM::~ALM()

diff --git a/alm/alamode.h b/alm/alamode.h
@@ -40,4 +40,3 @@ namespace ALM_NS
         std::string mode;
     };
 }
-
diff --git a/alm/combination.h b/alm/combination.h
@@ -25,7 +25,9 @@ namespace ALM_NS
 
 
     public:
-        CombinationWithRepetition() {};
+        CombinationWithRepetition()
+        {
+        };
 
         template <class InputIter>
         CombinationWithRepetition(InputIter begin,
@@ -75,4 +77,3 @@ namespace ALM_NS
         }
     };
 }
-