Skip to content

Commit

Permalink
Improved --version argument
Browse files Browse the repository at this point in the history
  • Loading branch information
abelcarreras committed Dec 14, 2020
1 parent 4420750 commit 4392811
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 10 deletions.
2 changes: 1 addition & 1 deletion phonolammps/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = '0.7.0'
__version__ = '0.7.1'

import numpy as np

Expand Down
23 changes: 14 additions & 9 deletions scripts/phonolammps
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
#!/usr/bin/env python

import numpy as np
import argparse
import os
import sys
from contextlib import contextmanager
from phonolammps import Phonolammps
from lammps import lammps
from datetime import date
import numpy as np
import argparse
import os, sys
import phonopy


# Define function to silence output
@contextmanager
Expand All @@ -28,7 +31,7 @@ def show_stdout():
parser = argparse.ArgumentParser(description='phonoLAMMPS options')

parser.add_argument('lammps_input_file', metavar='lammps_file', type=str,
help='lammps input file')
help='lammps input file', nargs='?')

parser.add_argument('-o', metavar='file', type=str, default='FORCE_CONSTANTS',
help='force constants output file [default: FORCE_CONSTANTS]')
Expand Down Expand Up @@ -81,11 +84,10 @@ parser.add_argument('--version', action='store_true',
args = parser.parse_args()



#raise argparse.ArgumentError(args, 'message')

if args.version:
from lammps import lammps
from datetime import date
import sys
import phonopy
from phonolammps import __version__ as ph_lammps_version

lmp = lammps(cmdargs=['-screen', 'none'])
Expand All @@ -102,6 +104,9 @@ if args.version:

exit()

if args.lammps_input_file is None:
parser.error("too few arguments")

phlammps = Phonolammps(args.lammps_input_file,
supercell_matrix=np.diag(args.dim),
primitive_matrix=np.array(args.primitive_axis).reshape((3, 3)),
Expand Down

0 comments on commit 4392811

Please sign in to comment.