Skip to content
Snippets Groups Projects

Repository graph

You can move around the graph by using the arrow keys.
Select Git revision
  • develop
  • master default protected
  • revert-735c7aa3
3 results
Created with Raphaël 2.2.013May15Nov24Mar17114125Feb24232221181110987654316Jan24Dec221725Nov2122Oct212017Sep98630Aug261211930Jul293Jun30May1230Apr282316141028Mar2724232219181719Jan27Dec22218JunDelete .RDataTmp3mastermasterDelete .RDataTmp2Delete .RDataTmpDelete .RDataTmp1Updated and checked the scripts for checking the workflow for JD. Basic scripts work!Restored the lost grassland script. All is ready for scaling now.grassland changes. added sheets to input datasmall changes model data R scriptIncluded the animalfeednutr sheet based on demis sheet. Refers to issue #42 Animal nutrition sheet in the Cifos-Model EU remote reposAdded function for creating mapping table between ISO3 and CiFoS country namesThe FertNutr sheet was combined with the FRV sheet. The HumanNutrSheet was updated. A function was added to read cifos model data easily.minor changesContinued with the grassland checks. Checked hyde documentation and adjusted the comparison accordingly. It still shows quite large deviations between our data fro grass and crop and the faostat land use data set. Gotta talk to hannah. Arable land looks better when comparing with fao. Also checked the FAOcode and realized that they differ from GAUL code. Be mindful!visualization functions for comparing the deviation of our extracted area data with FAOSTAT and EUROSTAT is fiished and works (look for ggarrange function in script)Finalized the grassland approach with current and potential stocking rates.finalized the grazing grassland approach where the prod_level is now selected based on the potential and the current grazing intensity. Current is based on EUROSTAT grazing intensity. While the maximum is based on the stocking rate with the highest yields per zone.did some data consistency check and resolved issue #39 on cifos-ModelEU repositoryMerge branch 'master' of https://git.wur.nl/simon083/demo_wjsworked on procssing, human nutrition sheet.Adjusted LossFraction sheet and created FertNutr sheet from excel fileFood supply, protein supply and imporrt export are adjusted to work with the bulk downloaded input file from FAOSTAT.In model data script: worked on newly discussed Import export approach where we substrat the non food and stocks from the import to get more realistic results .In progress.Grassland (stocking density change not yet done) and model data update (processing sheet update with JD)staging all consolidated filessdsdzAdded start of sitance matrix. For baseline food supply start at line 2764Worked on the whole script, focus on integrating the food groups and created new baseline sheets for import export and food supply.Merge branch 'master' of https://git.wur.nl/simon083/demo_wjsUpdated the grassland and function fileData updated and streamed lined the processing sheet hardcodingFixed animal nutr sheet, human nutr sheet. Next step loss fraction sheetadding all the different csv and some selected excel files. Now the model data scrip can be run with the available data sets here.Merge branch '20-ProcessingConsistency' into 'master'testing git branching via shelltesting the git shell commandsRemoved the duplicate procout-dietprod and procin-procout combinations.deleted weired headersMerge branch 'master' of https://git.wur.nl/simon083/demo_wjsRevert "Conflict with the local repo"revert-735c7aa3revert-735c7aa3New file name with same content as the former was buggy