Updating AquaCrop-OS version to 3.0.11#9
Open
oleksmialyk wants to merge 74 commits into
Open
Conversation
For training notebooks.
Additional built-in weather files
Built-in CMIP6 data for Woolpit, Suffolk to be used in additional notebooks.
Updated to match new release version
Additional CMIP6 built-in data
Update setup.cfg
Format change to additional climate files
Update for new release
Update setup.cfg
Update cffi version from 1.15.0 to 1.16.0 to avoid package clashes on Google Colab
To include new CMIP6 projection built-in data for notebooks.
Update version to push new changes to PyPi
Update requirements.txt
Update MANIFEST.in
Additional built-in climate files
Update setup.cfg
Update cffi version from 1.15.0 to 1.16.0 to address new dependency issue.
Update setup.cfg
Updated manifest, setup and requirements
To fix error in Google Colab
Update cffi to 1.16.0
Update setup.cfg
Soil bunds are provided in mm so no need to multiply them by 1000 when calculating runoff/water storage. Also, RunoffTotal (normal runoff + surface water storage overflow) is not used for anything; it should be renamed into Runoff so then it's reported in outputs.
@chris-s-bowden confirmed this change in AquaCrop v7 compared to v6
Immediately convert z_bund from metres to millimetres on initialisation of fieldManagement
Fixing bugs with groundwater, irrigation, soil bunds, canopy and root development
Update to readme and version increment
Also completely deleted 'checkIfPackageIsCompiled.py' and any references to it.
These changes were made by running the model and making changes iteratively to remove errors as they were flagged. The model now runs without errors but has zeros for almost all outputs. First 8 days of each season show gdd,gdd_cum,z_root from crop_growth and Wr,z_gw,Es,EsPot from water_flux; all other vars are zeroes throughout.
Duplicate crop definitions in the run_single_timestep that had appeared because of my overly simplistic replacement of all CropStruct()'s with Crop().
Mainly updating comments but a couple of files had imports and arguments of 'NT' classes which are no longer required.
Set current working package versions as minimum required versions. This is liable to potentially break in future as some packages update, but provides initial stability with only minor ongoing checks required.
Changed target to 2 decimal places from 3, in-line with all other targets in the test file.
Remove numba ahead-of-time compilation elements
to match requirements.txt
Update setup.cfg
bug/root_growth
bump version number
Update setup.cfg
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
removing numba so no more compilation warnings/errors