Skip to content

openMP update and PDOS+soc#411

Merged
dyzheng merged 10 commits into
developfrom
ABACUS_2.2.0_beta
Nov 1, 2021
Merged

openMP update and PDOS+soc#411
dyzheng merged 10 commits into
developfrom
ABACUS_2.2.0_beta

Conversation

@dyzheng
Copy link
Copy Markdown
Collaborator

@dyzheng dyzheng commented Oct 27, 2021

No description provided.

jiyuang and others added 8 commits October 12, 2021 11:39
2. move cout to ofs_warning for "l>4 eggbox warning" in Numerical_Orbital_Lm::extra_uniform()
   Now ABACUS can be compiled without OpenMP.
merge updates from Abacus 2.2.0 beta
1. fix bug in ComplexMatrix::print()
merge openmp update and PDOS+soc
#ifdef __OPENMP
#ifdef _OPENMP
#pragma omp parallel for schedule(static)
#endif
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where's the original corresponding #ifdef of this #endif? It seems that only ifdefs are added in this commit.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

linpz said that _OPENMP would be automaticly setup by openmp setup in Makefile

GlobalV::ofs_warning << " The angular momentum larger than 4 (g orbitals) may be error about eggbox. " << std::endl;
GlobalV::ofs_warning << " Check file " << __FILE__ << " line " << __LINE__ <<std::endl;
//std::cout << " The angular momentum larger than 4 (g orbitals) may be error about eggbox. " << std::endl;
//std::cout << " Check file " << __FILE__ << " line " << __LINE__ <<std::endl;
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest removing this redundant commented code.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree

@dyzheng dyzheng merged commit 7e09462 into develop Nov 1, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants