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.

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

Split and cached model #33

Merged
merged 27 commits into from
Aug 9, 2021
Merged

Split and cached model #33

merged 27 commits into from
Aug 9, 2021

Conversation

longemen3000
Copy link
Member

(cached model)

  • Adds a CachedEoS, that can perform caching.
    ideally, all caching operations should be done in this type instead of each model. a basic TP interpolation scheme is implemented for sat_pure.
    (split model)
  • SingleParam, PairParam, AssocParam, GroupParam and SiteParam are "splittable", that is, split_model(param) will return a vector of params for each component. for that, SiteParam and GroupParam have now some parameters that were present before in the eos struct.
  • GroupParam has a constructor that skips the csv, that constructor is only used if no csv to parse are passed.
  • model.allcomponentnflattenedgroups -> model.groups.n_flattenedgroups
  • model.allcomponentnsites -> model.sites.n_sites
  • model.allgroupsnsites -> model.sites.n_sites (same)
  • SiteParam now has a printing method. with that, all ClapeyronParams now have pretty printing
    new models:
    joback model is up, (a_ideal is missing)
    improvement in models:
  • GERG2008 now uses the same printing structure that the rest of EoS uses
  • SAFTgammaMie is around 2x faster, by sacrificing some pretty functions and using some static arrays)

@codecov-commenter
Copy link

codecov-commenter commented Aug 9, 2021

Codecov Report

Merging #33 (227ee9b) into master (c2b281d) will decrease coverage by 3.61%.
The diff coverage is 24.20%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master      #33      +/-   ##
==========================================
- Coverage   52.72%   49.10%   -3.62%     
==========================================
  Files          57       60       +3     
  Lines        4537     4916     +379     
==========================================
+ Hits         2392     2414      +22     
- Misses       2145     2502     +357     
Impacted Files Coverage Δ
src/Clapeyron.jl 100.00% <ø> (ø)
src/methods/initial_guess.jl 25.00% <0.00%> (-0.51%) ⬇️
src/models/eos/SAFT/LJSAFT/LJSAFT.jl 0.00% <0.00%> (ø)
src/models/eos/cached/CachedEoS.jl 0.00% <0.00%> (ø)
...odels/eos/cached/sat_pure_aprox/TPInterpolation.jl 0.00% <0.00%> (ø)
src/models/eos/ideal/JobackIdeal.jl 0.00% <0.00%> (ø)
src/utils/visualisation.jl 0.00% <0.00%> (ø)
src/methods/methods.jl 13.33% <7.14%> (-86.67%) ⬇️
src/utils/ClapeyronParam.jl 19.02% <19.09%> (-2.33%) ⬇️
src/utils/macros.jl 41.26% <44.44%> (-14.00%) ⬇️
... and 18 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c2b281d...227ee9b. Read the comment docs.

@longemen3000 longemen3000 merged commit 3fb4179 into master Aug 9, 2021
pw0908 pushed a commit that referenced this pull request Apr 28, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants