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

Nutrient intake continued.. #124

Merged
merged 2 commits into from
Jun 27, 2023
Merged

Nutrient intake continued.. #124

merged 2 commits into from
Jun 27, 2023

Conversation

ismael-lajaaiti
Copy link
Collaborator

@ismael-lajaaiti ismael-lajaaiti commented Apr 28, 2023

Here is my take on Eva's PR 🚀🌔

I am sorry my first commit is a bit messy (not very 'atomic').

Here is a summary of my changes:

  • clarify the functions related to the producer growth
  • remove unnecessary files
  • create new utilities functions for related to the nutrients
  • rename dBdt! to dudt!
  • rename NutrientIntake fields for sake of clarity.

@iago-lito iago-lito changed the title Niiiiiiii! Nutrient intake continued.. May 2, 2023
@iago-lito iago-lito mentioned this pull request May 2, 2023
Copy link
Collaborator

@iago-lito iago-lito left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @ismael-lajaaiti and thank you for pushing this feature forward :) Here is a wide list of nits, with nothing strongly emerging from the comments. The integration is well done, and you have taken this opportunity to keep cleaning up the project <3

I haven't had a deep look into the tests: in your opinion, are nutrient intake sufficiently tested yet?

src/inputs/producer_growth_struct.jl Outdated Show resolved Hide resolved
test/model/test-nutrientintake.jl Outdated Show resolved Hide resolved
.gitignore Show resolved Hide resolved
docs/src/man/modelparameters.md Outdated Show resolved Hide resolved
docs/src/man/modelparameters.md Outdated Show resolved Hide resolved
src/model/simulate.jl Outdated Show resolved Hide resolved
src/model/simulate.jl Outdated Show resolved Hide resolved
src/model/simulate.jl Outdated Show resolved Hide resolved
src/model/simulate.jl Outdated Show resolved Hide resolved
src/model/simulate.jl Show resolved Hide resolved
Copy link
Collaborator

@iago-lito iago-lito left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good job again @ismael-lajaaiti :) I'll let you address these few remainers and get back to you regarding the boosting of nutrient dynamics and its connection to #82.

@@ -140,9 +141,13 @@ export MultiplexNetwork
export n_links
export nestedhierarchymodel
export nichemodel
export NIntakeParams
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

? Does that still exist?

src/EcologicalNetworksDynamics.jl Outdated Show resolved Hide resolved
src/inputs/producer_growth.jl Show resolved Hide resolved
src/inputs/producer_growth.jl Outdated Show resolved Hide resolved
src/inputs/producer_growth.jl Outdated Show resolved Hide resolved
src/measures/structure.jl Show resolved Hide resolved
src/model/dudt.jl Show resolved Hide resolved
src/model/set_temperature.jl Show resolved Hide resolved
src/model/simulate.jl Show resolved Hide resolved
src/measures/structure.jl Outdated Show resolved Hide resolved
@iago-lito
Copy link
Collaborator

Oh, and regardless of the small requested changes, I think this PR is ready for "englishing" @Thomalpas. Can I leave this to your sharp eye? :)

@Thomalpas
Copy link
Collaborator

Of course!

docs/src/man/modelparameters.md Outdated Show resolved Hide resolved
docs/src/man/modelparameters.md Outdated Show resolved Hide resolved
docs/src/man/modelparameters.md Outdated Show resolved Hide resolved
docs/src/man/modelparameters.md Outdated Show resolved Hide resolved
docs/src/man/modelparameters.md Outdated Show resolved Hide resolved
src/model/dudt.jl Outdated Show resolved Hide resolved
src/model/producer_growth.jl Show resolved Hide resolved
src/model/producer_growth.jl Outdated Show resolved Hide resolved
src/model/set_temperature.jl Show resolved Hide resolved
src/model/simulate.jl Outdated Show resolved Hide resolved
@ismael-lajaaiti
Copy link
Collaborator Author

Thanks @iago-lito and @Thomalpas for your review and useful comments. Here are my corrections.

environment = Environment(foodweb; K)
params = ModelParameters(foodweb; functional_response, environment)
producer_growth = LogisticGrowth(foodweb; K)
params = ModelParameters(foodweb; functional_response)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wait, the variable producer_growth is not used, and functional_response is not defined? Are they supposed to be the same name? Why do the tests pass then?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

functional_response is defined above in the file.
My bad for not using producer_growth, the output figure doesn't make sense, but I forgot to check it.
It should be fixed in the next commit.

src/model/simulate.jl Outdated Show resolved Hide resolved
test/model/test-model_parameters.jl Show resolved Hide resolved
use_cases/nutrients-competition-exclusion.jl Show resolved Hide resolved
use_cases/paradox_enrichment_nutrientintake.jl Outdated Show resolved Hide resolved
src/EcologicalNetworksDynamics.jl Outdated Show resolved Hide resolved
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.

4 participants