Skip to content

Commit

Permalink
removing unsuitable options, decompose frame conversion
Browse files Browse the repository at this point in the history
  • Loading branch information
Ragzouken committed Sep 30, 2024
1 parent 1a9db79 commit fe8c322
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 6 deletions.
6 changes: 4 additions & 2 deletions python-libraries/nanover-ase/src/nanover/ase/frame_adaptor.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@
from typing import Callable
from ase import Atoms # type: ignore

from nanover.ase.converter import ase_atoms_to_topology_frame, ase_atoms_to_regular_frame
from nanover.ase.converter import (
ase_atoms_to_topology_frame,
ase_atoms_to_regular_frame,
)
from nanover.trajectory import FramePublisher
from nanover.ase import ase_to_frame_data


def send_ase_frame(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
from nanover.essd import DiscoveryServer
from nanover.openmm import openmm_to_frame_data, serializer
from nanover.trajectory.frame_publisher import FramePublisher
from openmm.app import Simulation, Topology
from openmm.app import Simulation

from nanover.ase import ase_to_frame_data
from nanover.ase.converter import add_ase_positions_to_frame_data
Expand Down
4 changes: 3 additions & 1 deletion python-libraries/nanover-omni/src/nanover/omni/ase.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ class ASESimulation:
"""

@classmethod
def from_ase_dynamics(cls, dynamics: MolecularDynamics, *, name: Optional[str] = None):
def from_ase_dynamics(
cls, dynamics: MolecularDynamics, *, name: Optional[str] = None
):
"""
Construct this from an existing ASE dynamics.
:param dynamics: An existing ASE Dynamics
Expand Down
6 changes: 4 additions & 2 deletions python-libraries/nanover-omni/src/nanover/omni/ase_omm.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@
from nanover.ase.converter import EV_TO_KJMOL
from nanover.ase.imd_calculator import ImdCalculator
from nanover.ase.openmm import OpenMMCalculator
from nanover.ase.openmm.runner import openmm_ase_atoms_to_regular_frame, openmm_ase_atoms_to_topology_frame
from nanover.ase.openmm.runner import (
openmm_ase_atoms_to_regular_frame,
openmm_ase_atoms_to_topology_frame,
)
from nanover.ase.wall_constraint import VelocityWallConstraint
from nanover.omni.ase import InitialState
from nanover.openmm import serializer
Expand Down Expand Up @@ -239,4 +242,3 @@ def make_default_ase_omm_dynamics(atoms: Atoms):
)

return dynamics

0 comments on commit fe8c322

Please sign in to comment.