Skip to content

Commit

Permalink
Bugfix: read dump now handles ellipsoid orientation correctly. Also c…
Browse files Browse the repository at this point in the history
…orrected the MOLC reference. Thanks to Otello Roscioni for discovering the bug and correcting it.
  • Loading branch information
jewettaij committed Dec 11, 2021
1 parent b438893 commit a9dfb8c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions moltemplate/scripts/moltemplate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
# Copyright (c) 2013

G_PROGRAM_NAME="moltemplate.sh"
G_VERSION="2.19.12"
G_DATE="2021-6-29"
G_VERSION="2.19.13"
G_DATE="2021-12-10"

echo "${G_PROGRAM_NAME} v${G_VERSION} ${G_DATE}" >&2
echo "" >&2
Expand Down Expand Up @@ -684,7 +684,7 @@ while [ "$i" -lt "$ARGC" ]; do

# Find the columns of: position, quaternion, velocity, and bangular momentum.
pos=( $(sed -n '9p;9q' "$tmp_dump" | awk '{for(i=1; i<=NF; i++){if($i~/^[xyz]/){printf "%i\n",i-2} }}') )
quat=( $(sed -n '9p;9q' "$tmp_dump" | awk '{for(i=1; i<=NF; i++){if($i~/q[wxyz]/){printf "%i\n",i-2} }}') )
quat=( $(sed -n '9p;9q' "$tmp_dump" | awk '{for(i=1; i<=NF; i++){if($i~/q[wxyz]/||$i~/c_q/||$i~/c_orient/){printf "%i\n",i-2} }}') )
vel=( $(sed -n '9p;9q' "$tmp_dump" | awk '{for(i=1; i<=NF; i++){if($i~/v[xyz]/){printf "%i\n",i-2} }}') )
angmom=( $(sed -n '9p;9q' "$tmp_dump" | awk '{for(i=1; i<=NF; i++){if($i~/angmom[xyz]/){printf "%i\n",i-2} }}') )
IFS=$OIFS
Expand Down Expand Up @@ -2252,7 +2252,7 @@ if [ -s "$in_settings" ]; then
cat "$in_settings" >> "${OUT_FILE_SETTINGS}"
else
molc.sh "$in_settings" "$in_init" >> $OUT_FILE_SETTINGS
export MOLTEMPLATE_CITE_LIST=`printf "$MOLTEMPLATE_CITE_LIST\nRicci et al. Phys.Chem.Chem.Phys 2021 (https://doi.org/10.1039/c9cp04120f)\n"`
export MOLTEMPLATE_CITE_LIST=`printf "$MOLTEMPLATE_CITE_LIST\nRicci et al. Phys.Chem.Chem.Phys 2019 (https://doi.org/10.1039/c9cp04120f)\n"`
fi
echo "include \"$OUT_FILE_SETTINGS\"" >> $OUT_FILE_INPUT_SCRIPT
echo "" >> $OUT_FILE_INPUT_SCRIPT
Expand Down Expand Up @@ -2426,7 +2426,7 @@ ls "${in_prefix}"* 2> /dev/null | while read file_name; do
# the file after the in_prefix.
echo "" >> "$OUT_FILE_INPUT_SCRIPT"
echo "# ----------------- $SECTION_NAME Section -----------------" >> $OUT_FILE_INPUT_SCRIPT

# Commenting out the next line.
#
#cp -f "$file_name" "${OUT_FILE_INPUT_SCRIPT}.${FILE_SUFFIX}"
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@

url='https://github.com/jewettaij/moltemplate',

download_url='https://github.com/jewettaij/moltemplate/archive/v2.19.12.zip',
download_url='https://github.com/jewettaij/moltemplate/archive/v2.19.13.zip',

version='2.19.12',
version='2.19.13',

keywords=['simulation', 'LAMMPS', 'molecule editor', 'molecule builder',
'ESPResSo'],
Expand Down

0 comments on commit a9dfb8c

Please sign in to comment.