Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add new domain, remove unused function, and fix rop function dispatch #230

Merged
merged 14 commits into from
Feb 18, 2024
Merged

Add new domain, remove unused function, and fix rop function dispatch #230

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
67a3f3b
Formatting by Formatter
hwpang Feb 17, 2024
7e3417b
Add new domain ConstantTLiqFilmDomain
hwpang Feb 17, 2024
abd9170
Add new calc thermo functions
hwpang Feb 17, 2024
094c7eb
Use domains stored in interface
hwpang Feb 17, 2024
5bb3fe9
Expand liquid domain volume w.r.t. the solid domain
hwpang Feb 17, 2024
92c3c5a
Remove unused function
hwpang Feb 17, 2024
a765b63
Remove unused inputs
hwpang Feb 17, 2024
d2b23e7
start should be 0
hwpang Feb 17, 2024
1e8e7ef
pass nothing in as massropvec for normal rop
hwpang Feb 17, 2024
bdee12b
Add massrop function
hwpang Feb 17, 2024
6957591
Add massropvec to rops! for fragment
hwpang Feb 17, 2024
93d9aed
Add rop test
hwpang Feb 17, 2024
c86e172
Remove extra blank lines
hwpang Feb 17, 2024
eb5202c
Fix
hwpang Feb 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Simulation.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ function rops(ssys::SystemSimulation, t)
for inter in ssys.interfaces
if inter isa FragmentBasedReactiveFilmGrowthInterfaceConstantT
kfs, krevs = getkfskrevs(inter)
rops!(ropmat, inter.rxnarray, inter.fragmentbasedrxnarray, cstot, kfs, krevs, vV[inter.domaininds[1]], start)
rops!(ropmat, nothing, inter.rxnarray, inter.fragmentbasedrxnarray, cstot, kfs, krevs, vV[inter.domaininds[1]], inter.Mws, inter.domainfilm.indexes[1]:inter.domainfilm.indexes[2], start)
start += length(kfs)
elseif hasproperty(inter, :reactions)
kfs, krevs = getkfskrevs(inter, vT[inter.domaininds[1]], vT[inter.domaininds[2]], vphi[inter.domaininds[1]], vphi[inter.domaininds[2]], vGs[inter.domaininds[1]], vGs[inter.domaininds[2]], cstot)
Expand Down