Skip to content
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

Add soil tillage for crops #2040

Merged
merged 104 commits into from
Jan 10, 2024
Merged

Add soil tillage for crops #2040

merged 104 commits into from
Jan 10, 2024

Commits on May 20, 2023

  1. Configuration menu
    Copy the full SHA
    298845e View commit details
    Browse the repository at this point in the history

Commits on May 22, 2023

  1. Compile fixes to previous.

    samsrabin committed May 22, 2023
    Configuration menu
    Copy the full SHA
    a2f56c3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4c00684 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    2adb528 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    ff41083 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2023

  1. Configuration menu
    Copy the full SHA
    416eae4 View commit details
    Browse the repository at this point in the history
  2. Remove patch loops in get_tillage_multipliers*() subroutines.

    Each crop column should only have one patch, so by only calling these for crop columns, we can simplify things considerably.
    samsrabin committed Jun 1, 2023
    Configuration menu
    Copy the full SHA
    7a006dc View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    aefd94a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    e909270 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    4a447d4 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    5dda283 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2023

  1. Configuration menu
    Copy the full SHA
    2453126 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6c4a6e7 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f1732c7 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    e80cfdf View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    6c36b20 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    aaf20aa View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    6e1102f View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    6fedb42 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    eb42243 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2023

  1. Removed a TODO that was already done.

    "Throw error during namelist build if tillage is called with FATES"
    samsrabin committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    e132e43 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9386d81 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2023

  1. Configuration menu
    Copy the full SHA
    df7e4de View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2a812c4 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2023

  1. Configuration menu
    Copy the full SHA
    270a5cd View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2023

  1. Merge tag 'ctsm5.1.dev128' into tillage-reorg02

    Update FATES tests to double precision
    
    This pull request updates the fates tests to set the output
    precision to double precision.  The usermod fates_sp is similarly
    updated.
    samsrabin committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    2d79b38 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2023

  1. Typo fix.

    samsrabin committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    6a2f1ae View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    80ea55c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6acf76e View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2023

  1. Run fixes.

    samsrabin committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    4308802 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6c0049a View commit details
    Browse the repository at this point in the history
  3. Allow tillage with FATES.

    Still won't work with use_crop false. FATES handles coarse woody debris separately, but I haven't added handling of that, so implicitly tillage just doesn't affect CWD.
    samsrabin committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    e85505e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    d144df9 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    44eeaf7 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    35b7f23 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    9090a6e View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    8c43072 View commit details
    Browse the repository at this point in the history
  9. Added note.

    samsrabin committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    a5e770e View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    07a259f View commit details
    Browse the repository at this point in the history
  11. Generalize tillage to work with multiple active crop patches.

    Multiple active crop patches per column shouldn't be possible YET, but perhaps eventually it will be.
    samsrabin committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    48b697e View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2023

  1. Configuration menu
    Copy the full SHA
    70e65c3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    13f898c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    eb3171d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    955ec7f View commit details
    Browse the repository at this point in the history
  5. Compile fixes.

    samsrabin committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    6c4e019 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2023

  1. Configuration menu
    Copy the full SHA
    f9a03e6 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2023

  1. Configuration menu
    Copy the full SHA
    d629ddd View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2023

  1. Configuration menu
    Copy the full SHA
    c148410 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    de88db0 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    49b15ad View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    0441df0 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    163147e View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    23a89d6 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    f61f983 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    c1757d1 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    8cfeafe View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    750f5b9 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2023

  1. Merge tag 'ctsm5.1.dev132' into tillage

    Add parameterization to allow excess ice in soil and subsidence
    
    Description:
    Parameterization for excess ice described in Lee et al. (2014):
    http://dx.doi.org/10.1088/1748-9326/9/12/124006
    
    This code is a modified version of code provided by Lei Cai:
    https://github.com/lca041/ctsm/tree/clm5.0.dev92_exice
    
    Works only for the nuopc driver.
    
    # Conflicts:
    #	bld/CLMBuildNamelist.pm
    #	bld/namelist_files/namelist_defaults_ctsm.xml
    #	bld/namelist_files/namelist_definition_ctsm.xml
    samsrabin committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    7eaf5e2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4a8adff View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2023

  1. Configuration menu
    Copy the full SHA
    d856f1b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b71fa23 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c5ee474 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    fe568e1 View commit details
    Browse the repository at this point in the history
  5. Added a space.

    samsrabin committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    3495f4b View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    1865649 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    9063873 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2023

  1. Share idpp calculation code.

    Between CropPhenology()and get_tillage_multipliers(). New function DaysPastPlanting() shared from CNPhenologyMod to TillageMod.
    samsrabin committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    f01adc6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    cb5a889 View commit details
    Browse the repository at this point in the history
  3. Till to 32 cm depth rather than top 5 soil layers.

    In default configuration, there's no difference. This is setting up for the specification of this depth as a namelist parameter. Partially-tilled layers not yet allowed.
    samsrabin committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    86b81fb View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    69451e2 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    8e67f28 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2023

  1. Added a comment and TODO.

    samsrabin committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    b18572d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7af6bf6 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ebda444 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2023

  1. Moved fraction_tilled calculation to new function get_fraction_tilled().

    This enables unit testing of this code.
    samsrabin committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    2d76faa View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2023

  1. Configuration menu
    Copy the full SHA
    e628c71 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b12c780 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c5171fe View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2023

  1. Bug fix in get_fraction_tilled().

    I understood zisoi to give the bottom of each layer, but it actually gives the top.
    samsrabin committed Sep 15, 2023
    Configuration menu
    Copy the full SHA
    579ca9a View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2023

  1. Configuration menu
    Copy the full SHA
    7f7dfc8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    46da730 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9c1618b View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b87fbd9 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    c0d8784 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    77d0c7d View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2023

  1. Configuration menu
    Copy the full SHA
    3c24b25 View commit details
    Browse the repository at this point in the history
  2. Merge tag 'ctsm5.1.dev142' into tillage

    b4b changes to Python scripts, history lists, tech note, and clm_time_manager.
    
    * Add system and unit tests for making fsurdat with all crops everywhere (ESCOMP#2081)
    * Rework master_list* files etc. (ESCOMP#2087)
    * Fixes to methane Tech Note (ESCOMP#2091)
    * Add is_doy_in_interval() function (ESCOMP#2158)
    * Avoid using subprocess.run() in FSURDATMODIFYCTSM (ESCOMP#2125)
    
    Closes issues:
    * Add unit test for making fsurdat with all crops everywhere (ESCOMP#2079)
    * Rework master_list_(no)?fates.rst? (ESCOMP#2083)
    * conda run -n can fail if a conda environment is already active (ESCOMP#2109)
    * conda fails to load for SystemTests (ESCOMP#2111)
    samsrabin committed Oct 2, 2023
    Configuration menu
    Copy the full SHA
    d43c617 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2023

  1. Removed a TODO.

    samsrabin committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    c8d6754 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7510431 View commit details
    Browse the repository at this point in the history
  3. Do not till generic crops.

    samsrabin committed Oct 5, 2023
    1 Configuration menu
    Copy the full SHA
    d565176 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b86402e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    1a3a8b7 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    ae56384 View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2023

  1. Configuration menu
    Copy the full SHA
    d1f08a7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d566b6d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    693750c View commit details
    Browse the repository at this point in the history
  4. Merge tag 'ctsm5.1.dev159' into tillage

    Various BFB fixes and updates
    
    Purpose/description of changes
    ------------------------------
    the default comes in a later tag (slevis)
    
    Regular and python testing passed.
    
    Does not change answers relative to dev158.
    samsrabin committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    9af1a04 View commit details
    Browse the repository at this point in the history
  5. Typo fix in crop Tech Note.

    samsrabin committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    fffa851 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    ff610b4 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    c86e1b6 View commit details
    Browse the repository at this point in the history
  8. Add 'till' testdef.

    samsrabin committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    f344ff1 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2024

  1. Configuration menu
    Copy the full SHA
    0665754 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2f69473 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    142c2c1 View commit details
    Browse the repository at this point in the history