Skip to content

Commit c7a3e8d

Browse files
committed
Fixed some bugs in coupling coefficient computation. CI energy still not equal to Col7 or hmatels[][] values.
1 parent acff2a4 commit c7a3e8d

File tree

1 file changed

+30
-18
lines changed

1 file changed

+30
-18
lines changed

mpi_source/citruncate.c

+30-18
Original file line numberDiff line numberDiff line change
@@ -1966,13 +1966,17 @@ void generate_docc2actvx_docc1(int nrep, struct occstr str, int str_docc,
19661966
xlist[*numx].io[1] = str.istr[j];
19671967
xlist[*numx].fo[0] = scr[k];
19681968
xlist[*numx].fo[1] = scr[l];
1969+
xlist[*numx].permx = pindex_double_rep_cas(newstr.byte1,
1970+
xlist[*numx].io,
1971+
xlist[*numx].fo,
1972+
intorb);
19691973

1970-
xlist[*numx].permx = pindex_double_rep_str(newstr.istr,
1971-
xlist[*numx].io[0],
1972-
xlist[*numx].fo[0],
1973-
xlist[*numx].io[1],
1974-
xlist[*numx].fo[1],
1975-
elec);
1974+
// xlist[*numx].permx = pindex_double_rep_str(newstr.istr,
1975+
// xlist[*numx].io[0],
1976+
// xlist[*numx].fo[0],
1977+
// xlist[*numx].io[1],
1978+
// xlist[*numx].fo[1],
1979+
// elec);
19761980
(*numx)++;
19771981
}
19781982
}
@@ -2009,12 +2013,16 @@ void generate_docc2actvx_docc1(int nrep, struct occstr str, int str_docc,
20092013
xlist[*numx].fo[0] = scr[k];
20102014
xlist[*numx].fo[1] = scr[l];
20112015

2012-
xlist[*numx].permx = pindex_double_rep_str(newstr.istr,
2013-
xlist[*numx].io[0],
2014-
xlist[*numx].fo[0],
2015-
xlist[*numx].io[1],
2016-
xlist[*numx].fo[1],
2017-
elec);
2016+
xlist[*numx].permx = pindex_double_rep_cas(newstr.byte1,
2017+
xlist[*numx].io,
2018+
xlist[*numx].fo,
2019+
intorb);
2020+
// xlist[*numx].permx = pindex_double_rep_str(newstr.istr,
2021+
// xlist[*numx].io[0],
2022+
// xlist[*numx].fo[0],
2023+
// xlist[*numx].io[1],
2024+
// xlist[*numx].fo[1],
2025+
// elec);
20182026
(*numx)++;
20192027
}
20202028
}
@@ -2690,12 +2698,16 @@ void generate_doccx_actvx(int nrep, struct occstr str, int str_docc,
26902698
xlist[*numx].fo[0] = scr[k];
26912699
xlist[*numx].fo[1] = scr[l];
26922700

2693-
xlist[*numx].permx = pindex_double_rep_str(newstr.istr,
2694-
xlist[*numx].io[0],
2695-
xlist[*numx].fo[0],
2696-
xlist[*numx].io[1],
2697-
xlist[*numx].fo[1],
2698-
elec);
2701+
// xlist[*numx].permx = pindex_double_rep_str(newstr.istr,
2702+
// xlist[*numx].io[0],
2703+
// xlist[*numx].fo[0],
2704+
// xlist[*numx].io[1],
2705+
// xlist[*numx].fo[1],
2706+
// elec);
2707+
xlist[*numx].permx = pindex_double_rep_cas(newstr.byte1,
2708+
xlist[*numx].io,
2709+
xlist[*numx].fo,
2710+
intorb);
26992711
xlist[*numx].io[0] = str.istr[i];
27002712
xlist[*numx].fo[0] = str.istr[j];
27012713
xlist[*numx].io[1] = scr[k];

0 commit comments

Comments
 (0)