Skip to content

Commit 5b848c4

Browse files
committed
sync initial.cpp with tinker8 6af17caa
1 parent 5c638f8 commit 5b848c4

File tree

5 files changed

+15
-10
lines changed

5 files changed

+15
-10
lines changed

doc/manual/m/install/tinker.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ For versions prior to this commit, please refer to the following.
2020
Alternatively, remove the directory *tinker9/tinker* and clone
2121
`Tinker from GitHub <https://github.com/tinkertools/tinker>`_
2222
to replace the deleted directory,
23-
then checkout the required version **b897fa01**.
23+
then checkout the required version **6af17caa**.
2424

2525
.. code-block:: bash
2626

ext/interface/cpp/tinker/detail/boxes.hh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ extern int& triclinic;
3030
extern int& octahedron;
3131
extern int& dodecadron;
3232
extern int& nonprism;
33+
extern int& nosymm;
3334
extern char (&spacegrp)[10];
3435

3536
#ifdef TINKER_FORTRAN_MODULE_CPP
@@ -60,6 +61,7 @@ extern "C" int TINKER_MOD(boxes, triclinic);
6061
extern "C" int TINKER_MOD(boxes, octahedron);
6162
extern "C" int TINKER_MOD(boxes, dodecadron);
6263
extern "C" int TINKER_MOD(boxes, nonprism);
64+
extern "C" int TINKER_MOD(boxes, nosymm);
6365
extern "C" char TINKER_MOD(boxes, spacegrp)[10];
6466

6567
double& xbox = TINKER_MOD(boxes, xbox);
@@ -89,6 +91,7 @@ int& triclinic = TINKER_MOD(boxes, triclinic);
8991
int& octahedron = TINKER_MOD(boxes, octahedron);
9092
int& dodecadron = TINKER_MOD(boxes, dodecadron);
9193
int& nonprism = TINKER_MOD(boxes, nonprism);
94+
int& nosymm = TINKER_MOD(boxes, nosymm);
9295
char (&spacegrp)[10] = TINKER_MOD(boxes, spacegrp);
9396
#endif
9497
} }

src/initial.cpp

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,10 @@ void initial()
1616
input = 5;
1717
iout = 6;
1818

19-
if (first)
20-
promo();
19+
if (first) promo();
2120

22-
if (first)
23-
tinker_f_command();
24-
if (first)
25-
first = false;
21+
if (first) tinker_f_command();
22+
if (first) first = false;
2623

2724
using namespace openmp;
2825
nproc = 1;
@@ -83,11 +80,13 @@ void initial()
8380
planb = 0;
8481

8582
using namespace inform;
86-
silent = 0;
8783
verbose = 0;
8884
debug = 0;
85+
silent = 0;
8986
abort = 0;
9087

88+
gpucard = 0;
89+
9190
using namespace group;
9291
use_group = 0;
9392

@@ -127,6 +126,8 @@ void initial()
127126
use_tophat = 0;
128127
use_stophat = 0;
129128

129+
output::archive = 1;
130+
output::binary = 0;
130131
FstrView coordtype = output::coordtype;
131132
coordtype = "NONE";
132133

src/xinfo.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ namespace tinker {
1010
static const char* getSHA1()
1111
{
1212
return //
13-
"b897fa01"; // Tue Jul 12 23:05:15 2022 -0500
13+
"6af17caa"; // Sun Aug 14 18:00:16 2022 -0500
14+
// "b897fa01"; // Tue Jul 12 23:05:15 2022 -0500
1415
// "3dc966e2"; // Tue May 24 01:30:50 2022 -0500
1516
// "023b6174"; // Wed Apr 20 08:10:27 2022 -0500
1617
// "5aa9948d"; // Wed Dec 15 14:44:53 2021 -0600

0 commit comments

Comments
 (0)