Skip to content

Commit

Permalink
Merge pull request #24 from kevinshen56714/kshen/update-to-2024-version
Browse files Browse the repository at this point in the history
Update to the 2024 version
  • Loading branch information
kevinshen56714 authored Jul 28, 2024
2 parents 05ff325 + 4cb3751 commit 8f7ba8a
Show file tree
Hide file tree
Showing 213 changed files with 397,228 additions and 7,017 deletions.
40 changes: 40 additions & 0 deletions pyemc/emc/HISTORY
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,46 @@ Date Description
- Changed OPLS mixing rules from arithmetic to geometric according to
Jorgensen et al., J. Am. Chem. Soc. 1996, 118, 11225
20230801 - Web publication
20230919 - Added port->links to accommodate identical atom designations in
imported molecules by PortInsightMDFGet()
- Introduction of emc.pl, a modular version of emc_setup.pl
20231006 - Fixed field typing issues for connective groups, e.g. in polymers
- Fixed merging of clusters when using crystal command
- Cleaned up memory usage
20240224 - Fixed numerical stability issue in GrowSideConnect()
- Fixed compression for use of ".gz" in name for scripting export
command
- Added selection options for surface grafting
- Successfully passed valgrind test
- Fixed issues with increment designation for polymers
- Disallowed application of non-group field to groups with field
definitions
- Alteration of TRAPPE-UA acid parameters using J. Phys. Chem. B 2004,
108, 14130-14136
20240428 - Added published COMPASS force field in ./field/compass
- Fixed assigment of nsites in ring
- Added capture upon writing of empty fields
- Updated treatment of CMAP to align with LAMMPS 2023 and higher
- Adapted group polymers to include monomers and dimers in polymer
definition
- Introduced lone pair representation
20240703 - Fixed a memory leak when applying fields
- Fixed EMC setup control settings for field_bond, field_angle,
field_torsion, and field_improper
- Added force field wildcard recognition for mass entries
- Added field alteration to emc.pl by means of ITEM FIELD
- Updated the use of CHARMM CMAP files for LAMMPS
- Improved exported InsightII files
- Various additions to CHARMM CGENFF (see templates in cgenff.top)
- Added EMC setup polymer keyword 'sequence' as synonym for 'block'
- Addition of lone pairs for use with benzene and related structures
for CHARMM CGENFF
- Added the use of force field templates as EMC Setup references
in groups and clusters
- Fixed issues with ring recognition
- Fixed double occurrence of hydrogen atom names in PDB/PSF for e.g.
alcohols
20240801 - Web publication


v9.4.3
Expand Down
Binary file added pyemc/emc/bin/emc_linux_aarch64
Binary file not shown.
Binary file modified pyemc/emc/bin/emc_linux_x86_64
Binary file not shown.
Binary file added pyemc/emc/bin/emc_linux_x86_64.fc15
Binary file not shown.
Binary file modified pyemc/emc/bin/emc_macos
Binary file not shown.
Binary file modified pyemc/emc/bin/emc_win32.exe
Binary file not shown.
Binary file modified pyemc/emc/docs/emc.pdf
Binary file not shown.
4 changes: 0 additions & 4 deletions pyemc/emc/examples/setup/chemistry/bulk/chemistry.esh

This file was deleted.

8 changes: 4 additions & 4 deletions pyemc/emc/examples/setup/chemistry/bulk/setup.esh
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
#!/usr/bin/env emc_setup.pl
#!/usr/bin/env emc.pl
#
# file: bulk.esh
# author: Pieter J. in 't Veld
# date: July 4, 2016
# purpose: Chemical input for emc_setup.pl
# purpose: Chemical input for emc.pl
#
# notes:
# - Create a simulation with water, alcohol, salt and a sugar
# - Alternative to chemistry.esh file, containing an OPTIONS section,
# to be used with emc_setup.pl v1.5 and up
# to be used with emc.pl v1.5 and up
# - Allowed separators are commas and tabs, which can be used
# interchangebly
# - Call with
#
# emc_setup.pl bulk
# emc.pl bulk
#
# or (for MacOS or Linux)
#
Expand Down
24 changes: 0 additions & 24 deletions pyemc/emc/examples/setup/chemistry/bulk/setup.sh

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# file: chemistry.esh
# author: Pieter J. in 't Veld
# date: March 18, 2015
# purpose: Chemical input for emc_setup.pl
# purpose: Chemical input for emc.pl
#
# notes:
# - Create a simulation with 80% m/m water and 20% m/m ethanol
Expand Down
2 changes: 1 addition & 1 deletion pyemc/emc/examples/setup/chemistry/field/charmm/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# usage with vmd after build: vmd -e solution.vmd
#

emc_setup.pl \
emc.pl \
-ntotal=1000 -field=charmm \
-replace solution $@;

Expand Down
8 changes: 4 additions & 4 deletions pyemc/emc/examples/setup/chemistry/field/charmm/solution.esh
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
#!/usr/bin/env emc_setup.pl
#!/usr/bin/env emc.pl
#
# file: solution.esh
# author: Pieter J. in 't Veld
# date: August 15, 2016
# purpose: Chemical input for emc_setup.pl
# purpose: Chemical input for emc.pl
#
# notes:
# - Create a simulation with 80% m/m water and 20% m/m alcohol
# - Alternative to chemistry.esh file, containing an OPTIONS section,
# to be used with emc_setup.pl v1.5 and up
# to be used with emc.pl v1.5 and up
# - Allowed separators are commas and tabs, which can be used
# interchangebly
# - Call with
#
# emc_setup.pl solution
# emc.pl solution
#
# or (for MacOS or Linux)
#
Expand Down
2 changes: 1 addition & 1 deletion pyemc/emc/examples/setup/chemistry/field/dpd/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
# usage with vmd after build: vmd -e dpd.vmd
#

emc_setup.pl \
emc.pl \
-field=dpd -mass -replace \
-profile -build_dir=. -rtype=WAT8 dpd nylon + branch + water

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(* EMC: Script *)

(* Created by emc_setup.pl v3.6.0, July 8, 2018
(* Created by emc.pl v3.6.0, July 8, 2018
on Sun Jul 8 12:15:11 EDT 2018 *)

(* define variables *)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env emc_setup.pl
#!/usr/bin/env emc.pl
#
# script: field.esh
# author: Pieter J. in 't Veld
Expand Down
2 changes: 1 addition & 1 deletion pyemc/emc/examples/setup/chemistry/field/generate/field.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# LAMMPS input script for standardized atomistic simulations
# Created by emc_setup.pl v3.6.0, July 8, 2018 as part of EMC
# Created by emc.pl v3.6.0, July 8, 2018 as part of EMC
# on Sun Jul 8 12:15:11 EDT 2018

# Variable definitions
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# STANDARD interaction parameters
# converted by emc_setup.pl v3.6.0, July 8, 2018 by Pieter J. in 't Veld
# converted by emc.pl v3.6.0, July 8, 2018 by Pieter J. in 't Veld
# to be used in conjuction with EMC v9.4.3 or higher
#

Expand Down
2 changes: 1 addition & 1 deletion pyemc/emc/examples/setup/chemistry/field/lj/field.esh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env emc_setup.pl
#!/usr/bin/env emc.pl

ITEM OPTIONS

Expand Down
Loading

0 comments on commit 8f7ba8a

Please sign in to comment.