Skip to content

Fix/merge conflicts openmm#2

Open
KyuJungJun wants to merge 4 commits intomainfrom
fix/merge-conflicts-openmm
Open

Fix/merge conflicts openmm#2
KyuJungJun wants to merge 4 commits intomainfrom
fix/merge-conflicts-openmm

Conversation

@KyuJungJun
Copy link
Collaborator

  • add tetrameric anion functionality
  • add builder_ligpargen_openmm_from_mols_multi_system.py
  • add the functionality of reading each LIT Charges for each solvent

ratios_type = 'mol'
assert len(smiles) == len(ratios)
else:
<<<<<<< HEAD
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You haven't properly done a previous merge, fix this please

simu_temperature=simu_temp,
prod_run_time=simu_length,
ani_name_rdf=ani_name_rdf,
poly_name=','.join(poly_name),
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just pushed a change to the main branch that includes a line here. I hadn't kept consistent before the xyz_output variable which matters for knowing the accurate simulation lenght. Check my commit and update this

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants