Skip to content

Commit 78a6c1d

Browse files
Merge pull request #179 from StevenZhangCSFM/err_nlcc_scan
errMsg nlcc scan
2 parents ff0266e + d5b370f commit 78a6c1d

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

ChangeLog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
-Name
44
-changes
55

6+
--------------
7+
May 11, 2023
8+
Name: Boqin Zhang
9+
Changes: (initialization.c)
10+
1. Add error message for using SCAN with NLCC pseudopotential
11+
612
--------------
713
Apr 26, 2023
814
Name: Boqin Zhang

src/initialization.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1306,6 +1306,10 @@ void SPARC_copy_input(SPARC_OBJ *pSPARC, SPARC_INPUT_OBJ *pSPARC_Input) {
13061306
// check if exchange-correlation functional is metaGGA
13071307
pSPARC->mGGAflag = 0;
13081308
if (strcmpi(pSPARC->XC, "SCAN") == 0) { // it can be expand, such as adding r2SCAN
1309+
if (pSPARC->NLCC_flag) {
1310+
if (!rank) printf("\nERROR: currently SCAN functional does not support applying NLCC pseudopotential!\n");
1311+
exit(EXIT_FAILURE);
1312+
}
13091313
pSPARC->mGGAflag = 1;
13101314
}
13111315
// check if exchange-correlation functional is vdW-DF1 or vdW-DF2
@@ -3154,7 +3158,7 @@ void write_output_init(SPARC_OBJ *pSPARC) {
31543158
}
31553159

31563160
fprintf(output_fp,"***************************************************************************\n");
3157-
fprintf(output_fp,"* SPARC (version Apr 19, 2023) *\n");
3161+
fprintf(output_fp,"* SPARC (version May 11, 2023) *\n");
31583162
fprintf(output_fp,"* Copyright (c) 2020 Material Physics & Mechanics Group, Georgia Tech *\n");
31593163
fprintf(output_fp,"* Distributed under GNU General Public License 3 (GPL) *\n");
31603164
fprintf(output_fp,"* Start time: %s *\n",c_time_str);

0 commit comments

Comments
 (0)