-
Notifications
You must be signed in to change notification settings - Fork 35
Bare soil evaporation separated over irrigated and non-irrigated soil -old as from stable pre Maggie's meta data changes #139 #150
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
Open
Nic Gedney (nicgedney)
wants to merge
31
commits into
MetOffice:stable
Choose a base branch
from
nicgedney:separate_irrigated_bare_soil_evap
base: stable
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
31 commits
Select commit
Hold shift + click to select a range
42b595b
added all the extra variables definitions and passed to most/all rout…
nicgedney 34f29cc
fix compiler bug
nicgedney ff47832
more bug fixes
nicgedney 91429bf
correcting one typo
nicgedney 26f839e
OMP typo fixed
nicgedney 7d95d7c
OMP typo fixed
nicgedney 4fe1ce2
added first attempt of code additions to physiol
nicgedney 985b90a
basic code passes rose stem tests
nicgedney 50ba4db
add variable descriptions
nicgedney 90e7ffc
rose-meta info added
nicgedney 8884cf6
attempt to remove ashtf_nir and ashtf_irr
nicgedney ac7b60d
remove inconsistent variables in calls to fcdch
nicgedney 0984379
added text to documentation
nicgedney 07a9935
ran umdp3_fixer.py
nicgedney 4dd9e4e
comment out additional code fro sthu_nir calc in physiol
nicgedney 2d26472
remove comments from physiol
nicgedney f0969a4
typo and namelist checks
nicgedney 3b1fe31
deal with John Edwards's comments
nicgedney cae1b4f
added a comment
nicgedney 4b8814e
add some of copilot suggested changes
nicgedney b75bb9b
fix bug copilot found
nicgedney 8dfe983
omp fixes
nicgedney 6ef67ee
tidy up
nicgedney 4e3cdc0
nml.rst updated
nicgedney 0134f31
add name to contributors list
nicgedney c613116
remove trailing space
nicgedney 77ddb9a
changes required from Maggie's review
nicgedney 9537e94
required to deal with conflicts
nicgedney 04d2ecc
versions.py changed to deal with conflict
nicgedney c877990
deal with rose-meta data conflicts
nicgedney d4ef237
jules-shared changes
nicgedney File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| [namelist:jules_irrig] | ||
| compulsory=true | ||
| description=Configuration of irrigation demand code | ||
| ns=namelist/JULES Science Settings/jules_irrig | ||
| sort-key=21 | ||
| title=Irrigation options | ||
| url=https://metoffice.github.io/jules/latest/namelists/jules_irrig.nml.html#namelist-JULES_IRRIG | ||
|
|
||
| [namelist:jules_irrig=frac_irrig_all_tiles] | ||
| compulsory=true | ||
| description=Irrigate all tiles | ||
| =NOT AVAILABLE TO UM | ||
| fail-if=namelist:jules_irrig=set_irrfrac_on_irrtiles == '.true.' and this == '.true.'; # cannot set both frac_irrig_all_tiles and set_irrfrac_on_irrtiles to TRUE | ||
| sort-key=f | ||
| trigger=namelist:jules_irrig=nirrtile: .false.; | ||
| = namelist:jules_irrig=irrigtiles: .false.; | ||
| type=logical | ||
| url=https://metoffice.github.io/jules/latest/namelists/jules_irrig.nml.html#JULES_IRRIG::frac_irrig_all_tiles | ||
|
|
||
| [namelist:jules_irrig=irr_crop] | ||
| compulsory=true | ||
| description=Switch for how the irrigation model determines when to irrigate. | ||
| =0 is the only option available in the UM | ||
| sort-key=c | ||
| url=https://metoffice.github.io/jules/latest/namelists/jules_irrig.nml.html#JULES_IRRIG::irr_crop | ||
| values=0,1,2 | ||
|
|
||
| [namelist:jules_irrig=irrig_option] | ||
| compulsory=true | ||
| description=Options for applying irrigation | ||
| =0: No irrigation | ||
| =1: In a future release this will replace l_irrig_dmd (NOT AVAILABLE YET) | ||
| =2: Apply irrigation to available irrigated surface types | ||
| fail-if=this == 2 and namelist:jules_soil=l_tile_soil == '.true.'; # Tile-based irrigation is not available with soil tiling. | ||
| sort-key=b | ||
| trigger=namelist:jules_pftparm=irrig_pft_io: 2; | ||
| =namelist:jules_surface_types=c3_irrig: 2; | ||
| =namelist:jules_surface_types=c4_irrig: 2; | ||
| url=https://metoffice.github.io/jules/latest/namelists/jules_irrig.nml.html#JULES_IRRIG::irrig_option | ||
| value-titles=No Irrigation, Tile based irrigation | ||
| values=0,2 | ||
|
|
||
| [namelist:jules_irrig=irrigtiles] | ||
| compulsory=true | ||
| description=indices of tiles to be irrigated | ||
| fail-if=len(this) != namelist:jules_irrig=nirrtile | ||
| length=: | ||
| range=1: | ||
| sort-key=e | ||
| type=integer | ||
| url=https://metoffice.github.io/jules/latest/namelists/jules_irrig.nml.html#JULES_IRRIG::irrigtiles | ||
|
|
||
| [namelist:jules_irrig=l_irrig_dmd] | ||
| compulsory=true | ||
| description=Use fraction-based irrigation demand code | ||
| fail-if=namelist:jules_soil=l_holdwater == '.true.' and this == '.true.'; # Irrigation can't be used with l_holdwater = TRUE | ||
| =namelist:jules_water_resources=l_water_irrigation == '.true.' and this == '.false.'; # Irrigation in water resources code requires l_irrig_dmd = TRUE | ||
| sort-key=a | ||
| trigger=namelist:jules_irrig=irr_crop: .true.; | ||
| =namelist:jules_irrig=l_irrig_limit: .true.; | ||
| =namelist:jules_irrig=frac_irrig_all_tiles: .true.; | ||
| =namelist:jules_irrig=set_irrfrac_on_irrtiles: .true.; | ||
| =namelist:jules_irrig=nstep_irrig: .true.; | ||
| =namelist:jules_irrig_props: .true.; | ||
| =namelist:jules_irrig=irrig_option: .false.; | ||
| type=logical | ||
| url=https://metoffice.github.io/jules/latest/namelists/jules_irrig.nml.html#JULES_IRRIG::l_irrig_dmd | ||
|
|
||
| [namelist:jules_irrig=l_irrig_limit] | ||
| compulsory=true | ||
| description=Limit irrigation supply | ||
| =NOT AVAILABLE TO UM | ||
| fail-if=namelist:jules_rivers=l_rivers == '.false.' and this == '.true.'; # l_rivers must TRUE if l_irrig_limit = TRUE | ||
| =namelist:jules_rivers=i_river_vn != 3 and this == '.true.'; # i_river_vn must be 3 (trip) if l_irrig_limit = TRUE | ||
| =namelist:jules_hydrology=l_top == '.false.' and this == '.true.'; # l_top must TRUE if l_irrig_limit = TRUE | ||
| =namelist:jules_water_resources=l_water_irrigation == '.true.' and this == '.true.'; # l_irrig_limit must be F if l_water_irrigation=T | ||
| =this == '.true.' and namelist:jules_model_environment=l_jules_parent == 1; # Irrigation limitation is not tested in the UM yet. | ||
| sort-key=b | ||
| type=logical | ||
| url=https://metoffice.github.io/jules/latest/namelists/jules_irrig.nml.html#JULES_IRRIG::l_irrig_limit | ||
|
|
||
| [namelist:jules_irrig=nirrtile] | ||
| compulsory=true | ||
| description=Number of tile to be irrigated | ||
| range=0: | ||
| sort-key=d | ||
| type=integer | ||
| url=https://metoffice.github.io/jules/latest/namelists/jules_irrig.nml.html#JULES_IRRIG::nirrtile | ||
|
|
||
| [namelist:jules_irrig=nstep_irrig] | ||
| compulsory=true | ||
| description=Number of model timesteps per irrigation update step | ||
| range=1: | ||
| sort-key=h | ||
| type=integer | ||
| url=https://metoffice.github.io/jules/latest/namelists/jules_irrig.nml.html#JULES_IRRIG::nstep_irrig | ||
|
|
||
| [namelist:jules_irrig=set_irrfrac_on_irrtiles] | ||
| compulsory=true | ||
| description=Irrigate only irrigated tiles | ||
| =NOT AVAILABLE TO UM | ||
| fail-if=namelist:jules_irrig=frac_irrig_all_tiles == '.true.' and this == '.true.'; # cannot set both frac_irrig_all_tiles and set_irrfrac_on_irrtiles to TRUE | ||
| sort-key=g | ||
| type=logical | ||
| url=https://metoffice.github.io/jules/latest/namelists/jules_irrig.nml.html#JULES_IRRIG::set_irrfrac_on_irrtiles | ||
|
|
||
| [namelist:jules_irrig=l_soil_evap_irrig_separate] | ||
| compulsory=true | ||
| description=logical to decide whether bare soil evaporation is | ||
| =calculated over the grid-box mean (false) or | ||
| =explicitly irrigated and non-irrigated fractions (true) | ||
| fail-if=this == '.true.' and namelist:jules_irrig=l_irrig_dmd == '.false.' | ||
| sort-key=h | ||
| type=logical | ||
| url=https://metoffice.github.io/jules/latest/namelists/jules_irrig.nml.html#JULES_IRRIG::l_soil_evap_irrig_separate |
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
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.