Repository navigation
Merge new crop calendars into master #2665
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
Merged
Merged
Changes from all commits
Commits
Show all changes
218 commits
Select commit
Hold shift + click to select a range
51d9f09
Break up a long line.
samsrabin c763d66
use_cropcal_rx_cultivar_gdds not needed in CropPhenology().
samsrabin 846f1cc
PlantCrop(): Be strict about PFT identification.
samsrabin 5b056b7
PlantCrop: Get gdd20 before setting gddmaturity.
samsrabin 08906bb
Correct a comment.
samsrabin 6ef52cd
Remove a troubleshooting write to iulog.
samsrabin 98f68e7
Optionally adjust rx maturity reqt based on recent climate.
samsrabin b73bcfd
Don't adapt rx cultivar gdd reqts if baseline gdd20 is ≤0.
samsrabin 20f32c1
Ignore 'invalid' values in stream_fldFileName_gdd20_baseline on read.
samsrabin a7cd057
Add generate_gdd20_baseline tool.
samsrabin fd5f177
Format generate_gdd20_baseline.py with black.
samsrabin 5eafae7
Add previous commit to .git-blame-ignore-revs.
samsrabin 38d6888
Add testmods RxCropCals, RxCropCalsAdapt.
samsrabin 317f77d
Add cropcals_rx namelist boolean.
samsrabin 81380ef
CLMBuildNamelist: Fix logic and message for check of sowing window st…
samsrabin b195734
CLMBuildNamelist: Use &string_is_undef_or_empty() instead of comparin…
samsrabin 4b18a5b
CLMBuildNamelist: Use &value_is_true() instead of comparing to '.true.'
samsrabin e76fbbc
CLMBuildNamelist: Update setup_logic_cropcal_streams() with cropcals_rx.
samsrabin 0f729d8
Bugfix: cropcalStreamMod now handles cropcals_rx.
samsrabin 74411ea
Update RxCropCals testmod to use cropcals_rx true.
samsrabin 9d1f88d
Add RxCropCals and RxCropCalsAdapt tests to new suite crop_calendars.
samsrabin 7e5257a
Add cropcals_rx_adapt option.
samsrabin 5911cea
Move add_default() of model_year_align_cropcal to be with other year …
samsrabin ccc228c
Merge pull request #6 from samsrabin/scale-mat-reqs-pr1.1-nml
samsrabin d89cb9d
Split streams year params for swindows vs maturity reqts.
samsrabin eb27a2d
Explain hard-coding of 2000 when reading GDD20 baseline file.
samsrabin a09d72c
Merge pull request #2560 from samsrabin/scale-mat-reqs-5.2.005
samsrabin 75d7df6
Functionize UpdateAccVars_CropGDDs().
samsrabin 45aff29
Optionally read/use gdd20 accum seasons from stream files.
samsrabin 0feff1f
Fix check of invalid swindow inputs.
samsrabin 3729b6d
Add RxCropCalsAdaptGGCMI testmod and test.
samsrabin d020ead
Fix check that gdd20 season files are provided.
samsrabin 42b0dbb
Minor rearrangement in cropcal namelist definition.
samsrabin 92555b9
generate_gdd20_baseline.py now saves NETCDF3_CLASSIC.
samsrabin 30eb31c
Update default to point to classic version.
samsrabin a6e2c1e
Add allow_invalid_gdd20_season_inputs to namelist XML.
samsrabin 9f04d71
Update missing values from generate_gdd20_baseline.py.
samsrabin 625fd5e
RxCropCalsAdaptGGCMI now uses allow_invalid_gdd20_season_inputs.
samsrabin 0156d1a
Move hist_addfld1d() for GDD0 to be with its siblings.
samsrabin b7c34ff
Add max versions of GDD season accum outputs.
samsrabin 535e2c5
Even gdd20 files need to be advance()d.
samsrabin 3e524db
generate_gdd20_baseline.py now saves to double instead of float.
samsrabin 18df6b4
stream_fldFileName_gdd20_baseline now defaults to half-deg fake file.
samsrabin a3feed9
Use fixed gdd20 baseline file.
samsrabin 5144b36
gdd20 baseline now interpolated w/ nearest-neighbor. Revert this!
samsrabin 90b938b
generate_gdd20_nbaseline: Use GDDNX.
samsrabin e82679d
generate_gdd20_baseline: Grid, if needed.
samsrabin 8b43fec
generate_gdd20_baseline: Improve long names.
samsrabin dcacbd4
Minor cleanup in UpdateAccVars_CropGDDs.
samsrabin 2cf491d
Add outputs: GDD20_BASELINE, GDD20_SEASON_START/END.
samsrabin 0083a08
rxcropmaturity.py is now parent rxcropmaturityshared.py.
samsrabin f728f96
Added back RXCROPMATURITY.
samsrabin e4b97a2
Add RXCROPMATURITYSKIPRUN.
samsrabin 3a28c67
UpdateAccVars_CropGDDs: Only check gdd20 seasons if no NaNs/Infs.
samsrabin dcbc90e
Add TemperatureType restart var to flush GDD20s.
samsrabin 982ef9a
Fixes to imports in RXCROPMATURITY(SKIPRUN).
samsrabin e1db253
Add reset option to update_accum_field_runmean().
samsrabin af0e12d
Actually flush GDD20 variables.
samsrabin a30a975
Update RXCROPMATURITY* namelists.
samsrabin 0bdd55a
RXCROPMATURITYSKIPRUN now sets BUILD_COMPLETE=TRUE. Works!
samsrabin e890670
Revert "Actually flush GDD20 variables."
samsrabin 4fb19c8
Revert "Add reset option to update_accum_field_runmean()."
samsrabin 1351313
Remove unused 'use' of accumResetVal from EnergyFluxType UpdateAccVar…
samsrabin 7364ad6
All accumulator types can now be manually reset.
samsrabin 9e39acc
Added reset tests for timeavg and runmean. Former not working.
samsrabin 1ef5a74
Fix reset behavior for timeavg. Tests now working.
samsrabin 2123b15
Added unit tests for markreset_accum_field().
samsrabin 94cbf03
Reset timeavg and runaccum accumulators to initval, not 0.
samsrabin f9687b3
Merge remote-tracking branch 'origin/accum-reset-logical-ctsm5.2.005'…
samsrabin f830270
Update GDD20 flushing to use markreset_accum_field().
samsrabin 906a39e
Whitespace fix.
samsrabin 4a4e5ef
Replace init_ml_mpatch_field with a change in init_ml_patch_field.
samsrabin 8035a77
test_accumul: Replace logical->int loops with one-line merge().
samsrabin 669fe21
test_accumul: Add test of timeavg reset 2 days after period start. Fa…
samsrabin d82be2c
accumulMod bugfix: Use ndays_reset_shifted instead of nresets. Tests …
samsrabin 7024437
Bugfix: Was resetting AGDD instead of AGDDTW.
samsrabin f558526
Add comments warning against wrapping runaccum do-loops in checks for…
samsrabin 7b92c53
Merge branch 'accum-reset-logical-ctsm5.2.005' into scale-mat-reqs-pr…
samsrabin 31b62a3
Merge pull request #2585 from samsrabin/accum-reset-logical-ctsm5.2.005
samsrabin 3041578
Move stream_gdd20_seasons stuff to controlMod.
samsrabin 801fa01
CLMBuildNamelist: Always set stream_meshfile_cropcal.
samsrabin dcff4f8
Set gdd20 season start/end NaNs to -1.
samsrabin c4ef0e7
UpdateAccVars_CropGDDs: Skip non-crops.
samsrabin b90789b
use_cropcal_streams now includes gdd20 dates.
samsrabin 0ffbd07
Handle invalid gdd20_season_start and _end separately.
samsrabin 2ebe85d
Fix restartvar() for flush_gdd20.
samsrabin e9531de
Add RXCROPMATURITYSKIPBUILD test.
samsrabin 4144ac9
RXCROPMATURITY: copy .env_mach_specific.sh to gddgen dir.
samsrabin 9f0b7ba
Add missing commas to RXCROPMATURITYSHARED.
samsrabin 3733d8c
Merge branch 'scale-maturity-reqs-upstream' into scale-mat-reqs-pr2-g…
samsrabin 8745206
PlantCrop: Error if gddmaturity(p) < min_gddmaturity but use_cropcal_…
samsrabin 62bcd0b
Add some printout in PlantCrop().
samsrabin 9cd2b22
Add printout of cropcal_stream DERIVED settings.
samsrabin a8923bf
Add printout when flushing GDD20s.
samsrabin f2518b6
PlantCrop: GDD-gen runs get gddmaturity 1e36.
samsrabin c4aa93b
PlantCrop: Remove troubleshooting printout.
samsrabin fb478a1
rxcropmaturityshared: Restore 'modify user_nl files: new fsurdat.'
samsrabin 57daeec
Add manual flush_gdd20 option.
samsrabin 9010346
Error if gdd20_season_start or _end > 366.
samsrabin 3b6a8ce
UpdateAccVars_CropGDDs bugfix: Use day of year, not day of month.
samsrabin 97b95e9
Add Cidadinho test site.
samsrabin 46307bc
generate_gdds: Don't fail if making figures but GDDHARV alll NaN.
samsrabin faa536e
Revert "PlantCrop: GDD-gen runs get gddmaturity 1e36."
samsrabin 81177dd
Revert all RXCROPMATURITY changes.
samsrabin 17761a9
Leave gdd20_season_(start,end)_patch as real.
samsrabin 0a76437
Merge remote-tracking branch 'origin/fix-rxcropmaturity' into scale-m…
samsrabin bacf5e9
Merge remote-tracking branch 'origin/fix-rxcropmaturity' into scale-m…
samsrabin ca15115
RXCROPMATURITY: Fix gdd-gen namelist.
samsrabin 23f6fa2
PlantCrop: Error if gdd20 <= 0.
samsrabin 78c5d98
Handle gdd20 < minimum if generate_crop_gdds.
samsrabin f618893
Set cropcal_rx true for both parts of RXCROPMATURITY*.
samsrabin 7578787
Add GddGen(OnlyOutputs(Surf)) testmods.
samsrabin 6fdcf4c
UpdateAccVars_CropGDDs: Remove check that patch is a crop.
samsrabin c6ae96b
Add StreamGdd20Seasons testmod.
samsrabin 9c5b279
StreamGdd20Seasons: Set allow_invalid_gdd20_season_inputs .true.
samsrabin 70b8fe3
Don't check gdd20_season_starts/ends if not crop.
samsrabin 41e30bd
Correct comment in crop testmod user_nl_clm.
samsrabin 30597ce
Add four tests to crop_calendars suite:
samsrabin 2573c34
Fix walltime for GddGen tests.
samsrabin 418f6be
GDD20_BASELINE and GDD20_SEASON_START/END now instantaneous.
samsrabin e3a00f8
Save GDD20_BASELINE and GDD20_SEASON_START/END in crop testmod.
samsrabin 3b915fd
Simplify crop calendar tests.
samsrabin 501ba25
Add tricky ERP test of RxCropCalsAdaptGGCMI.
samsrabin 8d75453
TemperatureType: Save flush_gdd20 regardless of stream_gdd20_seasons.
samsrabin 6810090
cropcal_interp: Ignore init when considering stream_gdd20_seasons.
samsrabin 24845d2
cropcal_interp: Ignore init when considering adapt_cropcal_rx_cultiva…
samsrabin 5b49d91
Forgot to commit RxCropCalsAdaptFlush testmod.
samsrabin 4f702c3
Add ERP test of RxCropCalsAdaptGGCMI to expected failure list.
samsrabin d13508b
run_sys_tests: Check Python env for RXCROPMATURITY.
samsrabin a5da93e
generate_gdd20_baseline: Add optional -y1 and -yN args.
samsrabin 23c8743
generate_gdds: Map sdate in/out diffs.
samsrabin 7994c82
Save crop date variables in testmods more frequently.
samsrabin 014800d
Add tweak_latlons.py.
samsrabin 4c1d66f
mesh_type.py: Handle a broadcast error.
samsrabin f11003b
mesh_type.py: Improve error for lon > 360.
samsrabin 231b4ac
tweak_latlons.py: Add more files.
samsrabin 9f186d4
Use tweaked_latlon cropcal inputs.
samsrabin 1377d48
Fix default stream_meshfile_cropcal.
samsrabin d60dc80
Fix reset of sowing_reason_perharv_patch.
samsrabin 5c3e71f
Remove midDecStart-RxCropCalsAdaptGGCMI test from expected fails.
samsrabin dc488c7
Improve interpolate_gdds.py.
samsrabin 3db9bf2
tweak_latlons: Include gdd20 files.
samsrabin 64302ad
Additions/tweaks to CLM testlist.
samsrabin 0da6eb5
Remove Clm50 RXCROPMATURITY tests.
samsrabin 87d1fa1
Move tweak_latlons.py to tools/contrib/.
samsrabin f6ff134
Rework tweak_latlons.py to run from command line.
samsrabin 2274263
Refine RxCropCals* testlist.
samsrabin e143138
generate_gdd20_baseline: Clarity rearrangement.
samsrabin 647fc52
import_ds: Workaround to import multiple files without dask.
samsrabin 96015da
generate_gdd20_baseline: Can now specify -v/--variable GDDBX or GDDB20.
samsrabin 3cc1d0f
generate_gdd20_baseline: Satisfy pylint.
samsrabin b1bbe15
generate_gdd20_baseline: Save input file list as attribute(s).
samsrabin a703cb6
generate_gdd20_baseline: Save input year range as attribute.
samsrabin 7a5e067
generate_gdd20_baseline: Save input variable type as attribute.
samsrabin 25896e4
generate_gdd20_baseline: Functionize setup_output_dataset().
samsrabin f909d2d
Fill all land cells with MISSING_RX_GDD_VAL.
samsrabin 8fa8506
Set different gdd20 baseline file if using default gdd20 baseline sea…
samsrabin 945c8bb
Add utility function to get list of managed crops WITH grasses.
samsrabin ec9f07f
generate_gdd20_baseline: Use MGDCROP_LIST constant.
samsrabin 669f227
generate_gdd20_baseline: Include mgd grasses.
samsrabin a624606
generate_gdd20_baseline: Include unmanaged crops.
samsrabin 753fda3
Format with black.
samsrabin c0a3556
Add previous commit to .git-blame-ignore-revs.
samsrabin 71ca96d
Delete an unused ncd_log.
samsrabin ad2c7f3
Delete a troubleshooting log message.
samsrabin 592476f
Improve comments/error at "Handle invalid gdd20 season values."
samsrabin 013028c
Replace SSR with Sam Rabin.
samsrabin 96c7c2d
import_ds.py: Delete a commented-out line.
samsrabin 1d9e939
Improve a comment in run_sys_tests.py.
samsrabin 78d9f98
Improve error messages in PlantCrop().
samsrabin d3e6cbf
CropType: Fix a comment.
samsrabin 6546a68
TemperatureType Restart(): Delete unused p.
samsrabin c96ce35
Delete unused sowingWindows testmod.
samsrabin b96ec91
check_rxboth_run.py: Improve error message.
samsrabin 876e23b
interpolate_gdds.py: Strict check for prefix match.
samsrabin fecad29
Delete unneeded cropAnnOutputMonthly testmod.
samsrabin c94aeea
Add READMEs to testmods decStart and midDecStart.
samsrabin 833d4f6
import_output(): Bugfix in call of check_v0_le_v1().
samsrabin 56523e4
Remove 1-degree RXCROPMATURITY test from rxcropmaturity, crop_calenda…
samsrabin d06e864
Remove unneeded RxCropCalsAdaptFlush testmod.
samsrabin a2bf124
generate_gdd20_baseline.py: Add a clarifying comment.
samsrabin c9ff0ee
PlantCrop(): Resolve (dismiss) a TODO.
samsrabin bc05591
Improve flush_gdd20 restart logic.
samsrabin d298aef
Do not use flush_gdd20 from clm_varctl in flush decision.
samsrabin 827632e
Actually don't use TemperatureType%flush_gdd20 at all.
samsrabin 4ab30a5
crop_calendars Python stuff now includes crop grasses.
samsrabin aeb4182
interpolate_gdds.py: Syntax fix.
samsrabin 929ec5d
Skip switchgrass in RXCROPMATURITY.
samsrabin b70c156
Manually specify sowing date file for GddGen testmod.
samsrabin 7400d5b
Add izumi_nag.clm-RxCropCalsAdaptGGCMI test to expected fails.
samsrabin 388c7ed
Move stream_gdd20_seasons to cropCalStreamMod.
samsrabin c5cc03c
Merge tag 'ctsm5.2.015' into scale-mat-reqs-pr3-mergemaster
samsrabin 0d4a300
Fix setting of stream_fldFileName_gdd20_baseline.
samsrabin 4b18928
Merge pull request #2593 from samsrabin/scale-mat-reqs-pr2-ggcmiseas
samsrabin 649547c
Don't specify PE layout for SMS crop_calendars tests.
samsrabin 26ce0bb
Add izumi versions of most derecho crop_calendars tests.
samsrabin ae4af6b
Fix PE layouts of izumi crop_calendars tests.
samsrabin e757d3d
Add oldCropCals testmod and two aux_clm tests that use it.
samsrabin 7070abc
Add cropcals_rx(_adapt) in some testmods; rename RxCropCals to RxCrop…
samsrabin f0a221f
Rework RxCropCalsAdaptGGCMI to not require RxCropCalsAdapt.
samsrabin 5dabe62
Delete RxCropCalsAdapt test.
samsrabin ca6b608
Add 'cropcals_rx_adapt = .false.' to RXCROPMATURITYSHARED.
samsrabin 904e6b2
Change a test name in ExpectedTestFails.xml.
samsrabin a3d8158
Turn on cropcals_rx_adapt by default for physics other than clm4_5, c…
samsrabin dcdd587
Remove most Izumi crop_calendars tests.
samsrabin af02bca
Update ChangeLog and ChangeSum.
samsrabin 542f708
Wrap cropcal subroutine calls in use_crop.
samsrabin 126ce29
Allocate first dim on dataptr2d_*_start/end arrays with begp:endp.
samsrabin b7a8fb5
Allocate 2d arrays with begp:endp, not lsize.
samsrabin 63b66b6
Add ERP_D_Ld10_P64x2.f10_f10_mg37.IHistClm60BgcCrop.derecho_intel.clm…
samsrabin 7e04126
dataptr2d arrays' first dim is gridcell, not patch.
samsrabin d47b28a
Use begg and endg instead of lsize.
samsrabin 2156c72
Use begg/endg instead of referring to bounds%.
samsrabin 3631dc9
Merge pull request #2661 from samsrabin/scale-mat-reqs-pr3-mergemaster
samsrabin b1aed3f
Update ChangeLog and ChangeSum.
samsrabin 66e28d1
Changes one Izumi test from f19 to 10x15 resolution.
samsrabin 2713766
Merge pull request #2664 from samsrabin/scale-mat-reqs-pr4-makedefault
ekluzek 2422cef
Update date on Change files
ekluzek 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
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
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.
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.