search

phys201 / nc_AFM

Fitting forces to ncAFM data
GNU General Public License v3.0
0 stars 0 forks source link

remove duplicate files #12

Closed jennmcguire closed 2 years ago

jennmcguire commented 2 years ago

Your documentation.ipynb and LJ_vdw_M3.ipynb files appear to be the same. You should remove LJ_vdw_M3.ipynb from the main branch.

aspitzig0 commented 2 years ago

We adding a vdw term to the main model in this notebook (it's pushed but not accepted). I know this should be done in the documentation notebook and pushed to the main branch when we're happy with it, but we're trying a LJ+electrostatics model simultaneously, so we can't use the same notebook (right?).

vnmanoharan commented 2 years ago

You can use a different branch for the new model. Develop in the new branch and then do a pull request against the main branch when development is complete.

aspitzig0 commented 2 years ago

25 and #26 moved all vdw considerations into the documentation notebook.