Skip to content

Commit 9ced5a0

Browse files
authored
Merge pull request #3129 from PecanProject/model2netcdf-fix
Fix calculations in `model2netcdf.ED2()` on E files
2 parents 2bebeed + 6fe7920 commit 9ced5a0

File tree

7 files changed

+176
-193
lines changed

7 files changed

+176
-193
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@ convert data for a single PFT fixed (#1329, #2974, #2981)
7575
- Fixed a bug in `model2netcdf.ed2()` where .nc file connections were being closed multiple times, printing warnings (#3078)
7676
- Fixed a bug causing the model2netcdf.ED2() step in jobs.sh to be incorrectly written (#3075)
7777
- Fixed a bug where `plant_min_temp` trait value wasn't being converted from ºC to K when writing config file for ED2 (#3110)
78+
* Fixed a bug in `PEcAn.ED2::read_E_files()` affecting `PEcAn.ED2::model2netcdf.ED2()` that resulted in incorrect calculations (#3126)
79+
* DDBH (change in DBH over time) is no longer extracted and summarized from monthly -E- files by `PEcAn.ED2::model2netcdf.ED2()`. We are not sure it makes sense to summarize this variable across cohorts of different sizes.
80+
* The `yr` and `yfiles` arguments of `PEcAn.ED2::read_E_files()` are no longer used and the simulation date is extracted from the names of the .h5 files output by ED2.
7881

7982
### Changed
8083

models/ed/NEWS.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
* Added optional `process_partial` argument to `model2netcdf.ED2()` to allow it to process existing output from failed runs.
77
* write.config.xml.ED2() wasn't using the <revision> tag in settings correctly (#3080)
88
* Fixed a bug where `plant_min_temp` trait value wasn't being converted from ºC to K when writing config file for ED2 (#3110)
9+
* Fixed a bug in `read_E_files()` affecting `model2netcdf.ED2()` that resulted in incorrect calculations (#3126)
10+
* DDBH (change in DBH over time) is no longer extracted and summarized from monthly -E- files by `model2netcdf.ED2()`. We are not sure it makes sense to summarize this variable across cohorts of different sizes.
11+
* The `yr` and `yfiles` arguments of `read_E_files()` are no longer used and the simulation date is extracted from the names of the .h5 files output by ED2.
12+
913

1014
# PEcAn.ED2 1.7.2.9000
1115

0 commit comments

Comments
 (0)