scnc
/
qmcpack
mirror of https://github.com/QMCPACK/qmcpack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing remaining compile error 

git-svn-id: https://subversion.assembla.com/svn/qmcdev/trunk@6912 e5b18d87-469d-4833-9cc0-8cdfa06e9491
This commit is contained in:
Mark Berrill 2016-05-17 16:44:22 +00:00
parent 5e326f7cc0
commit 5d7b9807a8
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMake/ctest_script.cmake
View File

@ -81,7 +81,9 @@ ENDIF()
# Check that we specified the build type to run
SET( USE_MATLAB 1 )
SET( CTEST_BUILD_NAME "$ENV{QMCPACK_TEST_SUBMIT_NAME}" )
IF ( NOT CTEST_BUILD_NAME )
SET( CTEST_BUILD_NAME "$ENV{QMCPACK_TEST_SUBMIT_NAME}" )
ENDIF()
IF ( NOT CTEST_BUILD_NAME )
SET( CTEST_BUILD_NAME "QMCPACK_TEST_SUBMIT_NAME-unset" )
ENDIF()

9
src/QMCWaveFunctions/AtomicOrbital.h
View File

@ -8,6 +8,9 @@
#include <Configuration.h>
#include <Utilities/NewTimer.h>
#define conj_ qmcplusplus::conj
namespace qmcplusplus
{
@ -588,11 +591,11 @@ AtomicOrbital<StorageType>::CalcYlm (PosType rhat,
for (int m=0; m<=l; m++)
{
Ylm[l*(l+1)+m] = XlmVec[l+m]*e2imphi;
Ylm[l*(l+1)-m] = XlmVec[l-m]*conj(e2imphi);
Ylm[l*(l+1)-m] = XlmVec[l-m]*conj_(e2imphi);
dYlm_dphi[l*(l+1)+m ] = (double)m * eye *XlmVec[l+m]*e2imphi;
dYlm_dphi[l*(l+1)-m ] = -(double)m * eye *XlmVec[l-m]*conj(e2imphi);
dYlm_dphi[l*(l+1)-m ] = -(double)m * eye *XlmVec[l-m]*conj_(e2imphi);
dYlm_dtheta[l*(l+1)+m] = dXlmVec[l+m]*e2imphi;
dYlm_dtheta[l*(l+1)-m] = dXlmVec[l-m]*conj(e2imphi);
dYlm_dtheta[l*(l+1)-m] = dXlmVec[l-m]*conj_(e2imphi);
e2imphi *= e2iphi;
}
dl += 1.0;