Skip to content

Commit

Permalink
Merge branch '1479-crop-sowing-dedupe'
Browse files Browse the repository at this point in the history
Consolidate duplicated crop phenology code

Resolves ESCOMP#1479
  • Loading branch information
billsacks committed Sep 20, 2021
2 parents 7761d5b + 539f609 commit 3dcbc74
Show file tree
Hide file tree
Showing 3 changed files with 177 additions and 159 deletions.
55 changes: 55 additions & 0 deletions doc/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,4 +1,59 @@
===============================================================
Tag name: ctsm5.1.dev057
Originator(s): Sam Rabin
Date: Mon Sep 20 10:07:26 MDT 2021
One-line Summary: Consolidate duplicated crop phenology code

Purpose and description of changes
----------------------------------

Consolidate duplicated code related to crop planting


Significant changes to scientifically-supported configurations
--------------------------------------------------------------

Does this tag change answers significantly for any of the following physics configurations?
(Details of any changes will be given in the "Answer changes" section below.)

[Put an [X] in the box for any configuration with significant answer changes.]

[ ] clm5_1

[ ] clm5_0

[ ] ctsm5_0-nwp

[ ] clm4_5


Bugs fixed or introduced
------------------------
Issues fixed (include CTSM Issue #):
- Resolves ESCOMP/CTSM#1479 (Suggested cleanup in CropPhenology():
Removing duplicated sowing code)


Testing summary:
----------------

regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):

cheyenne ---- ok
izumi ------- ok

Answer changes
--------------

Changes answers relative to baseline: NO

Other details
-------------
Pull Requests that document the changes (include PR ids):
https://github.com/ESCOMP/CTSM/pull/1482

===============================================================
===============================================================
Tag name: ctsm5.1.dev056
Originator(s): glemieux (Gregory Lemieux,,,)
Date: Fri Sep 17 15:41:57 MDT 2021
Expand Down
1 change: 1 addition & 0 deletions doc/ChangeSum
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Tag Who Date Summary
============================================================================================================================
ctsm5.1.dev057 samrabin 09/20/2021 Consolidate duplicated crop phenology code
ctsm5.1.dev056 glemieux 09/17/2021 FATES Satellite Phenology mode implemented
ctsm5.1.dev055 slevis 09/10/2021 Updates to master_list_file.rst
ctsm5.1.dev054 erik 09/02/2021 New parameters on paramsfile, many bit-for-bit changes, new history fields for IWUELN,VPD_2M, allow Medlyn Photosynthesis for non-PHS cases, fixes to HumanStressIndex
Expand Down
Loading

0 comments on commit 3dcbc74

Please sign in to comment.