From 0b91373806786b600d89ccfcfff78fa2f82cb26b Mon Sep 17 00:00:00 2001 From: Fabio Oliveira Date: Fri, 20 Dec 2024 07:12:37 -0500 Subject: [PATCH] v4.8.5.0 --- CMakeLists.txt | 4 +- ReleaseNotes.md | 141 ++++++++++++++---------------------- Resources/Version48.rc | 8 +- Utilities/CSMVersion.for.in | 31 +------- 4 files changed, 63 insertions(+), 121 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6f2af07db..8c345d183 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,8 +21,8 @@ PROJECT(DSSAT-CSM Fortran) SET(MAJOR 4) SET(MINOR 8) -SET(MODEL 2) -SET(BUILD 30) +SET(MODEL 5) +SET(BUILD 0) # Get the current working branch execute_process( diff --git a/ReleaseNotes.md b/ReleaseNotes.md index dcae0c553..8160fa41a 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -1,89 +1,60 @@ # Release notes -v4.8.2.0, 2023-08-03 -(previous release v4.8.0.027, 2021-04-27) +v4.8.5.0, 2024-12-01 (previous release v4.8.2.0, 2023-08-03) -- **New Crop models** - - Carinata - CROPGRO - - Guar - CROPGRO - - Guinea grass - FORAGE - - Strawberry - CROPGRO - -- **New Functionality** - - Soil Temperature default method switched from Ritchie equation to average daily temperature (TAVG). - - Automatic MOW for Forage crops. - - Multi-Harvest for CROPGRO crops. - - N20 csv output file. - - Added Crop status column to Summary.OUT (status of crop at end of simulation). - - Fertigation fertilizer placed at user-specified depth. - - Output potential root water uptake in ET.OUT. - - Input Soil alternative electron acceptors (SAEA) in soil analysis section of FileX, default value of 26.5 mol Ceq/m3 - - Fertilizers affect buffer for methane production. - - Added model respose to user-specified water table inputs. - - PEST Module and MOW file now accept dates in 2- and 4-digit year format. - -- **Plant model revisions** - - ALOHA - - Rollback of PineApple model to version v4.7.5.26. - - AROID - - Calibrated cultivar coefficients for Taro with GLUE HPC. - - CANEGRO - - Removed hard-coded PORMIN. - - Increased root length density based on literature. - - Added plant response to soil Nitrogen. - - CERES - - Separated CERES main subroutine file into multiple files. - - Fixed CERES-Maize issue with germination and emergence failure. - - Calibrated cultivar coefficients for Barley, Wheat, Maize, Millet, Sorghum and Rice with GLUE HPC. - - CROPGRO - - Added time required for pod/fruit to reach harvest maturity (XMAGE) for crops that use fresh weight. - - Added new Species parameters for Nitrogen mining, leaf growth and canopy. - - Calibrated genetics for CROPGRO crops. - - Updated genetics for fresh weight crops. - - Improved handling of C and N mining for Multi-Harvest. - - CROPSIM - - Separated CROPSIM main subroutine file into multiple files. - - Added protection to avoid zero division when calculating VRNSTAGE in CROPSIM model. - - MANIHOT - - Update genetics for Cassava. - - NWHEAT - - Simplified ozone equations for NWheat. - - Removed FOZ2 and SFOZ2 parameters from NWheat Ecotype file. - - SAMUCA - - Fixed protections with CSM subroutines to simulate under extreme latitudes. - - Updated Local variables description. - - Parameter simplification phyllochron = plastochron. - - Soil temperature effect switched-off until SoilT improvements are done. - - Recalibration of all cultivars using air temperature. - - SUBSTOR - - Added protection for leaf senescence factor due to temperature (SLFT). - - Calibrated cultivar coefficients for Potato with GLUE HPC. - -- **Miscellaneous** - - Added protections for input extreme latitudes in FileX. - - Updated and revised WARNING.OUT messages. - - Checked for missing input codes for tillage, fertilzer, residue and chemical in FileX. - - Reincorporated evapotranspiration parameters into the Species files. - - Stopped model for undefined PET flag and update error checking for ASCE parameters. - - Made ASCE ET robust for various weather file formats. - - Removed static CMake install prefix for UNIX systems. - - Updated start simulation date for 4-digit year to avoid stop the model. - - Updated CO2 concentration to current August 4, 2023. - - Reduced number of compile warnings. - - Handled multiple fertilizers in one day correctly. - - Removed WORK.OUT output. - - Prevent negative NO3 and NH4 values in the FORAGE model. - - Prevent total nitrogen uptake (TRNU) to avoid division by zero. - - New Default directory under data for Simulation Control settings for Xbuild and XB2. - - Weather variable definitions for Weatherman. - - Updated error messages. - - Updated variable definitions in DATA.CDE. - - BatchFiles in the Data directory. - - Updated CDE data files. - - Replaced DATA.CDE with ASCII to UTF-8 file format. - - Changed SweetCorn FreshWT header to match CROPGRO FreshWt header. - - Removed unused Nitrogen Stress parameters read from plant input. - - Cleaned up genotype files unused comments and updated files based on CROPGRO standard. - - Added by-product harvested to MgmtEvent.OUT. - + **New Tools** + - XB2 - Replacement for XBuild for creating crop management files; developed in Java + - TSE - Time Series Estimator - Tool for estimating cultivar coefficients using time series observations + **New Crop models** + - Lentil - CROPGRO + - Bahia - PRFRM + - Bambara groundnut - CROPGRO + - Amaranth - CROPGRO + +**New Functionality** + - FileA routine to read dates with 4-digit year. + - Output for estimated net CO2 to GHG.OUT file. + - Estimated net CO2 emissions output in summary.OUT. + - Added economic yield output in the Overview.OUT and Summary.OUT files. + - Multiple harvests are now output in MgmtEvent.OUT file. + - The Perennial Forage Model cannow be used for crop rotations. + - Update for Bahia grass using the PRFRM Model as the default crop module. + - New daily soil output SoilWater.OUT file for LL, DUL, SAT, and BD for all soil layers. + +**Plant model revisions** + - SAMUCA + - Protections for division by zero. + - CERES-Wheat + - Improved output format. + - WHAPS + - Updated read ecotype parameters format. + - Fixed divisions by zero caused by cultivar calibration. + - CROPSIM + - Fixed divisions by zero caused by cultivar calibration. + - CROPGRO-Cotton + - Added lint yield. + - CROPGRO-Strawberry + - Improved FreshWt.OUT outputs. + +**Miscellaneous** + - Update Taro and CERES-Wheat cultivar file variable descriptions. + - New README.md for dssat-csm-os developers. + - Updated soil NO3 and NH4 variables in DATA.CDE. + - General spelling improvements in \*.CUL files. + - Added ASCE ET parameters to species files. + - Updated GHG starting condition for methane production. + - Updated Soil properties error checking for DUL, SAT, LL, SRGF and SSKS. + - Added MAXIMA, MINIMA and trait (P/G/N) for ecotype coefficients for CROPGRO crops. + - Added protection for SOILDYN Soil Organic Matter changes in DUL. + - CMake option to allow dynamic link. + - Include Gencalc rules and Gencalc About in the Data\Default directory + - Updated verbose output mode for SoilTemp.OUT. + - Added protections for Weather variables when NaN found in \*.WTH file. + - Updated encoding issues of \*.CDE files. + - Corrected spelling of Tannier to Tanier + + **Experimental Data** + - Change the default soil evaporation method to Ritchie for most crops + - Added new example data files for climate change applications using data from Turkiye based on Gurkan et al. (2021): https://doi:10.1017/S0021859621000101 + - Added a new experimental data file for soybean from Brazil provided by Moura da Silva et al. (2022): https://doi.org/10.1016/j.agrformet.2022.109075 \ No newline at end of file diff --git a/Resources/Version48.rc b/Resources/Version48.rc index 95b1128a4..1490be300 100644 --- a/Resources/Version48.rc +++ b/Resources/Version48.rc @@ -52,8 +52,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 4,8,2,10 - PRODUCTVERSION 4,8,2,10 + FILEVERSION 4,8,5,0 + PRODUCTVERSION 4,8,5,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -70,12 +70,12 @@ BEGIN BEGIN VALUE "CompanyName", "DSSAT Foundation" VALUE "FileDescription", "CSM4.8" - VALUE "FileVersion", "4.8.2.10" + VALUE "FileVersion", "4.8.5.0" VALUE "InternalName", "CSM4.8" VALUE "LegalCopyright", "Copyright (C) 2024" VALUE "OriginalFilename", "DSCSM048.exe" VALUE "ProductName", "DSSAT Foundation DSCSM048" - VALUE "ProductVersion", "4.8.2.10" + VALUE "ProductVersion", "4.8.5.0" END END BLOCK "VarFileInfo" diff --git a/Utilities/CSMVersion.for.in b/Utilities/CSMVersion.for.in index cf80979c4..658e44c10 100644 --- a/Utilities/CSMVersion.for.in +++ b/Utilities/CSMVersion.for.in @@ -20,36 +20,7 @@ CHARACTER(len=*), PARAMETER :: VBranch = '-@BRANCH@' ! Version history: -! 4.8.2.30 FO 2024-12-11 PR 462 Commit SHA: 62c0fad -! 4.8.2.29 FO 2024-11-27 PR 461 Commit SHA: 872a1d4 -! 4.8.2.28 FO 2024-11-25 PR 459 Commit SHA: 1335cab -! 4.8.2.27 FO 2024-11-25 PR 457 Commit SHA: 8a81593 -! 4.8.2.26 FO 2024-11-25 PR 456 Commit SHA: eac7ba6 -! 4.8.2.25 FO 2024-11-24 PR 458 Commit SHA: 7fd86bd -! 4.8.2.24 FO 2024-10-28 PR 452 Commit SHA: 05d0d58 -! 4.8.2.23 FO 2024-10-28 PR 449 Commit SHA: 2bbadd1 -! 4.8.2.22 FO 2024-10-28 PR 451 Commit SHA: 448192c -! 4.8.2.21 FO 2024-09-28 PR 446 Commit SHA: 433f2fd -! 4.8.2.20 FO 2024-09-27 PR 446 Commit SHA: 83e008b -! 4.8.2.19 FO 2024-09-20 PR 441 Commit SHA: e9c64bf -! 4.8.2.18 FO 2024-09-06 PR 437 Commit SHA: 44bfa27 -! 4.8.2.17 FO 2024-09-06 PR 436 Commit SHA: 88e3060 -! 4.8.2.16 FO 2024-08-23 PR 431 Commit SHA: 635a664 -! 4.8.2.15 FO 2024-08-23 PR 434 Commit SHA: ff849ef -! 4.8.2.14 FO 2024-08-09 PR 429 Commit SHA: c93205a -! 4.8.2.13 FO 2024-07-13 PR 424 Commit SHA: 0c15449 -! 4.8.2.12 FO 2024-06-13 PR 408 Commit SHA: 4fd64a3 -! 4.8.2.11 FO 2024-06-13 PR 409 Commit SHA: 2e5a360 -! 4.8.2.10 FO 2024-05-16 PR 413 Commit SHA: 1e6ac3c -! 4.8.2.9 FO 2024-05-16 PR 412 Commit SHA: 6488713 -! 4.8.2.8 FO 2024-04-26 PR 406 Commit SHA: f65fc5c -! 4.8.2.7 FO 2024-03-22 PR 402 Commit SHA: 9b4a3cd -! 4.8.2.6 FO 2024-02-16 PR 397 & 400 Commit SHA: fccf858 -! 4.8.2.5 FO 2024-02-16 PR 398 Commit SHA: 4870729 -! 4.8.2.4 FO 2024-01-26 PR 394 Commit SHA: 28ad6da -! 4.8.2.3 FO 2024-01-26 PR 388 Commit SHA: 32b61e9 -! 4.8.2.2 FO 2024-01-26 PR 395 Commit SHA: 8a2a06f -! 4.8.2.1 FO 2023-10-20 Commit SHA: 8be2eef +! 4.8.5.0 FO 2024-12-19 v4.8.5 Release 2024 ! 4.8.2.0 FO 2023-09-02 v4.8.2 Release 2023 ! 4.8.1.0 FO 2022-10-28 v4.8.1 Interim release 2022 ! 4.8.0.1 chp 2020-07-21 v4.8 (=v4.7.5.14)