-
Notifications
You must be signed in to change notification settings - Fork 375
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'bbyefork/bbye/lnd/integrate_FAN_and_Fer…
…tilizer_for_crops' (PR #5981) Adds Flow of Agriculture Nitrogen (ammonia emissions) to crop model. Adds gridded fertilizer for nitrogen and phosphorus. Adds manure application. All tests with CN biogeochemistry will have a namelist change. [NML] [non-BFB] for crop tests
- Loading branch information
Showing
54 changed files
with
4,516 additions
and
157 deletions.
There are no files selected for viewing
This file contains 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 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 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
19 changes: 19 additions & 0 deletions
19
components/elm/bld/namelist_files/namelist_defaults_fan.xml
This file contains 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,19 @@ | ||
<?xml version="1.0"?> | ||
|
||
<?xml-stylesheet type="text/xsl" href="namelist_defaults.xsl"?> | ||
|
||
<namelist_defaults> | ||
|
||
<!-- | ||
Values to use by default for creation of CLM model driver namelists. | ||
The element names are the same as the corresponding namelist | ||
variables. Values that depend on the model configuration use | ||
attributes to express the dependency. The recognized attributes | ||
are: RESOLUTION, defaults, mask, ic_ymd, ic_tod, sim_year and all configuration | ||
attributes from the config_cache.xml file (with keys converted to upper-case). | ||
--> | ||
|
||
<fan_nh3_to_atm use_fan=".false.">.false.</fan_nh3_to_atm> | ||
<fan_nh3_to_atm use_fan=".true." fan_mode="fan_atm">.true.</fan_nh3_to_atm> | ||
|
||
</namelist_defaults> |
This file contains 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 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
3 changes: 3 additions & 0 deletions
3
components/elm/cime_config/testdefs/testmods_dirs/elm/fan/user_nl_elm
This file contains 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,3 @@ | ||
use_fan = .true. | ||
do_budgets = .false. | ||
|
2 changes: 1 addition & 1 deletion
2
components/elm/cime_config/testdefs/testmods_dirs/elm/lulcc_sville/user_nl_elm
This file contains 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 |
---|---|---|
@@ -1,4 +1,4 @@ | ||
flanduse_timeseries = '$DIN_LOC_ROOT/lnd/clm2/surfdata_map/landuse.timeseries_1x1_smallvilleIA_mp50_hist_simyr1850-1855_c210930.nc' | ||
fsurdat = '$DIN_LOC_ROOT/lnd/clm2/surfdata_map/surfdata_1x1_smallvilleIA_mp50_simyr2000_c210930.nc' | ||
fsurdat = '$DIN_LOC_ROOT/lnd/clm2/surfdata_map/surfdata_1x1_smallvilleIA_mp50_simyr2000_c230905.nc' | ||
|
||
check_dynpft_consistency = .false. |
2 changes: 1 addition & 1 deletion
2
components/elm/cime_config/testdefs/testmods_dirs/elm/per_crop/user_nl_elm
This file contains 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 |
---|---|---|
@@ -1,2 +1,2 @@ | ||
fsurdat = '$DIN_LOC_ROOT/lnd/clm2/surfdata_map/surfdata_1x1_smallvilleIA_mp50_simyr2000_miscanthus_c200606.nc' | ||
fsurdat = '$DIN_LOC_ROOT/lnd/clm2/surfdata_map/surfdata_1x1_smallvilleIA_mp50_simyr2000_miscanthus_c230905.nc' | ||
do_budgets = .false. |
This file contains 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.