Draft
Conversation
…epofix; MANUALLY resolved conflicts in: GEOSldas_App/GEOSldas_HIST.rc GEOSldas_App/ldas_setup GEOSldas_App/lenkf_j_template.py GEOSldas_App/preprocess_ldas.F90 GEOSldas_App/preprocess_ldas_routines.F90 GEOSldas_App/tile_bin2nc4.F90
Merged
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
3 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.
Overview:
Repositories affected by updates:
GEOSgcm_GridComp, GEOSldas_GridComp
New Files:
Brief description:
New land BCs version:
v13 : NL3 + JPL veg height + PEATMAP + MODIS snow alb v2 + Irrigation
The bcs generation package reads different irrigated area datasets and generates a new file "irrigation_IMxJM_DL.dat" containing, for each tile, a static: irrigation fraction, Paddy fraction, Rainfed fraction, crop irrigation fraction, crop irrigation type, crop planting and harvest dates, sprinkler fractions, drip fractions, flood fractions, and minimum and maximum LAI.
Irrigation module:
Adapted from:
feature/SM_irrigation_modelThe irrigation module computes irrigation rates by applying three different irrigation schemes: sprinkler, drip, and flood (furrow). Irrigation is triggered based on location, growing season (Implemented alternative options: LAI-based and Crop Calendar-based), and soil moisture.
New Output Variables: each variable is weighted based on the specific irrigated fractions:
SPRINKLERRATE: sprinkler_irrigation_rate (kg m-2 s-1)
DRIPRATE: drip_irrigation_rate (kg m-2 s-1)
FLOODRATE: flood_irrigation_rate (kg m-2 s-1)
IRRLAND: total irrigation rate (kg m-2 s-1) = SPRINKLERRATE + DRIPRATE + FLOODRATE
LDAS nightly test