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

Sediment model fixes + simpler model #121

Merged
merged 32 commits into from
Jul 15, 2023

Conversation

jagoosw
Copy link
Collaborator

@jagoosw jagoosw commented Jul 13, 2023

I've finally fixed sediment models so they work properly and conserve nitrogen!

Also fixed a few bugs in the sediment model time-stepping and adds a simple instant remineralization model (as described in PISCESv2 paper).

Hopefully after #120 is merged the odd commit history will be fixed.

@codecov
Copy link

codecov bot commented Jul 13, 2023

Codecov Report

Patch coverage: 74.66% and project coverage change: +1.94 🎉

Comparison is base (d53ea6b) 61.90% compared to head (891fc26) 63.85%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #121      +/-   ##
==========================================
+ Coverage   61.90%   63.85%   +1.94%     
==========================================
  Files          27       28       +1     
  Lines         974     1021      +47     
==========================================
+ Hits          603      652      +49     
+ Misses        371      369       -2     
Impacted Files Coverage Δ
src/Boundaries/Sediments/coupled_timesteppers.jl 68.00% <0.00%> (-12.96%) ⬇️
src/Models/AdvectedPopulations/LOBSTER/LOBSTER.jl 84.21% <60.00%> (+2.39%) ⬆️
src/Boundaries/Sediments/Sediments.jl 58.82% <62.50%> (-5.47%) ⬇️
src/Models/AdvectedPopulations/NPZD.jl 92.00% <66.66%> (+1.72%) ⬆️
...c/Boundaries/Sediments/instant_remineralization.jl 83.33% <83.33%> (ø)
src/Boundaries/Sediments/simple_multi_G.jl 89.79% <92.85%> (-2.31%) ⬇️
src/Models/Individuals/SLatissima.jl 83.87% <100.00%> (ø)
src/Models/Models.jl 100.00% <100.00%> (+100.00%) ⬆️
src/Particles/Particles.jl 29.41% <100.00%> (+1.63%) ⬆️

... and 2 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

src/Models/AdvectedPopulations/NPZD.jl Outdated Show resolved Hide resolved
test/test_sediment_particles.jl Outdated Show resolved Hide resolved
@jagoosw
Copy link
Collaborator Author

jagoosw commented Jul 13, 2023

Perhaps I should make sediments work with bathymetry here too

I think I will make another PR after this to change flat sediments to actually have flat fields, and to make them work with bathymetry which shouldn't be too hard and just means everytime we index into the k=1 cell of a field we go to the max depth index

@jagoosw jagoosw requested a review from navidcy July 15, 2023 14:52
src/Boundaries/Sediments/instant_remineralization.jl Outdated Show resolved Hide resolved
src/Boundaries/Sediments/instant_remineralization.jl Outdated Show resolved Hide resolved
src/Models/AdvectedPopulations/NPZD.jl Outdated Show resolved Hide resolved
@jagoosw jagoosw merged commit be85777 into main Jul 15, 2023
4 checks passed
@jagoosw jagoosw deleted the jsw/instant-remineralisation-sediment branch July 15, 2023 18:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working enhancement New feature or request science
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants