Skip to content

Commit ca9840f

Browse files
authored
Merge pull request #178 from sandialabs/ufjc-isometric-legendre
uFJC isometric legendre
2 parents 81f62b1 + dcbb55b commit ca9840f

File tree

189 files changed

+37714
-429
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

189 files changed

+37714
-429
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "polymers"
3-
version = "0.3.2"
3+
version = "0.3.3"
44
edition = "2021"
55
description = "Polymers Modeling Library"
66
license = "BSD-3-Clause"

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "Polymers"
22
uuid = "8aef037c-a721-4e8a-9d81-eb7093daef2c"
33
authors = ["mrbuche <[email protected]>"]
4-
version = "0.3.2"
4+
version = "0.3.3"
55

66
[deps]
77
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"

conftest.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import pytest
22
from re import sub
3-
from sys import stdout
43
from subprocess import run
54

65

docs/source/physics/single_chain/efjc/thermodynamics/isometric.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ EFJC model thermodynamics (isometric)
55
:maxdepth: 1
66

77
Asymptotic <isometric/asymptotic>
8-
Legendre <isometric/legendre>
98

109
.. autoclass:: polymers.physics.single_chain.efjc.thermodynamics.isometric::EFJC(number_of_links, link_length, hinge_mass, link_stiffness)
1110

@@ -14,4 +13,3 @@ EFJC model thermodynamics (isometric)
1413
.. autoattribute:: hinge_mass
1514
.. autoattribute:: link_stiffness
1615
.. autoattribute:: asymptotic
17-
.. autoattribute:: legendre

docs/source/physics/single_chain/ufjc/lennard_jones/thermodynamics.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Lennard-Jones-FJC model thermodynamics
44
.. toctree::
55
:maxdepth: 1
66

7+
Isometric <thermodynamics/isometric>
78
Isotensional <thermodynamics/isotensional>
89

910
.. autoclass:: polymers.physics.single_chain.ufjc.lennard_jones.thermodynamics::LENNARDJONESFJC(number_of_links, link_length, hinge_mass, link_stiffness)
@@ -12,4 +13,5 @@ Lennard-Jones-FJC model thermodynamics
1213
.. autoattribute:: link_length
1314
.. autoattribute:: hinge_mass
1415
.. autoattribute:: link_stiffness
16+
.. autoattribute:: isometric
1517
.. autoattribute:: isotensional
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
Lennard-Jones-FJC model thermodynamics (isometric)
2+
==================================================
3+
4+
.. toctree::
5+
:maxdepth: 1
6+
7+
Asymptotic <isometric/asymptotic>
8+
9+
.. autoclass:: polymers.physics.single_chain.ufjc.lennard_jones.thermodynamics.isometric::LENNARDJONESFJC(number_of_links, link_length, hinge_mass, link_stiffness)
10+
11+
.. autoattribute:: number_of_links
12+
.. autoattribute:: link_length
13+
.. autoattribute:: hinge_mass
14+
.. autoattribute:: link_stiffness
15+
.. autoattribute:: asymptotic
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
Lennard-Jones-FJC model thermodynamics (isometric/asymptotic)
2+
=============================================================
3+
4+
.. toctree::
5+
:maxdepth: 1
6+
7+
Reduced <asymptotic/reduced>
8+
Legendre <asymptotic/legendre>
9+
10+
.. autoclass:: polymers.physics.single_chain.ufjc.lennard_jones.thermodynamics.isometric.asymptotic::LENNARDJONESFJC(number_of_links, link_length, hinge_mass, link_stiffness)
11+
12+
.. autoattribute:: number_of_links
13+
.. autoattribute:: link_length
14+
.. autoattribute:: hinge_mass
15+
.. autoattribute:: link_stiffness
16+
.. autoattribute:: reduced
17+
.. autoattribute:: legendre
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Lennard-Jones-FJC model thermodynamics (isometric/asymptotic/legendre)
2+
======================================================================
3+
4+
.. autoclass:: polymers.physics.single_chain.ufjc.lennard_jones.thermodynamics.isometric.asymptotic.legendre::LENNARDJONESFJC(number_of_links, link_length, hinge_mass, link_stiffness)
5+
6+
.. autoattribute:: number_of_links
7+
.. autoattribute:: link_length
8+
.. autoattribute:: hinge_mass
9+
.. autoattribute:: link_stiffness
10+
.. automethod:: force(end_to_end_length, temperature)
11+
.. automethod:: nondimensional_force(nondimensional_end_to_end_length_per_link)
12+
.. automethod:: helmholtz_free_energy(end_to_end_length, temperature)
13+
.. automethod:: helmholtz_free_energy_per_link(end_to_end_length, temperature)
14+
.. automethod:: relative_helmholtz_free_energy(end_to_end_length, temperature)
15+
.. automethod:: relative_helmholtz_free_energy_per_link(end_to_end_length, temperature)
16+
.. automethod:: nondimensional_helmholtz_free_energy(nondimensional_end_to_end_length_per_link, temperature)
17+
.. automethod:: nondimensional_helmholtz_free_energy_per_link(nondimensional_end_to_end_length_per_link, temperature)
18+
.. automethod:: nondimensional_relative_helmholtz_free_energy(nondimensional_end_to_end_length_per_link)
19+
.. automethod:: nondimensional_relative_helmholtz_free_energy_per_link(nondimensional_end_to_end_length_per_link)
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
Lennard-Jones-FJC model thermodynamics (isometric/asymptotic/reduced)
2+
=====================================================================
3+
4+
.. toctree::
5+
:maxdepth: 1
6+
7+
Legendre <reduced/legendre>
8+
9+
.. autoclass:: polymers.physics.single_chain.ufjc.lennard_jones.thermodynamics.isometric.asymptotic.reduced::LENNARDJONESFJC(number_of_links, link_length, hinge_mass, link_stiffness)
10+
11+
.. autoattribute:: number_of_links
12+
.. autoattribute:: link_length
13+
.. autoattribute:: hinge_mass
14+
.. autoattribute:: link_stiffness
15+
.. autoattribute:: legendre
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Lennard-Jones-FJC model thermodynamics (isometric/asymptotic/reduced/legendre)
2+
==============================================================================
3+
4+
.. autoclass:: polymers.physics.single_chain.ufjc.lennard_jones.thermodynamics.isometric.asymptotic.reduced.legendre::LENNARDJONESFJC(number_of_links, link_length, hinge_mass, link_stiffness)
5+
6+
.. autoattribute:: number_of_links
7+
.. autoattribute:: link_length
8+
.. autoattribute:: hinge_mass
9+
.. autoattribute:: link_stiffness
10+
.. automethod:: force(end_to_end_length, temperature)
11+
.. automethod:: nondimensional_force(nondimensional_end_to_end_length_per_link)
12+
.. automethod:: helmholtz_free_energy(end_to_end_length, temperature)
13+
.. automethod:: helmholtz_free_energy_per_link(end_to_end_length, temperature)
14+
.. automethod:: relative_helmholtz_free_energy(end_to_end_length, temperature)
15+
.. automethod:: relative_helmholtz_free_energy_per_link(end_to_end_length, temperature)
16+
.. automethod:: nondimensional_helmholtz_free_energy(nondimensional_end_to_end_length_per_link, temperature)
17+
.. automethod:: nondimensional_helmholtz_free_energy_per_link(nondimensional_end_to_end_length_per_link, temperature)
18+
.. automethod:: nondimensional_relative_helmholtz_free_energy(nondimensional_end_to_end_length_per_link)
19+
.. automethod:: nondimensional_relative_helmholtz_free_energy_per_link(nondimensional_end_to_end_length_per_link)

0 commit comments

Comments
 (0)