abmptools 2.19.0__tar.gz → 2.19.2__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {abmptools-2.19.0 → abmptools-2.19.2}/NOTICE +1 -1
- {abmptools-2.19.0/abmptools.egg-info → abmptools-2.19.2}/PKG-INFO +3 -3
- {abmptools-2.19.0 → abmptools-2.19.2}/README.md +1 -1
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/amorphous/mdp_protocol.py +10 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/core/top_atomtypes.py +22 -3
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/udf2gro/udf_adapter.py +1 -1
- {abmptools-2.19.0 → abmptools-2.19.2/abmptools.egg-info}/PKG-INFO +3 -3
- {abmptools-2.19.0 → abmptools-2.19.2}/pyproject.toml +2 -2
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_mdp_protocol.py +14 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_top_atomtypes_element.py +1 -2
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_top_fold_atomtypes.py +47 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/LICENSE +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/__init__.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/abinit_io.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/addsolvfrag.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/ajf2config.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/ajfserial.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/amorphous/__init__.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/amorphous/__main__.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/amorphous/builder.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/amorphous/cli.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/amorphous/density.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/amorphous/models.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/amorphous/molecule_prep.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/amorphous/ndx_writer.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/amorphous/packing.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/amorphous/parameterizer.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/amorphous/pubchem.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/amorphous/system_model_adapter.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/amorphous/trajectory_ingest.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/anlfmo.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/convertcpf.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/core/__init__.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/core/_subprocess.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/core/acpype.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/core/system_model.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/cpf2ifielist.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/cpfmanager.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/generate_difie.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/generateajf.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/geomopt/__init__.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/geomopt/mace_optimizer.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/geomopt/openff_openmm_minimizer.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/geomopt/pyscf_optimizer.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/getcharge.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/getifiepieda.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/gro2udf/__init__.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/gro2udf/__main__.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/gro2udf/cli.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/gro2udf/default_template.udf +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/gro2udf/default_template_cognac101.udf +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/gro2udf/exporter.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/gro2udf/gro_adapter.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/gro2udf/gro_parser.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/gro2udf/guard.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/gro2udf/make_whole.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/gro2udf/mdp_parser.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/gro2udf/molecule_select.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/gro2udf/top_adapter.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/gro2udf/top_exporter.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/gro2udf/top_model.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/gro2udf/top_parser.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/gro2udf/trajectory_io.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/gro2udf/udf_writer.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/log2config.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/log2cpf.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/logmanager.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/mol_io.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/molcalc.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/pdb2fmo.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/pdb_io.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/pdbmodify.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/readcif.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/setfmo.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/trajectory/__init__.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/trajectory/__main__.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/trajectory/cli.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/trajectory/postprocess.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/udf2fmo.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/udf2gro/__init__.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/udf2gro/__main__.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/udf2gro/cli.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/udf2gro/exporter.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/udf2gro/gromacs/__init__.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/udf2gro/gromacs/writers/__init__.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/udf2gro/gromacs/writers/_validator.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/udf2gro/gromacs/writers/gro_writer.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/udf2gro/gromacs/writers/itp_writer.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/udf2gro/gromacs/writers/mdp_writer.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/udf2gro/gromacs/writers/top_writer.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/udf_io.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/udfcharge/__init__.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/udfcharge/__main__.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/udfcharge/core.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/udfcreate.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/udfcreate_v2.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools/udfrm_io.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools.egg-info/SOURCES.txt +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools.egg-info/dependency_links.txt +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools.egg-info/entry_points.txt +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools.egg-info/requires.txt +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/abmptools.egg-info/top_level.txt +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/setup.cfg +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/setup.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_abinit_io.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_ajf_section_headers.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_amorphous_charges_from_file.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_amorphous_models.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_amorphous_molecule_prep.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_anlfmo.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_builder_integration.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_builder_mocked.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_charge_method.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_citation_version.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_cli_scripts.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_console_output_cp932.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_cpfmanager.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_density.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_enhanced_pieda.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_getifiepieda.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_gro2udf_atom_identity.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_gro2udf_constraints_as_bonds.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_gro2udf_encoding.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_gro2udf_frame_thinning.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_gro2udf_guard.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_gro2udf_keep_molecules.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_gro2udf_make_whole.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_gro2udf_nose_hoover.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_gro2udf_potential_names.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_gro2udf_torsion_scaling.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_gro2udf_type_name_collision.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_gro_adapter.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_gro_parser.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_gro_writer.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_ifie_methods.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_interchange_adapter.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_logmanager.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_md_fmo_resume.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_mdp_parser.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_mdp_writer.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_mol_io.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_molcalc.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_ndx_writer.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_parameterizer.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_pdb_io.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_pubchem.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_pyscf_optimizer.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_pyscf_parsers.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_read_ifie_hf_fallback.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_readcif.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_regression.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_setfmo.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_system_model.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_system_model_extensions.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_top_adapter_torsion_index.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_top_exporter_deformation_none.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_top_exporter_display_type.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_top_exporter_energy_alignment.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_top_exporter_frames_override.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_top_exporter_pressure_dc.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_top_exporter_static_cell.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_top_exporter_static_structure.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_top_model.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_top_parser.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_top_writer.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_trajectory_gen_for_udf.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_trajectory_ingest.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_trajectory_postprocess.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_udf2gro_molname_helpers.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_udf2gro_multiterm_dihedrals.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_udf2gro_thermostat_barostat.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_udf2gro_unit_parameter.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_udf_io.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_udfcreate.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_udfcreate_v2.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_udfcreate_v2_byte_equivalence.py +0 -0
- {abmptools-2.19.0 → abmptools-2.19.2}/tests/test_udfrm_io.py +0 -0
|
@@ -49,7 +49,7 @@ Re-implementation attribution
|
|
|
49
49
|
|
|
50
50
|
The `abmptools.cg.dpd` subpackage (v1.26.0+) re-implements the DPD input
|
|
51
51
|
generation logic of DPDgen (https://github.com/kojioku/dpdgen) for the
|
|
52
|
-
Cognac DPD UDF (R1) and
|
|
52
|
+
Cognac DPD UDF (R1) and dpm patch (R2) routes. DPDgen is authored
|
|
53
53
|
by the same author (Koji Okuwaki), so the porting is in-house. No DPDgen
|
|
54
54
|
source code is bundled; `abmptools.cg.dpd` provides an independent
|
|
55
55
|
implementation that consumes the same fcews-unified aij.dat format
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: abmptools
|
|
3
|
-
Version: 2.19.
|
|
3
|
+
Version: 2.19.2
|
|
4
4
|
Summary: Pre/post-processing and analysis toolkit for ABINIT-MP Fragment Molecular Orbital calculations
|
|
5
|
-
Author
|
|
5
|
+
Author: Koji Okuwaki
|
|
6
6
|
License-Expression: Apache-2.0
|
|
7
7
|
Project-URL: Homepage, https://github.com/kojioku/abmptools
|
|
8
8
|
Project-URL: Repository, https://github.com/kojioku/abmptools
|
|
@@ -264,4 +264,4 @@ release tag; until then, use:
|
|
|
264
264
|
|
|
265
265
|
## Author
|
|
266
266
|
|
|
267
|
-
|
|
267
|
+
Koji Okuwaki ([GitHub](https://github.com/kojioku))
|
|
@@ -227,6 +227,16 @@ def generate_anneal_mdp(protocol: AnnealProtocol,
|
|
|
227
227
|
params["annealing-temp"] = " ".join(
|
|
228
228
|
[f"{protocol.T_high} {protocol.T_low}"] * n_groups
|
|
229
229
|
)
|
|
230
|
+
# With more than one T-coupling group and annealing, GROMACS 2024 and
|
|
231
|
+
# later cannot set the ensemble temperature itself and grompp stops
|
|
232
|
+
# ("Simulated tempering is used with multiple T-coupling groups ...").
|
|
233
|
+
# It is set to the reference temperature, T_high: another value gives
|
|
234
|
+
# a "does not match the reference" warning. GROMACS before 2024 does
|
|
235
|
+
# not know the two keys and warns twice ("Unknown left-hand"), within
|
|
236
|
+
# the run script's -maxwarn 2. One group needs neither.
|
|
237
|
+
if n_groups > 1:
|
|
238
|
+
params["ensemble-temperature-setting"] = "constant"
|
|
239
|
+
params["ensemble-temperature"] = protocol.T_high
|
|
230
240
|
return _format_mdp(params, title="Simulated annealing")
|
|
231
241
|
|
|
232
242
|
|
|
@@ -20,6 +20,13 @@ OpenFF Interchange は SMIRNOFF に atom type の概念が無いので、**原
|
|
|
20
20
|
|
|
21
21
|
名前について: GAFF 風の名前は騙らない。SMIRNOFF から本物の GAFF 型は
|
|
22
22
|
復元できないので、元素記号 + 連番という「由来を主張しない」名前にする。
|
|
23
|
+
|
|
24
|
+
**畳むのは Interchange 流の原子ごとの型 (``<名前>_<数字>``) だけ。**
|
|
25
|
+
GAFF2 の ``c3`` と ``c6`` のように、本物の力場の型どうしでもパラメータ列が
|
|
26
|
+
一致することがある。以前はそれも畳み、**その top の型を全部** ``C1`` /
|
|
27
|
+
``O1`` … に付け替えていた (エラーは出ない)。力場の型名を手がかりにする
|
|
28
|
+
受け手 (UDF の型の欄で力場を判別するもの) がそれで型を失う。``opls_267``
|
|
29
|
+
のような OPLS の型も ``_<数字>`` で終わるが、本物の型なので畳まない。
|
|
23
30
|
"""
|
|
24
31
|
from __future__ import annotations
|
|
25
32
|
|
|
@@ -45,6 +52,15 @@ _SYMBOLS = {
|
|
|
45
52
|
|
|
46
53
|
_SECTION_RE = re.compile(r"^\s*\[\s*([A-Za-z_]+)\s*\]")
|
|
47
54
|
|
|
55
|
+
#: Interchange が原子ごとに付ける型名 (``MOL0_4`` / ``methane_4``)。
|
|
56
|
+
_PER_ATOM_TYPE_RE = re.compile(r"^\S+_\d+$")
|
|
57
|
+
#: ``_<数字>`` で終わるが本物の力場の型。
|
|
58
|
+
_REAL_TYPE_RE = re.compile(r"^opls_\d+$", re.IGNORECASE)
|
|
59
|
+
|
|
60
|
+
|
|
61
|
+
def _is_per_atom_type(name: str) -> bool:
|
|
62
|
+
return bool(_PER_ATOM_TYPE_RE.match(name)) and not _REAL_TYPE_RE.match(name)
|
|
63
|
+
|
|
48
64
|
|
|
49
65
|
def _strip_comment(line: str) -> str:
|
|
50
66
|
return line.split(";", 1)[0]
|
|
@@ -100,6 +116,8 @@ def fold_atomtypes(text: str) -> Tuple[str, Dict[str, str]]:
|
|
|
100
116
|
fields = body.split()
|
|
101
117
|
if len(fields) < 2:
|
|
102
118
|
continue
|
|
119
|
+
if not _is_per_atom_type(fields[0]):
|
|
120
|
+
continue # 力場の型: 名前ごと残す
|
|
103
121
|
entries.append((i, fields[0], tuple(fields[1:])))
|
|
104
122
|
|
|
105
123
|
if not entries:
|
|
@@ -146,9 +164,10 @@ def fold_atomtypes(text: str) -> Tuple[str, Dict[str, str]]:
|
|
|
146
164
|
body = _strip_comment(line).strip()
|
|
147
165
|
if body:
|
|
148
166
|
f = body.split()
|
|
149
|
-
f[0]
|
|
150
|
-
|
|
151
|
-
|
|
167
|
+
if f[0] in mapping:
|
|
168
|
+
f[0] = mapping[f[0]]
|
|
169
|
+
out.append(" ".join(f))
|
|
170
|
+
continue
|
|
152
171
|
elif section == "atoms":
|
|
153
172
|
body = _strip_comment(line)
|
|
154
173
|
if body.strip():
|
|
@@ -1498,7 +1498,7 @@ class UdfAdapter:
|
|
|
1498
1498
|
L = max(a, b, c) [nm]
|
|
1499
1499
|
beta = .mdp に書く compressibility [nm^3 mol / kJ]
|
|
1500
1500
|
|
|
1501
|
-
``Cell_Mass`` はスキーマ上 ``[mass]`` (``
|
|
1501
|
+
``Cell_Mass`` はスキーマ上 ``[mass]`` (無償 OCTA の ``ENGINES/udf/cognac*.udf``)。
|
|
1502
1502
|
``Q`` と違って ``sigma^2`` は掛けない。
|
|
1503
1503
|
|
|
1504
1504
|
**根拠**。 どちらの側も ``tau_p`` は箱の振動の周期なので、 周期どうしを
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: abmptools
|
|
3
|
-
Version: 2.19.
|
|
3
|
+
Version: 2.19.2
|
|
4
4
|
Summary: Pre/post-processing and analysis toolkit for ABINIT-MP Fragment Molecular Orbital calculations
|
|
5
|
-
Author
|
|
5
|
+
Author: Koji Okuwaki
|
|
6
6
|
License-Expression: Apache-2.0
|
|
7
7
|
Project-URL: Homepage, https://github.com/kojioku/abmptools
|
|
8
8
|
Project-URL: Repository, https://github.com/kojioku/abmptools
|
|
@@ -264,4 +264,4 @@ release tag; until then, use:
|
|
|
264
264
|
|
|
265
265
|
## Author
|
|
266
266
|
|
|
267
|
-
|
|
267
|
+
Koji Okuwaki ([GitHub](https://github.com/kojioku))
|
|
@@ -4,12 +4,12 @@ build-backend = "setuptools.build_meta"
|
|
|
4
4
|
|
|
5
5
|
[project]
|
|
6
6
|
name = "abmptools"
|
|
7
|
-
version = "2.19.
|
|
7
|
+
version = "2.19.2"
|
|
8
8
|
description = "Pre/post-processing and analysis toolkit for ABINIT-MP Fragment Molecular Orbital calculations"
|
|
9
9
|
readme = {file = "README.md", content-type = "text/markdown"}
|
|
10
10
|
license = "Apache-2.0"
|
|
11
11
|
authors = [
|
|
12
|
-
{name = "Koji Okuwaki"
|
|
12
|
+
{name = "Koji Okuwaki"},
|
|
13
13
|
]
|
|
14
14
|
requires-python = ">=3.8"
|
|
15
15
|
dependencies = [
|
|
@@ -259,3 +259,17 @@ def test_write_udf_export_script_is_executable(tmp_path):
|
|
|
259
259
|
path = write_udf_export_script(str(tmp_path))
|
|
260
260
|
mode = os.stat(path).st_mode
|
|
261
261
|
assert mode & stat.S_IXUSR
|
|
262
|
+
|
|
263
|
+
|
|
264
|
+
def test_multigroup_anneal_sets_the_ensemble_temperature():
|
|
265
|
+
# Two T-coupling groups + annealing: GROMACS 2024+ grompp stops unless
|
|
266
|
+
# the ensemble temperature is given (checked on 2025.2 and 2026.3).
|
|
267
|
+
from abmptools.amorphous.mdp_protocol import generate_anneal_mdp
|
|
268
|
+
proto = AnnealProtocol(T_high=500.0, T_low=300.0)
|
|
269
|
+
two = generate_anneal_mdp(proto, tc_grps="IMC PVP")
|
|
270
|
+
lines = {l.split("=")[0].strip(): l.split("=", 1)[1].strip()
|
|
271
|
+
for l in two.splitlines() if "=" in l and not l.lstrip().startswith(";")}
|
|
272
|
+
assert lines["ensemble-temperature-setting"] == "constant"
|
|
273
|
+
assert float(lines["ensemble-temperature"]) == 500.0 # = ref-t, no warning
|
|
274
|
+
one = generate_anneal_mdp(proto, tc_grps="System")
|
|
275
|
+
assert "ensemble-temperature" not in one
|
|
@@ -54,8 +54,7 @@ def test_atoms_carry_the_mass_column():
|
|
|
54
54
|
"""`[ atoms ]` の 8 列目に質量を出すこと。
|
|
55
55
|
|
|
56
56
|
GROMACS では省略可 —— 無ければ `[ atomtypes ]` から引く、という規約。
|
|
57
|
-
|
|
58
|
-
`convert_gromacs_udf.py:238-246` は
|
|
57
|
+
**`.top` を読む受け手側の変換はその規約を実装していない。** その変換は
|
|
59
58
|
|
|
60
59
|
if len(stmp) > 7:
|
|
61
60
|
mass = float(stmp[7])
|
|
@@ -119,6 +119,53 @@ def test_no_duplicates_is_a_no_op():
|
|
|
119
119
|
assert out == single
|
|
120
120
|
|
|
121
121
|
|
|
122
|
+
# GAFF2 の c3 と c6 は LJ も質量も同じ (hostguest の β-CD で出る)
|
|
123
|
+
GAFF = textwrap.dedent("""\
|
|
124
|
+
[ defaults ]
|
|
125
|
+
1 2 yes 0.5 0.8333
|
|
126
|
+
|
|
127
|
+
[ atomtypes ]
|
|
128
|
+
;name at.num mass charge ptype sigma epsilon
|
|
129
|
+
c3 6 12.01 0.0 A 0.33977095 0.4510352
|
|
130
|
+
c6 6 12.01 0.0 A 0.33977095 0.4510352
|
|
131
|
+
oh 8 16.00 0.0 A 0.32428713 0.389112
|
|
132
|
+
opls_135 6 12.011 0.0 A 0.35 0.276144
|
|
133
|
+
opls_136 6 12.011 0.0 A 0.35 0.276144
|
|
134
|
+
|
|
135
|
+
[ moleculetype ]
|
|
136
|
+
MOL 3
|
|
137
|
+
|
|
138
|
+
[ atoms ]
|
|
139
|
+
; nr type resnr residue atom cgnr charge mass
|
|
140
|
+
1 c3 1 MOL C1 1 -0.1 12.01
|
|
141
|
+
2 c6 1 MOL C2 2 -0.2 12.01
|
|
142
|
+
3 oh 1 MOL O1 3 0.3 16.00
|
|
143
|
+
4 opls_135 1 MOL C3 4 0.0 12.011
|
|
144
|
+
5 opls_136 1 MOL C4 5 0.0 12.011
|
|
145
|
+
|
|
146
|
+
[ system ]
|
|
147
|
+
x
|
|
148
|
+
|
|
149
|
+
[ molecules ]
|
|
150
|
+
MOL 1
|
|
151
|
+
""")
|
|
152
|
+
|
|
153
|
+
|
|
154
|
+
def test_force_field_types_keep_their_names():
|
|
155
|
+
# Identical parameters, but they are the force field's own types:
|
|
156
|
+
# folding them renamed every type in the top to C1 / O1.
|
|
157
|
+
text, mapping = fold_atomtypes(GAFF)
|
|
158
|
+
assert mapping == {}
|
|
159
|
+
assert _atomtype_names(text) == ["c3", "c6", "oh", "opls_135", "opls_136"]
|
|
160
|
+
|
|
161
|
+
|
|
162
|
+
def test_only_per_atom_types_fold_in_a_mixed_top():
|
|
163
|
+
mixed = MINIMAL.replace("M_2 8", "c3 6 12.011 0.0 A 0.34 0.36\nM_2 8")
|
|
164
|
+
text, mapping = fold_atomtypes(mixed)
|
|
165
|
+
assert "c3" in _atomtype_names(text) and "c3" not in mapping
|
|
166
|
+
assert mapping["M_0"] == mapping["M_1"]
|
|
167
|
+
|
|
168
|
+
|
|
122
169
|
@pytest.mark.skipif(shutil.which("gmx") is None, reason="gmx が無い")
|
|
123
170
|
def test_energy_is_unchanged(tmp_path):
|
|
124
171
|
"""**本命**: grompp + 0 step で全エネルギー項が一致すること。
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|