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.

Sign up for GitHub

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

Jump to bottom

Landuse data tool #1107

Closed
wants to merge 63 commits into from
Closed

Landuse data tool #1107

wants to merge 63 commits into from

Commits on Aug 3, 2023

  1. outline landuse-pft data tool

    @glemieux
    glemieux committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    d93b785 View commit details
    Browse the repository at this point in the history

  2. Add test directory and first test file

    @glemieux
    glemieux committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    bf5799e View commit details
    Browse the repository at this point in the history

  3. Move test notes over to test file

    @glemieux
    glemieux committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    3070aca View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2023

  1. Merge tag 'sci.1.67.2_api.27.0.0' into tools/landuse_pft-static 

    Fix "too much canopy" error for SP mode runs

This corrects a typo in which the wrong patch was being sourced for
patch area correction.  It also includes a correction to history long names.
    @glemieux
    glemieux committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    7536d76 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2023

  1. initial pytest and landuse tool package setup

    @glemieux
    glemieux committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    648bf9f View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2023

  1. positive path unit test for static file

    @glemieux
    glemieux committed Sep 30, 2023
    Configuration menu
    Copy the full SHA
    8551229 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2023

  1. add readme to resources directory

    @glemieux
    glemieux committed Oct 1, 2023
    Configuration menu
    Copy the full SHA
    bc3d9f0 View commit details
    Browse the repository at this point in the history

  2. add landusepft file import test

    @glemieux
    glemieux committed Oct 1, 2023
    Configuration menu
    Copy the full SHA
    9315b84 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2023

  1. adding more functionality and accompanying unit tests to the landuse … 

    …tool
    @glemieux
    glemieux committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    ff66df8 View commit details
    Browse the repository at this point in the history

  2. update static luh2 file import and add negative case test

    @glemieux
    glemieux committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    e4a3178 View commit details
    Browse the repository at this point in the history

  3. add TypeError and tests to both import functions

    @glemieux
    glemieux committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    15e31bf View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2023

  1. Add additional landuse tool tests 

    This adds the renormalization and its test as well as a check on the
data type conversion and lat/lon update to the CLM5 data
    @glemieux
    glemieux committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    ac1ba2a View commit details
    Browse the repository at this point in the history

  2. update the land use code to case the data to doubel precision

    @glemieux
    glemieux committed Oct 4, 2023
    Configuration menu
    Copy the full SHA
    16f4ec3 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2023

  1. added tolerance to the normalization check

    @glemieux
    glemieux committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    0e66b77 View commit details
    Browse the repository at this point in the history

  2. add mock mask input to renorm test and added comments

    @glemieux
    glemieux committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    2946c50 View commit details
    Browse the repository at this point in the history

  3. minor comment update

    @glemieux
    glemieux committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    9c4697a View commit details
    Browse the repository at this point in the history

  4. Rename landusepft to landusepftmod 

    All tests pass
    @glemieux
    glemieux committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    6b71dec View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2023

  1. add main landuse script

    @glemieux
    glemieux committed Oct 7, 2023
    Configuration menu
    Copy the full SHA
    d5ce4f5 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2023

  1. Updating main landusepft script

    @glemieux
    glemieux committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    239db4a View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2023

  1. Updating main landuse x pft script 

    This is largely complete.  That said, it could use having
the previous luh2 dataset functions refactored and rolled into
this one, including adding new unit tests for the old luh2 code.
    @glemieux
    glemieux committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    6f3dee5 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2023

  1. rename pct_ to frac_

    @glemieux
    glemieux committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    3a13c7d View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2023

  1. add rename of the dimensions for fates landuse pft tool

    @glemieux
    glemieux committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    6a1a71d View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2023

  1. update renorm landuse function to not use mask

    @glemieux
    glemieux committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    3091854 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2023

  1. Merge tag 'sci.1.69.0_api.31.0.0' into tools/landuse_pft-static 

    Hydraulic failure mortality turned off for frozen soils

Hydraulic failure mortality is turned off when any soil layer is below
-2 degrees C. This should prevent high mortality of vegetation at high
latitudes.
    @glemieux
    glemieux committed Nov 22, 2023
    Configuration menu
    Copy the full SHA
    f2c0b63 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2023

  1. update to remove need for mask in renormalization 

    Also change to use conservative_normed method
    @glemieux
    glemieux committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    8686e14 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2024

  1. flip naming convention for tests to simplify tab completion

    @glemieux
    glemieux committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    596dd50 View commit details
    Browse the repository at this point in the history

  2. rename landusepft to landusedata

    @glemieux
    glemieux committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    fe0053d View commit details
    Browse the repository at this point in the history

  3. move shell scripts to example directory

    @glemieux
    glemieux committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    93d8029 View commit details
    Browse the repository at this point in the history

  4. make sure tests are using the new package name

    @glemieux
    glemieux committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    d15165c View commit details
    Browse the repository at this point in the history

  5. move luh2 file import test into luh2 test module

    @glemieux
    glemieux committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    a25a127 View commit details
    Browse the repository at this point in the history

  6. start moving all landuse code into a one main CLI

    @glemieux
    glemieux committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    b959e53 View commit details
    Browse the repository at this point in the history

  7. start adding tests for the main CLI

    @glemieux
    glemieux committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    9e5e097 View commit details
    Browse the repository at this point in the history

  8. added negative case for cli choice input

    @glemieux
    glemieux committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    ce42be5 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2024

  1. setting up the logic to call luh2 or lupft

    @glemieux
    glemieux committed Jan 6, 2024
    Configuration menu
    Copy the full SHA
    dab228d View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2024

  1. switch main program from choice option to use subcommands 

    Utilizing the subparser method enables the use of exclusive commands
which will better help distinguish between the luh2 and lu x pft tool options
    @glemieux
    glemieux committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    8aebc2a View commit details
    Browse the repository at this point in the history

  2. transfer the luh2 argument options to landusedata tool main

    @glemieux
    glemieux committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    e4d350a View commit details
    Browse the repository at this point in the history

  3. convert some luh2 arguments from optional to positional

    @glemieux
    glemieux committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    fb162ad View commit details
    Browse the repository at this point in the history

  4. Pass arguments from landusedata main to luh2 main

    @glemieux
    glemieux committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    5f63f51 View commit details
    Browse the repository at this point in the history

  5. pass landusedata main arguments to landusepft main

    @glemieux
    glemieux committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    e2b29a8 View commit details
    Browse the repository at this point in the history

  6. remove temporary print test function

    @glemieux
    glemieux committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    222135d View commit details
    Browse the repository at this point in the history

  7. remove shebang and out of date script usage comments

    @glemieux
    glemieux committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    7b732da View commit details
    Browse the repository at this point in the history

  8. start refactor of import methods

    @glemieux
    glemieux committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    a6453b8 View commit details
    Browse the repository at this point in the history

  9. refactor landuse x pft regridding loop

    @glemieux
    glemieux committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    a6a8e5d View commit details
    Browse the repository at this point in the history

  10. minor comment updates

    @glemieux
    glemieux committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    4e11e9c View commit details
    Browse the repository at this point in the history

  11. add utility module and first utils test

    @glemieux
    glemieux committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    827ee7d View commit details
    Browse the repository at this point in the history

  12. add lat/lon coordinate add to target file prep function

    @glemieux
    glemieux committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    8104040 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2024

  1. update both luh2 and lupft modules to both use common regrid target prep

    @glemieux
    glemieux committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    a774d83 View commit details
    Browse the repository at this point in the history

  2. simplify import of target regrid file in luh2

    @glemieux
    glemieux committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    4688269 View commit details
    Browse the repository at this point in the history

  3. combine import and prep of regrid target into one function

    @glemieux
    glemieux committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    5a696b6 View commit details
    Browse the repository at this point in the history

  4. move regrid functions into its own module 

    This also continues to simplify the luh2mod module
by removing unnecessary functions
    @glemieux
    glemieux committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    bdc707a View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2024

  1. update luh2 subcommand to create full luh2 dataset in one command 

    This update avoids having to run multiple calls to the luh2 command to
generate a full combined luh2 data file for fates usage.  It instead
loops through all the files and merges them together on the fly.
    @glemieux
    glemieux committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    b07cb63 View commit details
    Browse the repository at this point in the history

  2. remove old juypter notebook checkpoints

    @glemieux
    glemieux committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    24c1d52 View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2024

  1. correct indent alignment for luh2 regrid loop

    @glemieux
    glemieux committed Jan 12, 2024
    Configuration menu
    Copy the full SHA
    630db1a View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2024

  1. add missing time truncation arguments

    @glemieux
    glemieux committed Jan 13, 2024
    Configuration menu
    Copy the full SHA
    58c7f6c View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2024

  1. update landusepft masking calculation

    @glemieux
    glemieux committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    0fee760 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2024

  1. move static luh2 mask function into common utils module

    @glemieux
    glemieux committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    0724112 View commit details
    Browse the repository at this point in the history

  2. move regrid target masking function to utils module 

    also add a unit test for this function
    @glemieux
    glemieux committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    89dd5fe View commit details
    Browse the repository at this point in the history

  3. minor comment removal

    @glemieux
    glemieux committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    ac85fc1 View commit details
    Browse the repository at this point in the history

  4. make sure both subcommands use the same static luh2 mask

    @glemieux
    glemieux committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    da022e1 View commit details
    Browse the repository at this point in the history

  5. move luh2 static file import function to common utils module

    @glemieux
    glemieux committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    e4940cb View commit details
    Browse the repository at this point in the history

  6. update mask application for lupft subcommand

    @glemieux
    glemieux committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    70837f9 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2024

  1. remove outdated examples

    @glemieux
    glemieux committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    3471b0d View commit details
    Browse the repository at this point in the history

  2. move readme up to top of project directory 

    This needs to be rewritten as well in a future commit
    @glemieux
    glemieux committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    26ba074 View commit details
    Browse the repository at this point in the history