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

Feature/AquaCropv7.2 integration #1633

Open
wants to merge 111 commits into
base: master
Choose a base branch
from

Conversation

lbusschaert
Copy link
Contributor

Description

This PR introduces the implementation of a crop model (AquaCropv7.2) in LIS, along with the LDT parameter processing. The implementation was done within the KU Leuven team of Prof. Gabriëlle De Lannoy, mainly by Michel Bechtold and myself.
Research has been done with a preliminary version of AquaCropv7.0 in LIS:

The objective was now to develop a final working version in LIS.

I was visiting the NASA-LIS team in early 2024 and prepared this implementation in collaboration with Sujay Kumar and David Mocko. The implementation is now finalized and has been carefully tested and compared to AquaCrop reference output.

AquaCropv7.2 (ac72) is now part of the surfacemodels/land/. The implementation is documented in
LIS_AC_documentation.pdf

We acknowledge that this is a large PR and we greatly appreciate the time you spend on it. Do not hesitate to contact me in case of any questions ([email protected]).

Testcase

Test cases for LDT and LIS have been added under the ldt/testcases and lis/testcases folders. The data for the test cases are stored in a Zenodo repository organized in the requested format: https://zenodo.org/records/14035685

Testing was done for the generic crop having a 365-day cycle
for 4 restart times (1 Feb, 1 Aug, 1 Dec, 1 Jan next sim), as well as
for the AquaCrop Maize file planted on March 22nd.
Minor differences are supposably introduced by precision differences
(saving restart variables as single precision while AC uses doubles) but
have no impact on the final biomass, yield, Tact, Eact.

Note that the restart is not working for
- perennial crops
- GDD crops (will be fixed later)
- salinity
- (may need a more elaborate list somewhere)

No irrigation nor groundwater files were used as it has been decided
that those options will be forced from LIS. Irrigation will be
introduced in the next developments. Groundwater will not be introduced
for the time being.
@emkemp
Copy link
Contributor

emkemp commented Feb 27, 2025

Hi @lbusschaert

Can you please open up permissions in your GitHub repo so I can upload changes? @jvgeiger and I are doing a code review and there are some (mostly cosmetic) changes that we would like to make. But I can't push updates to your repo.

@lbusschaert
Copy link
Contributor Author

Hi @emkemp,

I've made you both collaborators to my repo. I think you should be able to push changes now. If not, please let me know.

Let me know if I can help with anything else.

Thanks

@emkemp
Copy link
Contributor

emkemp commented Feb 28, 2025

Hi @lbusschaert

Hmm, I'm still being blocked.

[emkemp@discover31 /discover/nobackup/projects/usaf_lis/emkemp/pr/1633/LISF/ldt]$ git push
ERROR: Permission to lbusschaert/LISF.git denied to emkemp.
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.

@jvgeiger Do I need to push this to my personal GitHub repo first, and then push from there?

@lbusschaert
Copy link
Contributor Author

Hi @emkemp,

You are both still marked as "pending invite", maybe you could try to accept it first?

image

@emkemp
Copy link
Contributor

emkemp commented Feb 28, 2025

Hi @lbusschaert

That was it! And my push went through (removing unused local variables).

I'll work on additional updates.

@emkemp
Copy link
Contributor

emkemp commented Mar 4, 2025

Okay, I think this code is ready. I will have a final (?) walkthrough with @jvgeiger later this week and we will make a decision.

@emkemp emkemp removed the NotReady label Mar 4, 2025
@emkemp
Copy link
Contributor

emkemp commented Mar 4, 2025

Also: I did not disturb the LSM source code in lis/surfacemodels/land/ac.7.2/ac_modules.

@lbusschaert
Copy link
Contributor Author

Thanks for all the work @emkemp
FYI: all the code under ac_modules is the original AquaCrop source code (the units were literally copy-pasted from the source code).

@emkemp
Copy link
Contributor

emkemp commented Mar 6, 2025

@lbusschaert We will postpone accepting this PR by one week to give @jvgeiger time to add this to his test case suite. But the code looks ready.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
AddToTestSuite Documentation Update to documentation (User's Guide or within the code) enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants