Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixing ifdef typo for AoS, been there for a while #926

Merged
merged 3 commits into from
Jul 12, 2018
Merged

fixing ifdef typo for AoS, been there for a while #926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff83610
fixing ifdef typo for AoS, been there for a while
PDoakORNL Jul 12, 2018
d465c2f
EANBLE is popular mispelling, blame does not credit this one to Ye
PDoakORNL Jul 12, 2018
f488e9c
Remove BasisSetSize in EGOSet.
ye-luo Jul 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/QMCWaveFunctions/ElectronGas/ElectronGasComplexOrbitalBuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ EGOSet::EGOSet(const std::vector<PosType>& k, const std::vector<RealType>& k2):
{
KptMax=k.size();
OrbitalSetSize=k.size();
BasisSetSize=k.size();
className="EGOSet";
//assign_energies();
}
Expand All @@ -43,7 +42,6 @@ EGOSet::EGOSet(const std::vector<PosType>& k, const std::vector<RealType>& k2, c
{
KptMax=k.size();
OrbitalSetSize=k.size();
BasisSetSize=k.size();
className="EGOSet";
//assign_energies();
//assign_degeneracies(d);
Expand Down
2 changes: 1 addition & 1 deletion src/QMCWaveFunctions/PlaneWave/PWOrbitalBuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ namespace qmcplusplus

PWOrbitalBuilder::PWOrbitalBuilder(ParticleSet& els, TrialWaveFunction& psi, PtclPoolType& psets)
: OrbitalBuilderBase(els,psi), ptclPool(psets), hfileID(-1), rootNode(NULL)
#if !defined(EANBLE_SMARTPOINTER)
#if !defined(ENABLE_SMARTPOINTER)
,myBasisSet(0)
#endif
{
Expand Down
6 changes: 3 additions & 3 deletions src/QMCWaveFunctions/SPOSetBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include "Particle/VirtualParticleSet.h"
#include "QMCWaveFunctions/OrbitalSetTraits.h"
#include "io/hdf_archive.h"
#if !defined(EANBLE_SOA)
#if !defined(ENABLE_SOA)
#include "Message/CommOperators.h"
#endif

Expand Down Expand Up @@ -79,7 +79,7 @@ class SPOSetBase: public QMCTraits
* Several user classes can own SPOSetBase and use objectName as counter
*/
std::string objectName;
#if !defined(EANBLE_SOA)
#if !defined(ENABLE_SOA)
///true if C is an identity matrix
bool Identity;
///if true, do not clean up
Expand All @@ -103,7 +103,7 @@ class SPOSetBase: public QMCTraits
/** destructor */
virtual ~SPOSetBase()
{
#if !defined(EANBLE_SOA)
#if !defined(ENABLE_SOA)
if(!IsCloned && C!= nullptr) delete C;
#endif
}
Expand Down