Cotton crop added. pyproject.toml file added

Author: daquinterop

DSSATTools/base/partypes.py

@@ -51,7 +51,8 @@
     'Sugarcane': "SCCAN",
     "Wheat": "CSCER",
     "DryBean": "CRGRO",
-    "Cassava": "CSYCA"
+    "Cassava": "CSYCA",
+    "Cotton": "CRGRO"
 }
 CODE_VARS = {
     "plme": ["B", "C", "H", "I", "N", "P", "R", "S", "T", "V", None],

DSSATTools/crop.py

@@ -41,7 +41,8 @@
     'Sugarcane': f'SCCAN{VERSION}.SPE',
     "Wheat": f"WHCER{VERSION}.SPE",
     "DryBean": f"CRGRO{VERSION}.SPE",
-    "Cassava": f"CSYCA{VERSION}.SPE"
+    "Cassava": f"CSYCA{VERSION}.SPE",
+    "Cotton": f"CRGRO{VERSION}.SPE"
 }
 
 DSSAT_MODULE_PATH = os.path.dirname(module_path)
@@ -738,6 +739,48 @@ class Cassava(Crop):
         'pps3': '>5.2f', 'phtv': '>5.2f', 'phsv': '>5.2f', 'rdgs': '>5.2f', 
         'rlwr': '>5.0f', 'wfsu': '>5.2f', 'rsuse': '>5.2f', 'hmpc': '>5.0f'
     }
+    def __init__(self, cultivar_code):
+        super().__init__(cultivar_code)
+        return
+
+class Cotton(Crop):
+    code = "CO"
+    smodel = CROPS_MODULES["Cotton"]
+    spe_file = f'{code}{smodel[2:]}{VERSION}.SPE'
+    spe_path = os.path.join(GENOTYPE_PATH, spe_file)
+    cul_dtypes = {
+        'vrname': DescriptionType, 'expno': DescriptionType, 'eco#': Record, 
+        'csdl': NumberType, 'ppsen': NumberType, 'em-fl': NumberType, 
+        'fl-sh': NumberType, 'fl-sd': NumberType, 'sd-pm': NumberType, 
+        'fl-lf': NumberType, 'lfmax': NumberType, 'slavr': NumberType, 
+        'sizlf': NumberType, 'xfrt': NumberType, 'wtpsd': NumberType, 
+        'sfdur': NumberType, 'sdpdv': NumberType, 'podur': NumberType, 
+        'thrsh': NumberType, 'sdpro': NumberType, 'sdlip': NumberType
+    }
+    cul_pars_fmt = {
+        'vrname': '.<16', 'expno': '>5', 'eco#': '>6', 'csdl': '>5.2f', 
+        'ppsen': '>5.3f', 'em-fl': '>5.1f', 'fl-sh': '>5.1f', 'fl-sd': '>5.1f', 
+        'sd-pm': '>5.2f', 'fl-lf': '>5.2f', 'lfmax': '>5.3f', 'slavr': '>5.1f', 
+        'sizlf': '>5.1f', 'xfrt': '>5.2f', 'wtpsd': '>5.3f', 'sfdur': '>5.1f', 
+        'sdpdv': '>5.1f', 'podur': '>5.1f', 'thrsh': '>5.2f', 'sdpro': '>5.3f', 
+        'sdlip': '>5.3f'
+    }
+    eco_dtypes = {
+        'econame': DescriptionType, 'mg': DescriptionType, 'tm': DescriptionType, 
+        'thvar': NumberType, 'pl-em': NumberType, 'em-v1': NumberType, 
+        'v1-ju': NumberType, 'ju-r0': NumberType, 'pm06': NumberType, 
+        'pm09': NumberType, 'lngsh': NumberType, 'r7-r8': NumberType, 
+        'fl-vs': NumberType, 'trifl': NumberType, 'rwdth': NumberType, 
+        'rhght': NumberType, 'r1ppo': NumberType, 'optbi': NumberType, 
+        'slobi': NumberType
+    }
+    eco_pars_fmt = {
+        'econame': '.<17', 'mg': '<2', 'tm': '<2', 'thvar': '>5.1f', 
+        'pl-em': '>5.1f', 'em-v1': '>5.1f', 'v1-ju': '>5.1f', 'ju-r0': '>5.1f', 
+        'pm06': '>5.1f', 'pm09': '>5.2f', 'lngsh': '>5.1f', 'r7-r8': '>5.1f', 
+        'fl-vs': '>5.2f', 'trifl': '>5.2f', 'rwdth': '>5.2f', 'rhght': '>5.2f', 
+        'r1ppo': '>5.3f', 'optbi': '>5.1f', 'slobi': '>5.3f'
+    }
     def __init__(self, cultivar_code):
         super().__init__(cultivar_code)
         return

DSSATTools/filex.py

@@ -94,7 +94,7 @@
 from .crop import (
     Maize, Wheat, Sorghum, PearlMillet, Sugarbeet, Rice, Alfalfa, Bermudagrass,
     Soybean, Canola, Sunflower, Potato, Tomato, Cabbage, Sugarcane, DryBean,
-    Cassava, SweetCorn
+    Cassava, SweetCorn, Cotton
 )
 from .weather import WeatherStation
 from .soil import SoilProfile
@@ -104,7 +104,7 @@
     "MZ": Maize, 'WH': Wheat, 'SG': Sorghum, 'ML': PearlMillet, 'BS': Sugarbeet,
     'RI': Rice, 'SW': SweetCorn, 'AL': Alfalfa, 'BM': Bermudagrass, 
     'SB': Soybean, 'CN': Canola, 'SU': Sunflower, 'PT': Potato, 'TM': Tomato,
-    'CB': Cabbage, 'SC': Sugarcane, 'BN': DryBean, 'CS': Cassava
+    'CB': Cabbage, 'SC': Sugarcane, 'BN': DryBean, 'CS': Cassava, 'CO': Cotton
 }
 
 class Planting(Record):

pyproject.toml

@@ -0,0 +1,63 @@
+[project]
+name = "DSSATTools"
+version = "3.0.2"
+description = "A DSSAT's Python implementation"
+readme = "README.md"
+requires-python = ">=3.6"
+license = "GPL-3.0-or-later"
+authors = [
+  {email = "daquinterop@gmail.com", name = "Diego Quintero"},
+]
+classifiers = [
+  "Programming Language :: Python :: 3",
+]
+dependencies = [
+  "attrs",
+  "certifi",
+  "chardet",
+  "charset-normalizer",
+  "coverage",
+  "idna",
+  "iniconfig",
+  "numpy",
+  "packaging",
+  "pandas",
+  "pluggy",
+  "py",
+  "pyparsing",
+  "pytest",
+  "pytest-cov",
+  "python-dateutil",
+  "pytz",
+  "requests",
+  "rosetta-soil",
+  "six",
+  "toml",
+  "tomli",
+]
+
+[project.urls]
+"Homepage" = "https://github.com/daquinterop/Py_DSSATTools"
+"Bug Tracker" = "https://github.com/daquinterop/Py_DSSATTools/issues"
+"Documentation" = "https://py-dssattools.readthedocs.io/en/latest/"
+"Repository" = "https://github.com/daquinterop/Py_DSSATTools"
+
+[tool.setuptools]
+packages = [
+    'DSSATTools', 
+    'DSSATTools.base',
+    'DSSATTools.dssat-csm-os.Data', 
+    'DSSATTools.dssat-csm-os.Data.Genotype', 
+    'DSSATTools.dssat-csm-os.Data.Default',
+    'DSSATTools.dssat-csm-os.Data.Pest',
+    'DSSATTools.dssat-csm-os.Data.StandardData',
+    'DSSATTools.bin'
+]
+
+[tool.setuptools.package-data]
+"DSSATTools.dssat-csm-os.Data.Genotype" = ["*"]
+"DSSATTools.bin" = ["dscsm048", "dscsm048.exe"]
+"DSSATTools.dssat-csm-os.Data.Default" = ["*"]
+"DSSATTools.dssat-csm-os.Data.Pest" = ["*"]
+"DSSATTools.dssat-csm-os.Data.StandardData" = ["*"]
+"DSSATTools.dssat-csm-os.Data" = ["*"]

requirements.txt

@@ -25,6 +25,7 @@
 | Cabbage      | IBMC9601   |   1   |
 | Sugarcane    | ESAL1401   |   1   |
 | Cassava      | CCPA7801   |   1   |
+| Cotton       | GACM0401   |   1   |
 """
 import pytest
 
@@ -709,5 +710,33 @@ def test_freeze_soya():
     assert 'Freeze occurred' in dssat.stdout
     dssat.close()
 
+def test_cotton():
+    """
+    Experiment GACM0401, Treatment 1
+    """
+    soil = SoilProfile.from_file(
+        "GAPL850009", 
+        os.path.join(DATA_PATH, 'Soil', 'GA.SOL')
+    )
+    weather_station = WeatherStation.from_files([
+        os.path.join(DATA_PATH, 'Weather', "GACM9824.WTH"),
+    ])
+    treatments = read_filex(os.path.join(DATA_PATH, 'Cotton', "GACM0401.COX"))
+    treatment = treatments[1]
+    treatment["Field"]["wsta"] = weather_station
+    treatment["Field"]["id_soil"] = soil 
+
+    dssat = DSSAT(os.path.join(TMP, 'dssat_test'))
+    results = dssat.run_treatment(
+        cultivar=treatment['Cultivar'].crop, 
+        field=treatment["Field"],
+        initial_conditions=treatment['InitialConditions'], 
+        planting=treatment["Planting"],
+        fertilizer=treatment["Fertilizer"],
+        simulation_controls=treatment["SimulationControls"]
+    )
+    assert np.isclose(4647, results['harwt'], rtol=0.01)
+    dssat.close()
+
 if __name__ == "__main__":
-    test_wheat()
+    test_cotton()