Skip to content

Commit 3e01112

Browse files
authored
Merge pull request #163 from sandialabs/dev
more Julia testing
2 parents 4011c9b + e585a7e commit 3e01112

File tree

6 files changed

+1160
-80
lines changed

6 files changed

+1160
-80
lines changed

.github/workflows/julia.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,16 @@ jobs:
3434
- name: format
3535
if: runner.os == 'Linux'
3636
run: julia -e 'using Pkg; Pkg.add("JuliaFormatter"); using JuliaFormatter; if format("./") == true; exit(0); else exit(1); end'
37+
register:
38+
if: github.event_name == 'release'
39+
runs-on: ubuntu-latest
40+
steps:
41+
- uses: actions/github-script@v6
42+
with:
43+
script: |
44+
github.rest.repos.createCommitComment({
45+
owner: context.repo.owner,
46+
repo: context.repo.repo,
47+
commit_sha: context.sha,
48+
body: '@JuliaRegistrator register'
49+
})

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.1.2"
3+
version = "0.1.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.1.2"
4+
version = "0.1.3"
55

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

src/physics/single_chain/mod.jl

Lines changed: 78 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ Single-chain models for polymer physics.
33
"""
44
module SingleChain
55

6-
include("test.jl")
76
include("ideal/mod.jl")
87
include("fjc/mod.jl")
98
include("efjc/mod.jl")
@@ -23,4 +22,82 @@ function integrate(
2322
return sum(map(fun, lower_lim .+ (0.5 .+ collect(range(0, num_points - 1))) * dx)) * dx
2423
end
2524

25+
struct Parameters
26+
abs_tol::Float64
27+
rel_tol::Float64
28+
rel_tol_thermodynamic_limit::Float64
29+
log_log_tol::Float64
30+
log_log_scale::Float64
31+
number_of_loops::UInt32
32+
hinge_mass_reference::Float64
33+
hinge_mass_scale::Float64
34+
link_length_reference::Float64
35+
link_length_scale::Float64
36+
number_of_links_minimum::UInt8
37+
number_of_links_maximum::UInt8
38+
link_stiffness_reference::Float64
39+
link_stiffness_scale::Float64
40+
nondimensional_link_stiffness_large::Float64
41+
nondimensional_link_stiffness_medium::Float64
42+
well_width_reference::Float64
43+
well_width_scale::Float64
44+
nondimensional_well_width_small::Float64
45+
nondimensional_end_to_end_length_per_link_reference::Float64
46+
nondimensional_end_to_end_length_per_link_scale::Float64
47+
nondimensional_end_to_end_length_per_link_small::Float64
48+
nondimensional_force_reference::Float64
49+
nondimensional_force_scale::Float64
50+
nondimensional_force_small::Float64
51+
nondimensional_potential_distance_reference::Float64
52+
nondimensional_potential_distance_scale::Float64
53+
nondimensional_potential_distance_small::Float64
54+
nondimensional_potential_distance_large_1::Float64
55+
nondimensional_potential_distance_large_2::Float64
56+
nondimensional_potential_stiffness_reference::Float64
57+
nondimensional_potential_stiffness_scale::Float64
58+
nondimensional_potential_stiffness_small::Float64
59+
nondimensional_potential_stiffness_large::Float64
60+
temperature_reference::Float64
61+
temperature_scale::Float64
62+
end
63+
64+
parameters = Parameters(
65+
1e-7,
66+
1e-5,
67+
1e-1,
68+
5e-1,
69+
12e-1,
70+
8,
71+
1e0,
72+
1e0,
73+
1e0,
74+
1e0,
75+
0x08,
76+
0x19,
77+
5e5,
78+
99e4,
79+
1e4,
80+
1e1,
81+
99e-2,
82+
5e-1,
83+
1e-2,
84+
5e-1,
85+
99e-2,
86+
25e-2,
87+
5e1,
88+
1e2,
89+
75e-2,
90+
1e0,
91+
2e0,
92+
33e-2,
93+
1e1,
94+
1e1 + 25e-1,
95+
5e1,
96+
1e2,
97+
1e-2,
98+
1e2,
99+
3e2,
100+
1e2,
101+
)
102+
26103
end

0 commit comments

Comments
 (0)