Skip to content

Commit 09f4737

Browse files
committed
Merge branch 'release/v.1.0.2'
2 parents 7d6b98a + 7b63113 commit 09f4737

40 files changed

+1511
-886
lines changed

alm/alamode.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ ALM::ALM(int narg, char **arg)
5757

5858
if (mode == "fitting") {
5959

60+
fcs->init();
6061
constraint->setup();
6162
fitting->fitmain();
6263
writes->writeall();
@@ -94,7 +95,6 @@ void ALM::initialize()
9495
files->init();
9596
symmetry->init();
9697
interaction->init();
97-
fcs->init();
9898
}
9999

100100
ALM::~ALM()

alm/alamode.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,3 @@ namespace ALM_NS
4040
std::string mode;
4141
};
4242
}
43-

alm/combination.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ namespace ALM_NS
2525

2626

2727
public:
28-
CombinationWithRepetition() {};
28+
CombinationWithRepetition()
29+
{
30+
};
2931

3032
template <class InputIter>
3133
CombinationWithRepetition(InputIter begin,
@@ -75,4 +77,3 @@ namespace ALM_NS
7577
}
7678
};
7779
}
78-

0 commit comments

Comments
 (0)